") t = replacetext(t, "\[/h1\]", "
") t = replacetext(t, "\[h2\]", "")
@@ -490,7 +483,7 @@ var/icon/text_tag_icons = new('./icons/chattags.dmi')
t = replacetext(t, "", "\[row\]")
t = replacetext(t, "", "\[cell\]")
t = replacetext(t, "
", "\[logo\]")
- t = replacetext(t, "", "\[field\]")
+ t = replacetext(t, "", "\[field\]")
t = strip_html_properly(t)
return t
@@ -538,7 +531,7 @@ var/icon/text_tag_icons = new('./icons/chattags.dmi')
var/turf/T = get_turf(target)
var/area/A = get_area(target)
var/where = "[A? A.name : "Unknown Location"] | [T.x], [T.y], [T.z]"
- var/whereLink = "[where]"
+ var/whereLink = "[where] [ADMIN_JMP(T)]"
return whereLink
//Used for applying byonds text macros to strings that are loaded at runtime
@@ -602,3 +595,38 @@ var/icon/text_tag_icons = new('./icons/chattags.dmi')
. = ""
for(var/i=1, i<=times, i++)
. += string
+
+//json decode that will return null on parse error instead of runtiming.
+/proc/safe_json_decode(data)
+ try
+ return json_decode(data)
+ catch
+ return null
+
+/// Converts a semver string into a list of numbers
+/proc/semver_to_list(semver_string)
+ var/static/regex/semver_regex = regex(@"(\d+)\.(\d+)\.(\d+)", "")
+ if(!semver_regex.Find(semver_string))
+ return null
+
+ return list(
+ text2num(semver_regex.group[1]),
+ text2num(semver_regex.group[2]),
+ text2num(semver_regex.group[3]),
+ )
+
+
+/// Returns a message wrapped in a tag, colored based on how close `number` is to `threshold`.
+/// Lower number = green. Approaching threshold = yellow/orange. Exceeding = red.
+/proc/get_colored_thresh_text(msg, number, threshold = 10)
+ if (threshold <= 0)
+ return "[msg]" // fallback
+
+ var/ratio = number / threshold
+ if (ratio > 1) ratio = 1
+
+ var/hue = round(120 * (1 - ratio))
+ var/saturation = 90
+ var/lightness = 60
+
+ return "[msg]"
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 45c5c3c1243..8683185ee60 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -20,7 +20,7 @@ var/next_station_date_change = 1 DAYS
#define station_adjusted_time(time) time2text(time + station_time_in_ticks, "hh:mm")
#define worldtime2stationtime(time) time2text(roundstart_hour HOURS + time, "hh:mm")
-#define roundduration2text_in_ticks (SSticker.round_start_time ? world.time - SSticker.round_start_time : 0)
+#define roundduration2text_in_ticks (SSticker?.round_start_time ? world.time - SSticker.round_start_time : 0)
#define station_time_in_ticks (roundstart_hour HOURS + roundduration2text_in_ticks)
/proc/stationtime2text()
@@ -53,7 +53,7 @@ var/next_station_date_change = 1 DAYS
. = text2num(time2text(world.time + (roundstart_hour HOURS), "hh"))
/proc/worlddate2text()
- return num2text(game_year) + "-" + time2text(world.timeofday, "MM-DD")
+ return num2text(CURRENT_SHIP_YEAR) + "-" + time2text(world.timeofday, "MM-DD", NO_TIMEZONE)
/* Returns 1 if it is the selected month and day */
@@ -72,7 +72,7 @@ var/next_duration_update = 0
var/last_roundduration2text = 0
/proc/roundduration2text()
- if(!SSticker.round_start_time)
+ if(!SSticker?.round_start_time)
return "00:00"
if(last_roundduration2text && world.time < next_duration_update)
return last_roundduration2text
@@ -91,7 +91,7 @@ var/last_roundduration2text = 0
/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
if(!wtime)
- wtime = world.time - SSticker.round_start_time
+ wtime = world.time - (SSticker?.round_start_time || 0)
var/hour = round(wtime / 36000)
var/minute = round(((wtime) - (hour * 36000)) / 600)
var/second = round(((wtime) - (hour * 36000) - (minute * 600)) / 10)
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 7fe135e89f3..0bd9af00a2c 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -127,6 +127,28 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,
/proc/angle2text(var/degree)
return dir2text(angle2dir(degree))
+/// Returns a list(x, y), being the change in position required to step in the passed in direction
+/proc/dir2offset(dir)
+ switch(dir)
+ if(NORTH)
+ return list(0, 1)
+ if(SOUTH)
+ return list(0, -1)
+ if(EAST)
+ return list(1, 0)
+ if(WEST)
+ return list(-1, 0)
+ if(NORTHEAST)
+ return list(1, 1)
+ if(SOUTHEAST)
+ return list(1, -1)
+ if(NORTHWEST)
+ return list(-1, 1)
+ if(SOUTHWEST)
+ return list(-1, -1)
+ else
+ return list(0, 0)
+
// Converts a blend_mode constant to one acceptable to icon.Blend()
/proc/blendMode2iconMode(blend_mode)
switch (blend_mode)
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
new file mode 100644
index 00000000000..bdf72493700
--- /dev/null
+++ b/code/__HELPERS/type_processing.dm
@@ -0,0 +1,67 @@
+/proc/make_types_fancy(list/types)
+ if (ispath(types))
+ types = list(types)
+ . = list()
+ for(var/type in types)
+ var/typename = "[type]"
+ var/static/list/TYPES_SHORTCUTS = list(
+ /obj/effect/decal/cleanable = "CLEANABLE",
+ // /obj/item/bodypart = "BODYPART",
+ /obj/item/device/radio/headset = "HEADSET",
+ /obj/item/clothing/head/space = "SPESSHELMET",
+ /obj/item/book/manual = "MANUAL",
+ /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+ /obj/item/reagent_containers/food/snacks = "SNACK", //longest paths comes first
+ /obj/machinery/atmospherics = "ATMOS_MECH",
+ /obj/machinery/portable_atmospherics = "PORT_ATMOS",
+ /obj/item/mech_equipment = "MECH",
+ /obj/item/organ = "ORGAN",
+ /obj/item = "ITEM",
+ /obj/machinery = "MACHINERY",
+ /obj/effect = "EFFECT",
+ /obj = "O",
+ /datum = "D",
+ // /turf/open = "OPEN",
+ // /turf/closed = "CLOSED",
+ /turf = "T",
+ /mob/living/carbon = "CARBON",
+ /mob/living/simple_animal = "SIMPLE",
+ /mob/living = "LIVING",
+ /mob = "M"
+ )
+ for (var/tn in TYPES_SHORTCUTS)
+ if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
+ typename = TYPES_SHORTCUTS[tn] + copytext(typename, length("[tn]/"))
+ break
+ .[typename] = type
+
+/proc/get_fancy_list_of_atom_types()
+ var/static/list/pre_generated_list
+ if (!pre_generated_list) //init
+ pre_generated_list = make_types_fancy(typesof(/atom))
+ return pre_generated_list
+
+
+/proc/get_fancy_list_of_datum_types()
+ var/static/list/pre_generated_list
+ if (!pre_generated_list) //init
+ pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom)))
+ return pre_generated_list
+
+
+/proc/filter_fancy_list(list/L, filter as text)
+ var/list/matches = new
+ var/end_len = -1
+ var/list/endcheck = splittext(filter, "!")
+ if(endcheck.len > 1)
+ filter = endcheck[1]
+ end_len = length_char(filter)
+
+ for(var/key in L)
+ var/value = L[key]
+ if(findtext("[key]", filter, -end_len) || findtext("[value]", filter, -end_len))
+ matches[key] = value
+ return matches
+
+/proc/return_typenames(type)
+ return splittext("[type]", "/")
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5e09be20e63..bd4b13cb4b7 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1235,13 +1235,6 @@ var/list/FLOORITEMS = list(
else
return 0
-//gives us the stack trace from CRASH() without ending the current proc.
-/proc/stack_trace(msg)
- CRASH(msg)
-
-/datum/proc/stack_trace(msg)
- CRASH(msg)
-
/proc/pass(...)
return
@@ -1272,9 +1265,6 @@ var/list/FLOORITEMS = list(
. = CB.Invoke()
usr = temp
-//datum may be null, but it does need to be a typed var
-#define NAMEOF(datum, X) (#X || ##datum.##X)
-
#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value)
//dupe code because dm can't handle 3 level deep macros
#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value)
diff --git a/code/__HELPERS/verbs.dm b/code/__HELPERS/verbs.dm
index 8ec78ebdc66..cb76f5ad033 100644
--- a/code/__HELPERS/verbs.dm
+++ b/code/__HELPERS/verbs.dm
@@ -41,7 +41,7 @@
if(ismob(target))
mob_target = target
target = mob_target.client
- else if(!istype(target, /client))
+ else if(!isclient(target))
CRASH("add_verb called on a non-mob and non-client")
var/list/verbs_list = list()
@@ -86,7 +86,7 @@
if(ismob(target))
mob_target = target
target = mob_target.client
- else if(!istype(target, /client))
+ else if(!isclient(target))
CRASH("remove_verb called on a non-mob and non-client")
var/list/verbs_list = list()
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index d52174ecd91..88e51c0b0eb 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -29,9 +29,14 @@
#endif //ifdef REFERENCE_TRACKING
-// If this is uncommented, will attempt to load prof.dll (windows) or libprof.so (unix)
-// byond-tracy is not shipped with CM code. Build it yourself here: https://github.com/mafemergency/byond-tracy/
-//#define USE_BYOND_TRACY
+// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so by default.
+// Even if it's not defined, you can pass "tracy" via -params in order to try to load it.
+// We do not ship byond-tracy. Build it yourself here: https://github.com/mafemergency/byond-tracy,
+// or the fork which writes profiling data to a file: https://github.com/ParadiseSS13/byond-tracy
+// #define USE_BYOND_TRACY
+
+// If uncommented, will display info about byond-tracy's status in the MC tab.
+// #define MC_TAB_TRACY_INFO
/*
* Enables debug messages for every single reaction step. This is 1 message per 0.5s for a SINGLE reaction. Useful for tracking down bugs/asking me for help in the main reaction handiler (equilibrium.dm).
@@ -82,6 +87,8 @@
#define REFERENCE_TRACKING
#define REFERENCE_TRACKING_DEBUG
#define FIND_REF_NO_CHECK_TICK
+//Ensures all early assets can actually load early
+#define DO_NOT_DEFER_ASSETS
#endif
// Keep savefile compatibilty at minimum supported level
@@ -96,19 +103,16 @@
#define LIBCALL call_ext
#endif
-// So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof()
-#if DM_VERSION < 515
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
-#define PROC_REF(X) (.proc/##X)
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
-#define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X)
-/// Call by name proc reference, checks if the proc is existing global proc
-#define GLOBAL_PROC_REF(X) (/proc/##X)
-#else
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
#define PROC_REF(X) (nameof(.proc/##X))
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (nameof(.verb/##X))
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
-/// Call by name proc reference, checks if the proc is existing global proc
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
+
+/// Call by name proc reference, checks if the proc is an existing global proc
#define GLOBAL_PROC_REF(X) (/proc/##X)
-#endif
+
diff --git a/code/_debugger.dm b/code/_debugger.dm
deleted file mode 100644
index 84a0338c6a4..00000000000
--- a/code/_debugger.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-//Datum used to init Auxtools debugging as early as possible
-//Datum gets created in master.dm because for whatever reason global code in there gets runs first
-//In case we ever figure out how to manipulate global init order please move the datum creation into this file
-/datum/debugger
-
-/datum/debugger/New()
- enable_debugger()
-
-/datum/debugger/proc/enable_debugger()
- var/dll = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
- if(dll)
- LIBCALL(dll, "auxtools_init")()
- enable_debugging()
diff --git a/code/_global_vars/_regexes.dm b/code/_global_vars/_regexes.dm
new file mode 100644
index 00000000000..7297d509a91
--- /dev/null
+++ b/code/_global_vars/_regexes.dm
@@ -0,0 +1,24 @@
+//These are a bunch of regex datums for use /((any|every|no|some|head|foot)where(wolf)?\sand\s)+(\.[\.\s]+\s?where\?)?/i
+GLOBAL_DATUM_INIT(is_http_protocol, /regex, regex("^https?://"))
+GLOBAL_DATUM_INIT(is_http_protocol_non_secure, /regex, regex("^http?://"))
+
+
+GLOBAL_DATUM_INIT(is_website, /regex, regex("http|www.|\[a-z0-9_-]+.(com|org|net|mil|edu)+", "i"))
+GLOBAL_DATUM_INIT(is_email, /regex, regex("\[a-z0-9_-]+@\[a-z0-9_-]+.\[a-z0-9_-]+", "i"))
+GLOBAL_DATUM_INIT(is_alphanumeric, /regex, regex("\[a-z0-9]+", "i"))
+GLOBAL_DATUM_INIT(is_punctuation, /regex, regex("\[.!?]+", "i"))
+GLOBAL_DATUM_INIT(is_color, /regex, regex("^#\[0-9a-fA-F]{6}$"))
+
+//finds text strings recognized as links on discord. Mainly used to stop embedding.
+GLOBAL_DATUM_INIT(has_discord_embeddable_links, /regex, regex("(https?://\[^\\s|<\]{2,})"))
+
+//All < and > characters
+GLOBAL_DATUM_INIT(angular_brackets, /regex, regex(@"[<>]", "g"))
+
+//All characters between < a > inclusive of the bracket
+GLOBAL_DATUM_INIT(html_tags, /regex, regex(@"<.*?>", "g"))
+
+//All characters forbidden by filenames: ", \, \n, \t, /, ?, %, *, :, |, <, >, ..
+GLOBAL_DATUM_INIT(filename_forbidden_chars, /regex, regex(@{""|[\\\n\t/?%*:|<>]|\.\."}, "g"))
+GLOBAL_PROTECT(filename_forbidden_chars)
+// had to use the OR operator for quotes instead of putting them in the character class because it breaks the syntax highlighting otherwise.
diff --git a/code/_global_vars/bitfields.dm b/code/_global_vars/bitfields.dm
new file mode 100644
index 00000000000..8d14da38a0a
--- /dev/null
+++ b/code/_global_vars/bitfields.dm
@@ -0,0 +1,549 @@
+GLOBAL_LIST_INIT(bitfields, generate_bitfields())
+
+/// Specifies a bitfield for smarter debugging
+/datum/bitfield
+ /// The variable name that contains the bitfield
+ var/variable
+
+ /// An associative list of the readable flag and its true value
+ var/list/flags
+
+/// Turns /datum/bitfield subtypes into a list for use in debugging
+/proc/generate_bitfields()
+ var/list/bitfields = list()
+ for (var/_bitfield in subtypesof(/datum/bitfield))
+ var/datum/bitfield/bitfield = new _bitfield
+ bitfields[bitfield.variable] = bitfield.flags
+ return bitfields
+
+DEFINE_BITFIELD(admin_flags, list(
+ "FUN" = R_FUN,
+ "SERVER" = R_SERVER,
+ "DEBUG" = R_DEBUG,
+ "PERMISSIONS" = R_PERMISSIONS,
+ "MENTOR" = R_MENTOR,
+ "MOD" = R_MOD,
+ "ADMIN" = R_ADMIN,
+ // "AUTOLOGIN" = R_AUTOADMIN,
+ // "BAN" = R_BAN,
+ // "BUILDMODE" = R_BUILD,
+ // "DBRANKS" = R_DBRANKS,
+ // "POLL" = R_POLL,
+ // "POSSESS" = R_POSSESS,
+ // "SERVER" = R_SERVER,
+ // "SOUNDS" = R_SOUND,
+ // "SPAWN" = R_SPAWN,
+ // "STEALTH" = R_STEALTH,
+ // "VAREDIT" = R_VAREDIT,
+
+))
+
+DEFINE_BITFIELD(appearance_flags, list(
+ "KEEP_APART" = KEEP_APART,
+ "KEEP_TOGETHER" = KEEP_TOGETHER,
+ "LONG_GLIDE" = LONG_GLIDE,
+ "NO_CLIENT_COLOR" = NO_CLIENT_COLOR,
+ "PIXEL_SCALE" = PIXEL_SCALE,
+ "PLANE_MASTER" = PLANE_MASTER,
+ "RESET_ALPHA" = RESET_ALPHA,
+ "RESET_COLOR" = RESET_COLOR,
+ "RESET_TRANSFORM" = RESET_TRANSFORM,
+ "TILE_BOUND" = TILE_BOUND,
+ "PASS_MOUSE" = PASS_MOUSE,
+ "TILE_MOVER" = TILE_MOVER,
+))
+
+// DEFINE_BITFIELD(area_flags, list(
+// "ABDUCTOR_PROOF" = ABDUCTOR_PROOF,
+// "AREA_USES_STARLIGHT" = AREA_USES_STARLIGHT,
+// "BLOBS_ALLOWED" = BLOBS_ALLOWED,
+// "BLOCK_SUICIDE" = BLOCK_SUICIDE,
+// "CAVES_ALLOWED" = CAVES_ALLOWED,
+// "CULT_PERMITTED" = CULT_PERMITTED,
+// "FLORA_ALLOWED" = FLORA_ALLOWED,
+// "HIDDEN_AREA" = HIDDEN_AREA,
+// "MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED,
+// "MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
+// "NOTELEPORT" = NOTELEPORT,
+// "NO_DEATH_MESSAGE" = NO_DEATH_MESSAGE,
+// "PERSISTENT_ENGRAVINGS" = PERSISTENT_ENGRAVINGS,
+// "UNIQUE_AREA" = UNIQUE_AREA,
+// "VALID_TERRITORY" = VALID_TERRITORY,
+// "XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
+// "PASSIVE_AREA" = PASSIVE_AREA,
+// "GHOST_AREA" = GHOST_AREA,
+// "NO_GHOSTS_DURING_ROUND" = NO_GHOSTS_DURING_ROUND,
+// ))
+
+// DEFINE_BITFIELD(turf_flags, list(
+// "NO_LAVA_GEN" = NO_LAVA_GEN,
+// "NO_RUINS" = NO_RUINS,
+// "NO_RUST" = NO_RUST,
+// "NOJAUNT" = NOJAUNT,
+// "IS_SOLID" = IS_SOLID,
+// "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF,
+// "WEATHERED_TURF" = TURF_WEATHER
+// "RESERVATION_TURF" = RESERVATION_TURF,
+// ))
+
+// DEFINE_BITFIELD(car_traits, list(
+// "CAN_KIDNAP" = CAN_KIDNAP,
+// ))
+
+// DEFINE_BITFIELD(clothing_flags, list(
+// "ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
+// "BLOCKS_SHOVE_KNOCKDOWN" = BLOCKS_SHOVE_KNOCKDOWN,
+// "BLOCKS_SPEECH" = BLOCKS_SPEECH,
+// "BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
+// "CASTING_CLOTHES" = CASTING_CLOTHES,
+// "GAS_FILTERING" = GAS_FILTERING,
+// "HEADINTERNALS" = HEADINTERNALS,
+// "INEDIBLE_CLOTHING" = INEDIBLE_CLOTHING,
+// // "LARGE_WORN_ICON" = LARGE_WORN_ICON,
+// "LAVAPROTECT" = LAVAPROTECT,
+// "MASKINTERNALS" = MASKINTERNALS,
+// "PLASMAMAN_HELMET_EXEMPT" = PLASMAMAN_HELMET_EXEMPT,
+// "PLASMAMAN_PREVENT_IGNITION" = PLASMAMAN_PREVENT_IGNITION,
+// "SNUG_FIT" = SNUG_FIT,
+// "STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE,
+// "THICKMATERIAL" = THICKMATERIAL,
+// "VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
+// "VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
+// ))
+
+// DEFINE_BITFIELD(datum_flags, list(
+// "DF_ISPROCESSING" = DF_ISPROCESSING,
+// "DF_VAR_EDITED" = DF_VAR_EDITED,
+// "DF_USE_TAG" = DF_USE_TAG,
+// ))
+
+// DEFINE_BITFIELD(disease_flags, list(
+// "CAN_CARRY" = CAN_CARRY,
+// "CAN_RESIST" = CAN_RESIST,
+// "CURABLE" = CURABLE,
+// "DORMANT" = DISEASE_DORMANT,
+// "STAGE_COPY" = DISEASE_COPYSTAGE,
+// "ANALYZED" = DISEASE_ANALYZED,
+// ))
+
+// DEFINE_BITFIELD(flags_1, list(
+// "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
+// "ALLOW_DARK_PAINTS_1" = ALLOW_DARK_PAINTS_1,
+// "ATMOS_IS_PROCESSING_1" = ATMOS_IS_PROCESSING_1,
+// "CAN_BE_DIRTY_1" = CAN_BE_DIRTY_1,
+// "CONDUCT_1" = CONDUCT_1,
+// "HAS_CONTEXTUAL_SCREENTIPS_1" = HAS_CONTEXTUAL_SCREENTIPS_1,
+// "HAS_DISASSOCIATED_STORAGE_1" = HAS_DISASSOCIATED_STORAGE_1,
+// "HOLOGRAM_1" = HOLOGRAM_1,
+// "INITIALIZED_1" = INITIALIZED_1,
+// "IS_ONTOP_1" = IS_ONTOP_1,
+// "IS_PLAYER_COLORABLE_1" = IS_PLAYER_COLORABLE_1,
+// "IS_SPINNING_1" = IS_SPINNING_1,
+// "NODECONSTRUCT_1" = NODECONSTRUCT_1,
+// "NO_SCREENTIPS_1" = NO_SCREENTIPS_1,
+// "ON_BORDER_1" = ON_BORDER_1,
+// "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1,
+// "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1,
+// "SUPERMATTER_IGNORES_1" = SUPERMATTER_IGNORES_1,
+// "UNPAINTABLE_1" = UNPAINTABLE_1,
+// ))
+
+// DEFINE_BITFIELD(flags_ricochet, list(
+// "RICOCHET_HARD" = RICOCHET_HARD,
+// "RICOCHET_SHINY" = RICOCHET_SHINY,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_atom, list(
+// "INTERACT_ATOM_ATTACK_HAND" = INTERACT_ATOM_ATTACK_HAND,
+// "INTERACT_ATOM_CHECK_GRAB" = INTERACT_ATOM_CHECK_GRAB,
+// "INTERACT_ATOM_IGNORE_INCAPACITATED" = INTERACT_ATOM_IGNORE_INCAPACITATED,
+// "INTERACT_ATOM_IGNORE_RESTRAINED" = INTERACT_ATOM_IGNORE_RESTRAINED,
+// "INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND" = INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND,
+// "INTERACT_ATOM_NO_FINGERPRINT_INTERACT" = INTERACT_ATOM_NO_FINGERPRINT_INTERACT,
+// "INTERACT_ATOM_REQUIRES_ANCHORED" = INTERACT_ATOM_REQUIRES_ANCHORED,
+// "INTERACT_ATOM_REQUIRES_DEXTERITY" = INTERACT_ATOM_REQUIRES_DEXTERITY,
+// "INTERACT_ATOM_UI_INTERACT" = INTERACT_ATOM_UI_INTERACT,
+// "INTERACT_ATOM_ALLOW_USER_LOCATION" = INTERACT_ATOM_ALLOW_USER_LOCATION,
+// "INTERACT_ATOM_IGNORE_MOBILITY" = INTERACT_ATOM_IGNORE_MOBILITY,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_machine, list(
+// "INTERACT_MACHINE_ALLOW_SILICON" = INTERACT_MACHINE_ALLOW_SILICON,
+// "INTERACT_MACHINE_OFFLINE" = INTERACT_MACHINE_OFFLINE,
+// "INTERACT_MACHINE_OPEN" = INTERACT_MACHINE_OPEN,
+// "INTERACT_MACHINE_OPEN_SILICON" = INTERACT_MACHINE_OPEN_SILICON,
+// "INTERACT_MACHINE_REQUIRES_SIGHT" = INTERACT_MACHINE_REQUIRES_SIGHT,
+// "INTERACT_MACHINE_REQUIRES_LITERACY" = INTERACT_MACHINE_REQUIRES_LITERACY,
+// "INTERACT_MACHINE_REQUIRES_SILICON" = INTERACT_MACHINE_REQUIRES_SILICON,
+// "INTERACT_MACHINE_SET_MACHINE" = INTERACT_MACHINE_SET_MACHINE,
+// "INTERACT_MACHINE_WIRES_IF_OPEN" = INTERACT_MACHINE_WIRES_IF_OPEN,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_item, list(
+// "INTERACT_ITEM_ATTACK_HAND_PICKUP" = INTERACT_ITEM_ATTACK_HAND_PICKUP,
+// ))
+
+// DEFINE_BITFIELD(item_flags, list(
+// "ABSTRACT" = ABSTRACT,
+// "BEING_REMOVED" = BEING_REMOVED,
+// "DROPDEL" = DROPDEL,
+// "FORCE_STRING_OVERRIDE" = FORCE_STRING_OVERRIDE,
+// "HAND_ITEM" = HAND_ITEM,
+// "IGNORE_DIGITIGRADE" = IGNORE_DIGITIGRADE,
+// "IMMUTABLE_SLOW" = IMMUTABLE_SLOW,
+// "IN_INVENTORY" = IN_INVENTORY,
+// "IN_STORAGE" = IN_STORAGE,
+// "ITEM_HAS_CONTEXTUAL_SCREENTIPS" = ITEM_HAS_CONTEXTUAL_SCREENTIPS,
+// "NEEDS_PERMIT" = NEEDS_PERMIT,
+// "NOBLUDGEON" = NOBLUDGEON,
+// "NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
+// "NO_PIXEL_RANDOM_DROP" = NO_PIXEL_RANDOM_DROP,
+// "SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
+// "SURGICAL_TOOL" = SURGICAL_TOOL,
+// "XENOMORPH_HOLDABLE" = XENOMORPH_HOLDABLE,
+// "NO_BLOOD_ON_ITEM" = NO_BLOOD_ON_ITEM,
+// ))
+
+// DEFINE_BITFIELD(flags_inv, list(
+// "HIDEEARS" = HIDEEARS,
+// "HIDEEYES" = HIDEEYES,
+// "HIDEFACE" = HIDEFACE,
+// "HIDEFACIALHAIR" = HIDEFACIALHAIR,
+// "HIDEGLOVES" = HIDEGLOVES,
+// "HIDEHAIR" = HIDEHAIR,
+// "HIDEHEADGEAR" = HIDEHEADGEAR,
+// "HIDEJUMPSUIT" = HIDEJUMPSUIT,
+// "HIDEMASK" = HIDEMASK,
+// "HIDENECK" = HIDENECK,
+// "HIDESHOES" = HIDESHOES,
+// "HIDESNOUT" = HIDESNOUT,
+// "HIDESUITSTORAGE" = HIDESUITSTORAGE,
+// ))
+
+DEFINE_BITFIELD(machine_stat, list(
+ "BROKEN" = BROKEN,
+ "EMPED" = EMPED,
+ "MAINT" = MAINT,
+ "NOPOWER" = NOPOWER,
+))
+
+// DEFINE_BITFIELD(mat_container_flags, list(
+// "MATCONTAINER_EXAMINE" = MATCONTAINER_EXAMINE,
+// "MATCONTAINER_NO_INSERT" = MATCONTAINER_NO_INSERT,
+// "MATCONTAINER_ANY_INTENT" = MATCONTAINER_ANY_INTENT,
+// "MATCONTAINER_SILENT" = MATCONTAINER_SILENT,
+// "BREAKDOWN_ALLOYS" = BREAKDOWN_ALLOYS,
+// ))
+
+// DEFINE_BITFIELD(internal_damage, list(
+// "MECHA_INT_FIRE" = MECHA_INT_FIRE,
+// "MECHA_INT_TEMP_CONTROL" = MECHA_INT_TEMP_CONTROL,
+// "MECHA_INT_TANK_BREACH" = MECHA_INT_TANK_BREACH,
+// "MECHA_INT_CONTROL_LOST" = MECHA_INT_CONTROL_LOST,
+// "MECHA_INT_SHORT_CIRCUIT" = MECHA_INT_SHORT_CIRCUIT,
+// ))
+
+// DEFINE_BITFIELD(mecha_flags, list(
+// "ADDING_ACCESS_POSSIBLE" = ADDING_ACCESS_POSSIBLE,
+// "ADDING_MAINT_ACCESS_POSSIBLE" = ADDING_MAINT_ACCESS_POSSIBLE,
+// "CANSTRAFE" = CANSTRAFE,
+// "LIGHTS_ON" = LIGHTS_ON,
+// "SILICON_PILOT" = SILICON_PILOT,
+// "IS_ENCLOSED" = IS_ENCLOSED,
+// "HAS_LIGHTS" = HAS_LIGHTS,
+// ))
+
+// DEFINE_BITFIELD(mob_biotypes, list(
+// "MOB_BEAST" = MOB_BEAST,
+// "MOB_BUG" = MOB_BUG,
+// "MOB_EPIC" = MOB_EPIC,
+// "MOB_HUMANOID" = MOB_HUMANOID,
+// "MOB_MINERAL" = MOB_MINERAL,
+// "MOB_ORGANIC" = MOB_ORGANIC,
+// "MOB_REPTILE" = MOB_REPTILE,
+// "MOB_ROBOTIC" = MOB_ROBOTIC,
+// "MOB_SPIRIT" = MOB_SPIRIT,
+// "MOB_UNDEAD" = MOB_UNDEAD,
+// "MOB_PLANT" = MOB_PLANT
+// ))
+
+// DEFINE_BITFIELD(mob_respiration_type, list(
+// "RESPIRATION_OXYGEN" = RESPIRATION_OXYGEN,
+// "RESPIRATION_N2" = RESPIRATION_N2,
+// "RESPIRATION_PLASMA" = RESPIRATION_PLASMA,
+// ))
+
+// DEFINE_BITFIELD(liked_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(disliked_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(toxic_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(mobility_flags, list(
+// "MOVE" = MOBILITY_MOVE,
+// "PICKUP" = MOBILITY_PICKUP,
+// "PULL" = MOBILITY_PULL,
+// "STAND" = MOBILITY_STAND,
+// "STORAGE" = MOBILITY_STORAGE,
+// "UI" = MOBILITY_UI,
+// "USE" = MOBILITY_USE,
+// ))
+
+// DEFINE_BITFIELD(movement_type, list(
+// "FLOATING" = FLOATING,
+// "FLYING" = FLYING,
+// "GROUND" = GROUND,
+// "PHASING" = PHASING,
+// "VENTCRAWLING" = VENTCRAWLING,
+// ))
+
+// DEFINE_BITFIELD(obj_flags, list(
+// "IN_USE" = IN_USE,
+// "EMAGGED" = EMAGGED,
+// "CAN_BE_HIT" = CAN_BE_HIT,
+// "DANGEROUS_POSSESSION" = DANGEROUS_POSSESSION,
+// "UNIQUE_RENAME" = UNIQUE_RENAME,
+// "BLOCK_Z_OUT_DOWN" = BLOCK_Z_OUT_DOWN,
+// "BLOCK_Z_OUT_UP" = BLOCK_Z_OUT_UP,
+// "BLOCK_Z_IN_DOWN" = BLOCK_Z_IN_DOWN,
+// "BLOCK_Z_IN_UP" = BLOCK_Z_IN_UP,
+// "BLOCKS_CONSTRUCTION" = BLOCKS_CONSTRUCTION,
+// "BLOCKS_CONSTRUCTION_DIR" = BLOCKS_CONSTRUCTION_DIR,
+// "IGNORE_DENSITY" = IGNORE_DENSITY,
+// ))
+
+// DEFINE_BITFIELD(pass_flags, list(
+// "LETPASSTHROW" = LETPASSTHROW,
+// "PASSBLOB" = PASSBLOB,
+// "PASSCLOSEDTURF" = PASSCLOSEDTURF,
+// "PASSGLASS" = PASSGLASS,
+// "PASSGRILLE" = PASSGRILLE,
+// "PASSMOB" = PASSMOB,
+// "PASSTABLE" = PASSTABLE,
+// ))
+
+// DEFINE_BITFIELD(resistance_flags, list(
+// "LAVA_PROOF" = LAVA_PROOF,
+// "FIRE_PROOF" = FIRE_PROOF,
+// "FLAMMABLE" = FLAMMABLE,
+// "ON_FIRE" = ON_FIRE,
+// "UNACIDABLE" = UNACIDABLE,
+// "ACID_PROOF" = ACID_PROOF,
+// "INDESTRUCTIBLE" = INDESTRUCTIBLE,
+// "FREEZE_PROOF" = FREEZE_PROOF,
+// "SHUTTLE_CRUSH_PROOF" = SHUTTLE_CRUSH_PROOF
+// ))
+
+DEFINE_BITFIELD(sight, list(
+ "BLIND" = BLIND,
+ "SEE_BLACKNESS" = SEE_BLACKNESS,
+ "SEE_INFRA" = SEE_INFRA,
+ "SEE_MOBS" = SEE_MOBS,
+ "SEE_OBJS" = SEE_OBJS,
+ "SEE_PIXELS" = SEE_PIXELS,
+ "SEE_SELF" = SEE_SELF,
+ "SEE_THRU" = SEE_THRU,
+ "SEE_TURFS" = SEE_TURFS,
+))
+
+DEFINE_BITFIELD(vis_flags, list(
+ "VIS_HIDE" = VIS_HIDE,
+ "VIS_INHERIT_DIR" = VIS_INHERIT_DIR,
+ "VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
+ "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,
+ "VIS_INHERIT_ID" = VIS_INHERIT_ID,
+ "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER,
+ "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE,
+ "VIS_UNDERLAY" = VIS_UNDERLAY,
+))
+
+// I am so sorry. Required because vis_flags is both undefinable and unreadable on mutable_appearance
+// But we need to display them anyway. See /mutable_appearance/appearance_mirror
+DEFINE_BITFIELD(_vis_flags, list(
+ "VIS_HIDE" = VIS_HIDE,
+ "VIS_INHERIT_DIR" = VIS_INHERIT_DIR,
+ "VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
+ "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,
+ "VIS_INHERIT_ID" = VIS_INHERIT_ID,
+ "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER,
+ "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE,
+ "VIS_UNDERLAY" = VIS_UNDERLAY,
+))
+
+// DEFINE_BITFIELD(zap_flags, list(
+// "ZAP_ALLOW_DUPLICATES" = ZAP_ALLOW_DUPLICATES,
+// "ZAP_MACHINE_EXPLOSIVE" = ZAP_MACHINE_EXPLOSIVE,
+// "ZAP_MOB_DAMAGE" = ZAP_MOB_DAMAGE,
+// "ZAP_MOB_STUN" = ZAP_MOB_STUN,
+// "ZAP_OBJ_DAMAGE" = ZAP_OBJ_DAMAGE,
+// "ZAP_GENERATES_POWER" = ZAP_GENERATES_POWER,
+// ))
+
+// DEFINE_BITFIELD(chemical_flags, list(
+// "REAGENT_DEAD_PROCESS" = REAGENT_DEAD_PROCESS,
+// "REAGENT_DONOTSPLIT" = REAGENT_DONOTSPLIT,
+// "REAGENT_INVISIBLE" = REAGENT_INVISIBLE,
+// "REAGENT_SNEAKYNAME" = REAGENT_SNEAKYNAME,
+// "REAGENT_SPLITRETAINVOL" = REAGENT_SPLITRETAINVOL,
+// "REAGENT_CAN_BE_SYNTHESIZED" = REAGENT_CAN_BE_SYNTHESIZED,
+// "REAGENT_IGNORE_STASIS" = REAGENT_IGNORE_STASIS,
+// "REAGENT_NO_RANDOM_RECIPE" = REAGENT_NO_RANDOM_RECIPE,
+// "REAGENT_CLEANS" = REAGENT_CLEANS,
+// ))
+
+// DEFINE_BITFIELD(reaction_flags, list(
+// "REACTION_CLEAR_IMPURE" = REACTION_CLEAR_IMPURE,
+// "REACTION_CLEAR_INVERSE" = REACTION_CLEAR_INVERSE,
+// "REACTION_CLEAR_RETAIN" = REACTION_CLEAR_RETAIN,
+// "REACTION_NON_INSTANT" = REACTION_NON_INSTANT,
+// "REACTION_HEAT_ARBITARY" = REACTION_HEAT_ARBITARY,
+// "REACTION_COMPETITIVE" = REACTION_COMPETITIVE,
+// "REACTION_PH_VOL_CONSTANT" = REACTION_PH_VOL_CONSTANT,
+// "REACTION_REAL_TIME_SPLIT" = REACTION_REAL_TIME_SPLIT,
+// "REACTION_USES_PURITY" = REACTION_USES_PURITY
+// ))
+
+// DEFINE_BITFIELD(bodytype, list(
+// "BODYTYPE_DIGITIGRADE" = BODYTYPE_DIGITIGRADE,
+// "BODYTYPE_HUMANOID" = BODYTYPE_HUMANOID,
+// "BODYTYPE_MONKEY" = BODYTYPE_MONKEY,
+// "BODYTYPE_ORGANIC" = BODYTYPE_ORGANIC,
+// "BODYTYPE_ROBOTIC" = BODYTYPE_ROBOTIC,
+// "BODYTYPE_SNOUTED" = BODYTYPE_SNOUTED,
+// "BODYTYPE_CUSTOM" = BODYTYPE_CUSTOM,
+// "BODYTYPE_SNOUTED" = BODYTYPE_SNOUTED,
+// ))
+
+// DEFINE_BITFIELD(bodypart_flags, list(
+// "BODYPART_UNREMOVABLE" = BODYPART_UNREMOVABLE,
+// "BODYPART_PSEUDOPART" = BODYPART_PSEUDOPART,
+// "BODYPART_IMPLANTED" = BODYPART_IMPLANTED,
+// ))
+
+// DEFINE_BITFIELD(change_exempt_flags, list(
+// "BP_BLOCK_CHANGE_SPECIES" = BP_BLOCK_CHANGE_SPECIES,
+// ))
+
+// DEFINE_BITFIELD(head_flags, list(
+// "HEAD_HAIR" = HEAD_HAIR,
+// "HEAD_FACIAL_HAIR" = HEAD_FACIAL_HAIR,
+// "HEAD_LIPS" = HEAD_LIPS,
+// "HEAD_EYESPRITES" = HEAD_EYESPRITES,
+// "HEAD_EYECOLOR" = HEAD_EYECOLOR,
+// "HEAD_EYEHOLES" = HEAD_EYEHOLES,
+// "HEAD_DEBRAIN" = HEAD_DEBRAIN,
+// ))
+
+// DEFINE_BITFIELD(supports_variations_flags, list(
+// "CLOTHING_NO_VARIATION" = CLOTHING_NO_VARIATION,
+// "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION,
+// "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON,
+// ))
+
+// DEFINE_BITFIELD(flora_flags, list(
+// "FLORA_HERBAL" = FLORA_HERBAL,
+// "FLORA_WOODEN" = FLORA_WOODEN,
+// "FLORA_STONE" = FLORA_STONE,
+// ))
+
+// DEFINE_BITFIELD(emote_flags, list(
+// "EMOTE_AUDIBLE" = EMOTE_AUDIBLE,
+// "EMOTE_VISIBLE" = EMOTE_VISIBLE,
+// "EMOTE_IMPORTANT" = EMOTE_IMPORTANT,
+// ))
+
+// DEFINE_BITFIELD(organ_flags, list(
+// "ORGAN_SYNTHETIC" = ORGAN_SYNTHETIC,
+// "ORGAN_FROZEN" = ORGAN_FROZEN,
+// "ORGAN_FAILING" = ORGAN_FAILING,
+// "ORGAN_VITAL" = ORGAN_VITAL,
+// "ORGAN_EDIBLE" = ORGAN_EDIBLE,
+// "ORGAN_SYNTHETIC_EMP" = ORGAN_SYNTHETIC_EMP,
+// "ORGAN_UNREMOVABLE" = ORGAN_UNREMOVABLE,
+// "ORGAN_HIDDEN" = ORGAN_HIDDEN,
+// ))
+
+// DEFINE_BITFIELD(respiration_type, list(
+// "RESPIRATION_OXYGEN" = RESPIRATION_OXYGEN,
+// "RESPIRATION_N2" = RESPIRATION_N2,
+// "RESPIRATION_PLASMA" = RESPIRATION_PLASMA,
+// ))
+
+// DEFINE_BITFIELD(sharpness, list(
+// "SHARP_EDGED" = SHARP_EDGED,
+// "SHARP_POINTY" = SHARP_POINTY,
+// ))
+
+// DEFINE_BITFIELD(gun_flags, list(
+// "NOT_A_REAL_GUN" = NOT_A_REAL_GUN,
+// "TOY_FIREARM_OVERLAY" = TOY_FIREARM_OVERLAY,
+// ))
+
+// DEFINE_BITFIELD(physics_flags, list(
+// "MPHYSICS_QDEL_WHEN_NO_MOVEMENT" = MPHYSICS_QDEL_WHEN_NO_MOVEMENT,
+// "MPHYSICS_MOVING" = MPHYSICS_MOVING,
+// "MPHYSICS_PAUSED" = MPHYSICS_PAUSED,
+// ))
diff --git a/code/_global_vars/configuration.dm b/code/_global_vars/configuration.dm
new file mode 100644
index 00000000000..23a1b0cd8b4
--- /dev/null
+++ b/code/_global_vars/configuration.dm
@@ -0,0 +1,9 @@
+GLOBAL_REAL(config, /datum/controller/configuration)
+
+GLOBAL_VAR_INIT(changelog_hash, "")
+
+GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently
+GLOBAL_VAR_INIT(looc_allowed, TRUE)
+GLOBAL_VAR_INIT(dooc_allowed, TRUE)
+GLOBAL_VAR_INIT(dsay_allowed, TRUE)
+
diff --git a/code/_global_vars/lists/icons.dm b/code/_global_vars/lists/icons.dm
new file mode 100644
index 00000000000..ff60e6bc8d9
--- /dev/null
+++ b/code/_global_vars/lists/icons.dm
@@ -0,0 +1,2 @@
+/// Cache of the width and height of icon files, to avoid repeating the same expensive operation
+GLOBAL_LIST_EMPTY(icon_dimensions)
diff --git a/code/_global_vars/logging.dm b/code/_global_vars/logging.dm
new file mode 100644
index 00000000000..9abb66e9668
--- /dev/null
+++ b/code/_global_vars/logging.dm
@@ -0,0 +1,49 @@
+GLOBAL_VAR(game_id)
+GLOBAL_PROTECT(game_id)
+
+/// The directory in which ALL log files should be stored
+GLOBAL_VAR(log_directory)
+GLOBAL_PROTECT(log_directory)
+
+#define DECLARE_LOG_NAMED(log_var_name, log_file_name, start)\
+GLOBAL_VAR(##log_var_name);\
+GLOBAL_PROTECT(##log_var_name);\
+/world/_initialize_log_files(temp_log_override = null){\
+ ..();\
+ GLOB.##log_var_name = temp_log_override || "[GLOB.log_directory]/[##log_file_name].log";\
+ if(!temp_log_override && ##start){\
+ start_log(GLOB.##log_var_name);\
+ }\
+}
+
+#define DECLARE_LOG(log_name, start) DECLARE_LOG_NAMED(##log_name, "[copytext(#log_name, 1, length(#log_name) - 4)]", start)
+#define START_LOG TRUE
+#define DONT_START_LOG FALSE
+
+/// Populated by log declaration macros to set log file names and start messages
+/world/proc/_initialize_log_files(temp_log_override = null)
+ // Needs to be here to avoid compiler warnings
+ SHOULD_CALL_PARENT(TRUE)
+ return
+
+// All individual log files.
+// These should be used where the log category cannot easily be a json log file.
+DECLARE_LOG(config_error_log, DONT_START_LOG)
+DECLARE_LOG(perf_log, DONT_START_LOG) // Declared here but name is set in time_track subsystem
+
+/// All admin related log lines minus their categories
+GLOBAL_LIST_EMPTY(admin_activities)
+GLOBAL_PROTECT(admin_activities)
+
+/// All bomb related messages
+GLOBAL_LIST_EMPTY(bombers)
+GLOBAL_PROTECT(bombers)
+
+/// Stores who uploaded laws to which silicon-based lifeform, and what the law was
+GLOBAL_LIST_EMPTY(lawchanges)
+GLOBAL_PROTECT(lawchanges)
+
+#undef DECLARE_LOG
+#undef DECLARE_LOG_NAMED
+#undef START_LOG
+#undef DONT_START_LOG
diff --git a/code/_global_vars/misc.dm b/code/_global_vars/misc.dm
index 79c0e85c210..10f0ee88760 100644
--- a/code/_global_vars/misc.dm
+++ b/code/_global_vars/misc.dm
@@ -27,9 +27,7 @@ GLOBAL_LIST_INIT(custom_kits, list(
/obj/item/ammo_magazine/ihclrifle,
/obj/item/ammo_magazine/ihclrifle)))
-// LOGGING MOVE ME //
-GLOBAL_VAR(log_directory)
-GLOBAL_PROTECT(log_directory)
-
// TGUI MOVE ME //
GLOBAL_DATUM(changelog_tgui, /datum/changelog)
+
+GLOBAL_VAR_INIT(Debug2, 0)
diff --git a/code/_global_vars/names.dm b/code/_global_vars/names.dm
new file mode 100644
index 00000000000..9b1efe269b3
--- /dev/null
+++ b/code/_global_vars/names.dm
@@ -0,0 +1,20 @@
+
+GLOBAL_VAR_INIT(station_name, DEFAULT_STATION_NAME)
+GLOBAL_VAR_INIT(station_short, "Eris")
+
+GLOBAL_VAR_INIT(dock_name, "NTV Faith")
+GLOBAL_PROTECT(dock_name)
+
+GLOBAL_VAR_INIT(boss_name, "Hansa Trade Union")
+GLOBAL_PROTECT(boss_name)
+
+GLOBAL_VAR_INIT(boss_short, "Hansa")
+GLOBAL_PROTECT(boss_short)
+
+GLOBAL_VAR_INIT(company_name, "CEV Eris")
+GLOBAL_PROTECT(company_name)
+
+GLOBAL_VAR_INIT(company_short, "Eris")
+GLOBAL_PROTECT(company_short)
+
+GLOBAL_VAR_INIT(game_version, "Discordia")
diff --git a/code/_global_vars/time_vars.dm b/code/_global_vars/time_vars.dm
new file mode 100644
index 00000000000..29526f845b2
--- /dev/null
+++ b/code/_global_vars/time_vars.dm
@@ -0,0 +1,6 @@
+
+/// The difference betwen midnight (of the host computer) and 0 world.ticks.
+GLOBAL_VAR_INIT(timezoneOffset, 0)
+
+GLOBAL_VAR_INIT(year, time2text(world.realtime, "YYYY", NO_TIMEZONE))
+GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 9f226cb3aa3..ad95af22062 100755
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -129,7 +129,7 @@
return 1
throw_mode_off()
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
if(W == A) // Handle attack_self
W.attack_self(src)
@@ -295,6 +295,7 @@
/atom/movable/CtrlClick(mob/user, params)
if(Adjacent(user))
user.start_pulling(src)
+ user.animate_interact(src, INTERACT_GRAB)
/*
Alt click
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 4ab788d299b..c7c4f240aa5 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -56,7 +56,7 @@
return
*/
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
// Cyborgs have no range-checking unless there is item use
if(!W)
diff --git a/code/_onclick/hud/screen_objects/base_screen_objects.dm b/code/_onclick/hud/screen_objects/base_screen_objects.dm
index 986149edaae..04f27cb6e8b 100644
--- a/code/_onclick/hud/screen_objects/base_screen_objects.dm
+++ b/code/_onclick/hud/screen_objects/base_screen_objects.dm
@@ -154,7 +154,7 @@
return
var/mob/living/M = owner.loc
- if(M.client && M.get_active_hand() == owner)
+ if(M.client && M.get_active_held_item() == owner)
if(M.client.prefs.UI_compact_style)
screen_loc = minloc
else
@@ -235,6 +235,11 @@
if(icon_x in 14 to 18)
selecting = BP_EYES
+ logger.Log(
+ LOG_CATEGORY_TARGET_ZONE_SWITCH,
+ "[key_name(src)] manually changed selected zone (UI)",
+ data = selecting
+ )
set_selected_zone(selecting)
return TRUE
@@ -273,7 +278,7 @@
if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
return TRUE
if(master)
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if(I)
usr.ClickOn(master)
return TRUE
diff --git a/code/_onclick/hud/screen_objects/robot_screen_objects.dm b/code/_onclick/hud/screen_objects/robot_screen_objects.dm
index 6345bf3cb98..61b285f34eb 100644
--- a/code/_onclick/hud/screen_objects/robot_screen_objects.dm
+++ b/code/_onclick/hud/screen_objects/robot_screen_objects.dm
@@ -131,6 +131,7 @@
else
icon_state = "health6"
else
+ var/dead_threshold = CONFIG_GET(number/health_threshold_dead)
switch(parentmob.health)
if(200 to INFINITY)
icon_state = "health0"
@@ -142,10 +143,10 @@
icon_state = "health3"
if(0 to 50)
icon_state = "health4"
- if(HEALTH_THRESHOLD_DEAD to 0)
- icon_state = "health5"
else
icon_state = "health6"
+ if (parentmob.health > 0 && parentmob.health <= dead_threshold )
+ icon_state = "health5"
else
icon_state = "health7"
@@ -223,4 +224,4 @@
icon_state = "robotpull1"
else
icon_state = "robotpull0"
-//-----------------------ROBOT stuff end---------------------
\ No newline at end of file
+//-----------------------ROBOT stuff end---------------------
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index e0907d8f31b..f1e88706588 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -8,7 +8,7 @@
Otherwise pretty standard.
*/
-/mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity, params)
+/mob/living/carbon/human/UnarmedAttack(atom/A, var/proximity, params)
if(!..())
return
@@ -20,7 +20,9 @@
if(istype(G) && G.Touch(A, 1))
return
- A.attack_hand(src, params)
+ . = A.attack_hand(src, params)
+ if (.)
+ animate_interact(A, INTERACT_GENERIC)
/atom/proc/attack_hand(mob/user as mob, params)
. = FALSE
diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm
index 33ff8e77be7..ae366acd515 100644
--- a/code/controllers/admin.dm
+++ b/code/controllers/admin.dm
@@ -9,7 +9,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
. = ..()
name = text
src.target = target
- if(istype(target, /datum)) //Harddel man bad
+ if(isdatum(target)) //Harddel man bad
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(cleanup))
/obj/effect/statclick/Destroy()
@@ -35,7 +35,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
class = "subsystem"
else if(istype(target, /datum/controller))
class = "controller"
- else if(istype(target, /datum))
+ else if(isdatum(target))
class = "datum"
else
class = "unknown"
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
deleted file mode 100644
index bbf8d0a5ae8..00000000000
--- a/code/controllers/configuration.dm
+++ /dev/null
@@ -1,864 +0,0 @@
-
-GLOBAL_LIST_EMPTY(storyteller_cache)
-
-/datum/configuration
- var/server_name // server name (for world name / status)
- var/server_suffix = 0 // generate numeric suffix based on server port
-
- var/loaded = FALSE // If the config is loaded or not
- var/nudge_script_path = "nudge.py" // where the nudge.py script is located
-
- var/log_ooc = 0 // log OOC channel
- var/log_access = 0 // log login/logout
- var/log_say = 0 // log client say
- var/log_admin = 0 // log admin actions
- var/log_debug = 1 // log debug output
- var/log_game = 0 // log game events
- var/log_vote = 0 // log voting
- var/log_whisper = 0 // log client whisper
- var/log_emote = 0 // log emotes
- var/log_attack = 0 // log attack messages
- var/log_adminchat = 0 // log admin chat messages
- var/log_adminwarn = 0 // log warnings admins get about bomb construction and such
- var/log_pda = 0 // log pda messages
- var/log_hrefs = 0 // logs all links clicked in-game. Could be used for debugging and tracking down exploits
- var/log_runtime = 0 // logs world.log to a file
- var/log_world_output = 0 // log log_world(messages)
- var/sql_enabled = 1 // for sql switching
- var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
- var/allow_vote_restart = 0 // allow votes to restart
- var/ert_admin_call_only = 0
- var/allow_vote_mode = 0 // allow votes to change mode
- var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
- var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
- var/vote_autogamemode_timeleft = 100 //Length of time before round start when autogamemode vote is called (in seconds, default 100).
- var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
- var/vote_no_dead = 0 // dead people can't vote (tbi)
- //var/enable_authentication = 0 // goon authentication
- var/del_new_on_log = 1 // del's new players if they log before they spawn in
- var/objectives_disabled = 0 //if objectives are disabled or not
- var/protect_roles_from_antagonist = 0// If security and such can be contractor/cult/other
- var/allow_Metadata = 0 // Metadata is supported.
- var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
- var/tick_limit_mc_init = TICK_LIMIT_MC_INIT_DEFAULT //SSinitialization throttling
- var/fps = 40
- var/socket_talk = 0 // use socket_talk to communicate with other processes
- var/list/resource_urls
- var/antag_hud_allowed = 0 // Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
- var/antag_hud_restricted = 0 // Ghosts that turn on Antagovision cannot rejoin the round.
- var/list/storyteller_names = list()
- var/list/storytellers = list() // allowed modes
- var/humans_need_surnames = 0
- var/allow_random_events = 0 // enables random events mid-round when set to 1
- var/allow_ai = 0 // allow ai job
- var/hostedby
- var/respawn_delay = 30
- var/guest_jobban = 1
- var/usewhitelist = 0
- var/kick_inactive = 0 //force disconnect for inactive players after this many minutes, if non-0
- var/show_mods = 0
- var/show_mentors = 0
- var/mods_can_tempban = 0
- var/mods_can_job_tempban = 0
- var/mod_tempban_max = 1440
- var/mod_job_tempban_max = 1440
- var/load_jobs_from_txt = 0
- var/ToRban = 0
- var/automute_on = 0 //enables automuting/spam prevention
- var/use_cortical_stacks = 0 //enables neural lace
- var/empty_server_restart_time = 0 // Time in minutes before empty server will restart
-
- var/character_slots = 10 // The number of available character slots
- var/loadout_slots = 3 // The number of loadout slots per character
-
- var/max_gear_cost = 10 // Used in chargen for accessory loadout limit. 0 disables loadout, negative allows infinite points.
-
- var/max_maint_drones = 5 //This many drones can spawn,
- var/allow_drone_spawn = 1 //assuming the admin allow them to.
- var/drone_build_time = 1200 //A drone will become available every X ticks since last drone spawn. Default is 2 minutes.
-
- var/enable_mob_sleep = 1 //Experimental - make mobs sleep when no danger is present
-
- var/disable_player_mice = 0
- var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech
-
- var/allow_extra_antags = 0
- var/guests_allowed = 1
- var/debugparanoid = 0
-
- var/language
- var/serverurl
- var/server
- var/banappeals
- var/wikiurl
- var/forumurl
- var/githuburl
- var/discordurl
-
- var/static/ip_reputation = FALSE //Should we query IPs to get scores? Generates HTTP traffic to an API service.
- var/static/ipr_email //Left null because you MUST specify one otherwise you're making the internet worse.
- var/static/ipr_block_bad_ips = FALSE //Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat).
- var/static/ipr_bad_score = 1 //The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad.
- var/static/ipr_allow_existing = FALSE //Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect.
- var/static/ipr_minimum_age = 5 //How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs.
- var/static/ipqualityscore_apikey //API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided.
-
- var/static/panic_bunker = FALSE //Only allow ckeys who have already been seen by the DB. Only makes sense if you have a DB.
- var/static/paranoia_logging = FALSE //Log new byond accounts and first-time joins
-
- //Alert level description
- var/alert_desc_green = "All threats to the ship have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
- var/alert_desc_blue_upto = "The ship has received reliable information about possible hostile activity on the ship. Security staff may have weapons visible, random searches are permitted."
- var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed."
- var/alert_desc_red_upto = "There is an immediate serious threat to the ship. Security may have weapons unholstered at all times. Random searches are allowed and advised."
- var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the ship. Security may have weapons unholstered at all times, random searches are allowed and advised."
-
- var/forbid_singulo_possession = 0
-
- var/organs_decay
-
- //Paincrit knocks someone down once they hit 60 shock_stage, so by default make it so that close to 100 additional damage needs to be dealt,
- //so that it's similar to HALLOSS. Lowered it a bit since hitting paincrit takes much longer to wear off than a halloss stun.
- var/organ_damage_spillover_multiplier = 0.5
-
- var/bones_can_break = 0
- var/limbs_can_break = 1
-
- var/revival_pod_plants = 1
- var/revival_cloning = 1
- var/revival_brain_life = -1
-
- var/use_loyalty_implants = 0
-
- var/welder_vision = 1
- var/generate_asteroid = 0
- var/no_click_cooldown = 0
- var/z_level_shooting = TRUE
-
- var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
- var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
- var/admin_memo_system = 0
-
- var/simultaneous_pm_warning_timeout = 100
-
- var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions.
-
- var/assistant_maint = 0 //Do assistants get maint access?
- var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
- var/ghost_interaction = 0
-
- var/comms_password = ""
-
- var/forbid_admin_profiling = FALSE
-
- var/list/forbidden_versions = list() // Clients with these byond versions will be autobanned. Format: string "byond_version.byond_build"; separate with ; in config, e.g. 512.1234;512.1235
- var/minimum_byond_version
- var/minimum_byond_build
-
- var/enter_allowed = 1
-
- var/use_irc_bot = 0
- var/irc_bot_host = ""
- var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge
- var/main_irc = ""
- var/admin_irc = ""
- var/announce_shuttle_dock_to_irc = FALSE
- var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix
- var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
- var/use_overmap = 0
-
- var/start_location = "asteroid" // Start location defaults to asteroid.
-
- // Event settings
- var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours
- // If the first delay has a custom start time
- // No custom time, no custom time, between 80 to 100 minutes respectively.
- var/list/event_first_run = list(
- EVENT_LEVEL_MUNDANE = null,
- EVENT_LEVEL_MODERATE = null,
- EVENT_LEVEL_MAJOR = list("lower" = 48000, "upper" = 60000),
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = list("lower" = 16000, "upper" = 20000),
- )
- // The lowest delay until next event
- // 10, 30, 50 minutes respectively
- var/list/event_delay_lower = list(
- EVENT_LEVEL_MUNDANE = 6000,
- EVENT_LEVEL_MODERATE = 18000,
- EVENT_LEVEL_MAJOR = 30000,
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = 18000
- )
- // The upper delay until next event
- // 15, 45, 70 minutes respectively
- var/list/event_delay_upper = list(
- EVENT_LEVEL_MUNDANE = 9000,
- EVENT_LEVEL_MODERATE = 27000,
- EVENT_LEVEL_MAJOR = 42000,
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = 18000
- )
-
- var/abandon_allowed = 1
- var/ooc_allowed = 1
- var/looc_allowed = 1
- var/dooc_allowed = 1
- var/dsay_allowed = 1
-
- var/starlight = "#ffffff" // null if turned off
-
- var/list/ert_species = list(SPECIES_HUMAN)
-
- var/law_zero = "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010"
-
- var/aggressive_changelog = 0
-
- var/list/language_prefixes = list(",", "#", "-")//Default language prefixes
-
- var/ghosts_can_possess_animals = 0
-
- var/emojis = 0
-
- var/paper_input = TRUE
-
- var/random_submap_orientation = FALSE // If true, submaps loaded automatically can be rotated.
-
- var/webhook_url
- var/webhook_key
-
- var/tts_key // Login and password that we use to generate tts_bearer
- var/tts_enabled // Global switch
- var/tts_cache // Store generated tts files and reuse them, instead of always requesting new
-
- var/static/regex/ic_filter_regex //For the cringe filter.
-
- var/generate_loot_data = FALSE //for loot rework
-
- var/profiler_permission = R_DEBUG | R_SERVER
-
-/datum/configuration/New()
- fill_storyevents_list()
-
- var/list/L = typesof(/datum/storyteller)-/datum/storyteller
- for (var/T in L)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- var/datum/storyteller/S = new T()
- if (S.config_tag)
- GLOB.storyteller_cache[S.config_tag] = S // So we don't instantiate them repeatedly.
- if(!(S.config_tag in storytellers)) // ensure each mode is added only once
- log_misc("Adding storyteller [S.name] ([S.config_tag]) to configuration.")
- src.storytellers += S.config_tag
- src.storyteller_names[S.config_tag] = S.name
-
-/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
- var/list/Lines = file2list(filename)
-
- for(var/t in Lines)
- if(!t) continue
-
- t = trim(t)
- if (length(t) == 0)
- continue
- else if (copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name
- var/value
-
- if (pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if (!name)
- continue
-
- if(type == "config")
- switch (name)
- if ("resource_urls")
- config.resource_urls = splittext(value, " ")
-
- if ("admin_legacy_system")
- config.admin_legacy_system = 1
-
- if ("ban_legacy_system")
- config.ban_legacy_system = 1
-
- if ("admin_memo_system")
- config.admin_memo_system = 1
-
- if ("use_recursive_explosions")
- use_recursive_explosions = 1
-
- if ("log_ooc")
- config.log_ooc = 1
-
- if ("log_access")
- config.log_access = 1
-
- if ("sql_enabled")
- config.sql_enabled = 1
-
- if ("log_say")
- config.log_say = 1
-
- if ("debug_paranoid")
- config.debugparanoid = 1
-
- if ("log_admin")
- config.log_admin = 1
-
- if ("log_debug")
- config.log_debug = 1
-
- if ("log_game")
- config.log_game = 1
-
- if ("log_vote")
- config.log_vote = 1
-
- if ("log_whisper")
- config.log_whisper = 1
-
- if ("log_attack")
- config.log_attack = 1
-
- if ("log_emote")
- config.log_emote = 1
-
- if ("log_adminchat")
- config.log_adminchat = 1
-
- if ("log_adminwarn")
- config.log_adminwarn = 1
-
- if ("log_pda")
- config.log_pda = 1
-
- if ("log_world_output")
- config.log_world_output = 1
-
- if ("log_hrefs")
- config.log_hrefs = 1
-
- if ("log_runtime")
- config.log_runtime = 1
- var/newlog = file("data/logs/runtimes/runtime-[time2text(world.realtime, "YYYY-MM-DD")].log")
- if(runtime_diary != newlog)
- world.log << "Now logging runtimes to data/logs/runtimes/runtime-[time2text(world.realtime, "YYYY-MM-DD")].log"
- runtime_diary = newlog
-
- if ("generate_asteroid")
- config.generate_asteroid = 1
-
- if ("no_click_cooldown")
- config.no_click_cooldown = 1
-
- if("allow_admin_ooccolor")
- config.allow_admin_ooccolor = 1
-
- if ("allow_vote_restart")
- config.allow_vote_restart = 1
-
- if ("allow_vote_mode")
- config.allow_vote_mode = 1
-
- if ("no_dead_vote")
- config.vote_no_dead = 1
-
- if ("default_no_vote")
- config.vote_no_default = 1
-
- if ("vote_delay")
- config.vote_delay = text2num(value)
-
- if ("vote_period")
- config.vote_period = text2num(value)
-
- if ("vote_autogamemode_timeleft")
- config.vote_autogamemode_timeleft = text2num(value)
-
- if("ert_admin_only")
- config.ert_admin_call_only = 1
-
- if ("allow_ai")
- config.allow_ai = 1
-
-// if ("authentication")
-// config.enable_authentication = 1
-
- if ("respawn_delay")
- config.respawn_delay = text2num(value)
-
- if ("servername")
- config.server_name = value
-
- if ("serversuffix")
- config.server_suffix = 1
-
- if ("nudge_script_path")
- config.nudge_script_path = value
-
- if ("hostedby")
- config.hostedby = value
-
- if ("serverurl")
- config.serverurl = value
-
- if ("language")
- config.language = value
-
- if ("server")
- config.server = value
-
- if ("banappeals")
- config.banappeals = value
-
- if ("wikiurl")
- config.wikiurl = value
-
- if ("discordurl")
- config.discordurl = value
-
- if ("forumurl")
- config.forumurl = value
-
- if ("githuburl")
- config.githuburl = value
-
- if("ip_reputation")
- config.ip_reputation = 1
-
- if("ipr_email")
- config.ipr_email = value
-
- if("ipr_block_bad_ips")
- config.ipr_block_bad_ips = 1
-
- if("ipr_bad_score")
- config.ipr_bad_score = text2num(value)
-
- if("ipr_allow_existing")
- config.ipr_allow_existing = 1
-
- if("ipr_minimum_age")
- config.ipr_minimum_age = text2num(value)
-
- if ("ipqualityscore_apikey")
- config.ipqualityscore_apikey = value
-
- if ("panic_bunker")
- config.panic_bunker = 1
-
- if ("paranoia_logging")
- config.paranoia_logging = 1
-
- if ("ghosts_can_possess_animals")
- config.ghosts_can_possess_animals = value
-
- if ("guest_jobban")
- config.guest_jobban = 1
-
- if ("guest_ban")
- config.guests_allowed = 0
-
- if ("disable_ooc")
- config.ooc_allowed = 0
- config.looc_allowed = 0
-
- if ("disable_entry")
- config.enter_allowed = 0
-
- if ("disable_dead_ooc")
- config.dooc_allowed = 0
-
- if ("disable_dsay")
- config.dsay_allowed = 0
-
- if ("disable_respawn")
- config.abandon_allowed = 0
-
- if ("usewhitelist")
- config.usewhitelist = 1
-
- if ("allow_metadata")
- config.allow_Metadata = 1
-
- if ("objectives_disabled")
- config.objectives_disabled = 1
-
- if("protect_roles_from_antagonist")
- config.protect_roles_from_antagonist = 1
-
- if("allow_random_events")
- config.allow_random_events = 1
-
- if("kick_inactive")
- config.kick_inactive = text2num(value)
-
- if("show_mods")
- config.show_mods = 1
-
- if("show_mentors")
- config.show_mentors = 1
-
- if("mods_can_tempban")
- config.mods_can_tempban = 1
-
- if("mods_can_job_tempban")
- config.mods_can_job_tempban = 1
-
- if("mod_tempban_max")
- config.mod_tempban_max = text2num(value)
-
- if("mod_job_tempban_max")
- config.mod_job_tempban_max = text2num(value)
-
- if("load_jobs_from_txt")
- load_jobs_from_txt = 1
-
- if("alert_red_upto")
- config.alert_desc_red_upto = value
-
- if("alert_red_downto")
- config.alert_desc_red_downto = value
-
- if("alert_blue_downto")
- config.alert_desc_blue_downto = value
-
- if("alert_blue_upto")
- config.alert_desc_blue_upto = value
-
- if("alert_green")
- config.alert_desc_green = value
-
- if("forbid_singulo_possession")
- forbid_singulo_possession = 1
-
- if("popup_admin_pm")
- config.popup_admin_pm = 1
-
- if("use_irc_bot")
- use_irc_bot = 1
-
- if("irc_bot_export")
- irc_bot_export = 1
-
- if("fps")
- fps = text2num(value)
-
- if("tick_limit_mc_init")
- tick_limit_mc_init = text2num(value)
-
- if("allow_antag_hud")
- config.antag_hud_allowed = 1
- if("antag_hud_restricted")
- config.antag_hud_restricted = 1
-
- if("socket_talk")
- socket_talk = text2num(value)
-
- if("humans_need_surnames")
- humans_need_surnames = 1
-
- if("tor_ban")
- ToRban = 1
-
- if("automute_on")
- automute_on = 1
-
- if("assistant_maint")
- config.assistant_maint = 1
-
- if("gateway_delay")
- config.gateway_delay = text2num(value)
-
- if("ghost_interaction")
- config.ghost_interaction = 1
-
- if("disable_player_mice")
- config.disable_player_mice = 1
-
- if("uneducated_mice")
- config.uneducated_mice = 1
-
- if("comms_password")
- config.comms_password = value
-
- if("forbidden_versions")
- config.forbidden_versions = splittext(value, ";")
-
- if("minimum_byond_version")
- config.minimum_byond_version = text2num(value)
-
- if("minimum_byond_build")
- config.minimum_byond_build = text2num(value)
-
- if("irc_bot_host")
- config.irc_bot_host = value
-
- if("main_irc")
- config.main_irc = value
-
- if("admin_irc")
- config.admin_irc = value
-
- if("announce_shuttle_dock_to_irc")
- config.announce_shuttle_dock_to_irc = TRUE
-
- if("python_path")
- if(value)
- config.python_path = value
-
- if("use_lib_nudge")
- config.use_lib_nudge = 1
-
- if("max_gear_cost")
- max_gear_cost = text2num(value)
- if(max_gear_cost < 0)
- max_gear_cost = INFINITY
-
- if("character_slots")
- config.character_slots = text2num(value)
-
- if("allow_drone_spawn")
- config.allow_drone_spawn = text2num(value)
-
- if("drone_build_time")
- config.drone_build_time = text2num(value)
-
- if("max_maint_drones")
- config.max_maint_drones = text2num(value)
-
- if("use_overmap")
- config.use_overmap = 1
-
- if("expected_round_length")
- config.expected_round_length = MinutesToTicks(text2num(value))
-
- if("disable_welder_vision")
- config.welder_vision = 0
-
- if("allow_extra_antags")
- config.allow_extra_antags = 1
-
- if("event_custom_start_mundane")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MUNDANE] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_moderate")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MODERATE] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_major")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MAJOR] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_economy")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_ECONOMY] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_delay_lower")
- var/values = text2numlist(value, ";")
- config.event_delay_lower[EVENT_LEVEL_MUNDANE] = MinutesToTicks(values[1])
- config.event_delay_lower[EVENT_LEVEL_MODERATE] = MinutesToTicks(values[2])
- config.event_delay_lower[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3])
- config.event_delay_lower[EVENT_LEVEL_ECONOMY] = MinutesToTicks(values[4])
-
- if("event_delay_upper")
- var/values = text2numlist(value, ";")
- config.event_delay_upper[EVENT_LEVEL_MUNDANE] = MinutesToTicks(values[1])
- config.event_delay_upper[EVENT_LEVEL_MODERATE] = MinutesToTicks(values[2])
- config.event_delay_upper[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3])
- config.event_delay_upper[EVENT_LEVEL_ECONOMY] = MinutesToTicks(values[4])
-
- if("starlight")
- config.starlight = value ? value : 0
-
- if("random_submap_orientation")
- config.random_submap_orientation = 1
-
- if("ert_species")
- config.ert_species = splittext(value, ";")
- if(!config.ert_species.len)
- config.ert_species += SPECIES_HUMAN
-
- if("use_cortical_stacks")
- config.use_cortical_stacks = 1
-
- if("loadout_slots")
- config.loadout_slots = text2num(value)
-
- if("law_zero")
- law_zero = value
-
- if("aggressive_changelog")
- config.aggressive_changelog = 1
-
- if("default_language_prefixes")
- var/list/values = splittext(value, " ")
- if(values.len > 0)
- language_prefixes = values
-
- if("empty_server_restart_time")
- config.empty_server_restart_time = text2num(value)
-
- if("emojis")
- config.emojis = 1
-
- if("paper_input")
- config.paper_input = text2num(value)
-
- if("enable_mob_sleep")
- config.enable_mob_sleep = 1
-
- if("webhook_key")
- config.webhook_key = value
-
- if("webhook_url")
- config.webhook_url = value
-
- if("tts_key")
- config.tts_key = value
-
- if("tts_enabled")
- config.tts_enabled = config.tts_key ? value : FALSE
-
- if("tts_cache")
- config.tts_cache = value
-
- if("random_start")
- var/list/startlist = list(
- "asteroid",
- "abandoned fortress",
- "space ruins")
- var/pick = rand(1, startlist.len)
- config.start_location = startlist[pick]
-
- if("asteroid_start")
- config.start_location = "asteroid"
-
- if("fortress_start")
- config.start_location = "abandoned fortress"
-
- if("ruins_start")
- config.start_location = "space ruins"
-
- if("profiler_permission")
- config.profiler_permission = text2num(value)
-
- if("generate_loot_data")
- config.generate_loot_data = TRUE
- else
- log_misc("Unknown setting in configuration: '[name]'")
-
-
- else if(type == "game_options")
- if(!value)
- log_misc("Unknown value for setting [name] in [filename].")
- value = text2num(value)
-
- switch(name)
- if("revival_pod_plants")
- config.revival_pod_plants = value
- if("revival_cloning")
- config.revival_cloning = value
- if("revival_brain_life")
- config.revival_brain_life = value
- if("organ_damage_spillover_multiplier")
- config.organ_damage_spillover_multiplier = value / 100
- if("organs_can_decay")
- config.organs_decay = 1
- if("bones_can_break")
- config.bones_can_break = value
- if("limbs_can_break")
- config.limbs_can_break = value
- if("use_loyalty_implants")
- config.use_loyalty_implants = 1
- else
- log_misc("Unknown setting in configuration: '[name]'")
- loaded = TRUE
- LoadChatFilter()
-
-/datum/configuration/proc/loadsql(filename) // -- TLE
- var/list/Lines = file2list(filename)
- for(var/t in Lines)
- if(!t) continue
-
- t = trim(t)
- if (length(t) == 0)
- continue
- else if (copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name
- var/value
-
- if (pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if (!name)
- continue
-
- switch (name)
- if ("address")
- sqladdress = value
- if ("port")
- sqlport = value
- if ("database")
- sqldb = value
- if ("login")
- sqllogin = value
- if ("password")
- sqlpass = value
- else
- log_misc("Unknown setting in configuration: '[name]'")
-
-/datum/configuration/proc/pick_storyteller(story_name)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- if(story_name in GLOB.storyteller_cache)
- return GLOB.storyteller_cache[story_name]
-
- return GLOB.storyteller_cache[STORYTELLER_BASE]
-
-/datum/configuration/proc/get_storytellers()
- var/list/runnable_storytellers = list()
- for(var/storyteller in GLOB.storyteller_cache)
- var/datum/storyteller/S = GLOB.storyteller_cache[storyteller]
- if(S)
- runnable_storytellers |= S
- return runnable_storytellers
-
-
-
-/datum/configuration/proc/post_load()
- //apply a default value to config.python_path, if needed
- if (!config.python_path)
- if(world.system_type == UNIX)
- config.python_path = "/usr/bin/env python2"
- else //probably windows, if not this should work anyway
- config.python_path = "python"
-
- world.name = station_name
-
-
-/datum/configuration/proc/LoadChatFilter()
- GLOB.in_character_filter = list()
-
- for(var/line in world.file2list("config/in_character_filter.txt"))
- if(!line)
- continue
- if(findtextEx(line,"#",1,2))
- continue
- GLOB.in_character_filter += line
-
- if(!ic_filter_regex && GLOB.in_character_filter.len)
- ic_filter_regex = regex("\\b([jointext(GLOB.in_character_filter, "|")])\\b", "i")
diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
new file mode 100644
index 00000000000..def6534f2fc
--- /dev/null
+++ b/code/controllers/configuration/config_entry.dm
@@ -0,0 +1,303 @@
+/datum/config_entry
+ /// Read-only, this is determined by the last portion of the derived entry type
+ var/name
+ /// The configured value for this entry. This shouldn't be initialized in code, instead set default
+ var/config_entry_value
+ /// Read-only default value for this config entry, used for resetting value to defaults when necessary. This is what config_entry_value is initially set to
+ var/default
+ /// The file which this was loaded from, if any
+ var/resident_file
+ /// Set to TRUE if the default has been overridden by a config entry
+ var/modified = FALSE
+ /// The config name of a configuration type that depricates this, if it exists
+ var/deprecated_by
+ /// The /datum/config_entry type that supercedes this one
+ var/protection = NONE
+ /// Do not instantiate if type matches this
+ var/abstract_type = /datum/config_entry
+ /// Force validate and set on VV. VAS proccall guard will run regardless.
+ var/vv_VAS = TRUE
+ /// Controls if error is thrown when duplicate configuration values for this entry type are encountered
+ var/dupes_allowed = FALSE
+ /// Stores the original protection configuration, used for set_default()
+ var/default_protection
+
+/datum/config_entry/New()
+ if(type == abstract_type)
+ CRASH("Abstract config entry [type] instatiated!")
+ name = lowertext(type2top(type))
+ default_protection = protection
+ set_default()
+
+/datum/config_entry/Destroy()
+ config.RemoveEntry(src)
+ return ..()
+
+/**
+ * Returns the value of the configuration datum to its default, used for resetting a config value. Note this also sets the protection back to default.
+ */
+/datum/config_entry/proc/set_default()
+ if ((protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall())
+ log_admin("[key_name(usr)] attempted to reset locked config entry [type] to its default")
+ return
+ if (islist(default))
+ var/list/L = default
+ config_entry_value = L.Copy()
+ else
+ config_entry_value = default
+ protection = default_protection
+ resident_file = null
+ modified = FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/can_vv_get(var_name)
+// . = ..()
+// if(var_name == NAMEOF(src, config_entry_value) || var_name == NAMEOF(src, default))
+// . &= !(protection & CONFIG_ENTRY_HIDDEN)
+
+// /datum/config_entry/vv_edit_var(var_name, var_value)
+// var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed))
+// if(var_name == NAMEOF(src, config_entry_value))
+// if(protection & CONFIG_ENTRY_LOCKED)
+// return FALSE
+// if(vv_VAS)
+// . = ValidateAndSet("[var_value]")
+// if(.)
+// datum_flags |= DF_VAR_EDITED
+// return
+// else
+// return ..()
+// if(var_name in banned_edits)
+// return FALSE
+// return ..()
+
+/datum/config_entry/proc/VASProcCallGuard(str_val)
+ . = !((protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall())
+ if(!.)
+ log_admin("[key_name(usr)] attempted to set locked config entry [type] to '[str_val]'")
+
+/datum/config_entry/proc/ValidateAndSet(str_val)
+ VASProcCallGuard(str_val)
+ CRASH("Invalid config entry type!")
+
+/datum/config_entry/proc/ValidateListEntry(key_name, key_value)
+ return TRUE
+
+/datum/config_entry/proc/DeprecationUpdate(value)
+ return
+
+/datum/config_entry/string
+ default = ""
+ abstract_type = /datum/config_entry/string
+ var/auto_trim = TRUE
+ /// whether the string will be lowercased on ValidateAndSet or not.
+ var/lowercase = FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+
+// /datum/config_entry/string/vv_edit_var(var_name, var_value)
+// return var_name != NAMEOF(src, auto_trim) && ..()
+
+/datum/config_entry/string/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ config_entry_value = auto_trim ? trim(str_val) : str_val
+ if(lowercase)
+ config_entry_value = lowertext(config_entry_value)
+ return TRUE
+
+/datum/config_entry/number
+ default = 0
+ abstract_type = /datum/config_entry/number
+ var/integer = TRUE
+ var/max_val = INFINITY
+ var/min_val = -INFINITY
+
+/datum/config_entry/number/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ var/temp = text2num(trim(str_val))
+ if(!isnull(temp))
+ config_entry_value = clamp(integer ? round(temp) : temp, min_val, max_val)
+ if(config_entry_value != temp && !(datum_flags & DF_VAR_EDITED))
+ log_config("Changing [name] from [temp] to [config_entry_value]!")
+ return TRUE
+ return FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/number/vv_edit_var(var_name, var_value)
+// var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer))
+// return !(var_name in banned_edits) && ..()
+
+/datum/config_entry/flag
+ default = FALSE
+ abstract_type = /datum/config_entry/flag
+
+/datum/config_entry/flag/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ config_entry_value = text2num(trim(str_val)) != 0
+ return TRUE
+
+/// List config entry, used for configuring a list of strings
+/datum/config_entry/str_list
+ abstract_type = /datum/config_entry/str_list
+ default = list()
+ dupes_allowed = TRUE
+ /// whether the string elements will be lowercased on ValidateAndSet or not.
+ var/lowercase = FALSE
+
+/datum/config_entry/str_list/ValidateAndSet(str_val)
+ if (!VASProcCallGuard(str_val))
+ return FALSE
+ str_val = trim(str_val)
+ if (str_val != "")
+ config_entry_value += lowercase ? lowertext(str_val) : str_val
+ return TRUE
+
+/datum/config_entry/number_list
+ abstract_type = /datum/config_entry/number_list
+ default = list()
+
+/datum/config_entry/number_list/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ str_val = trim(str_val)
+ var/list/new_list = list()
+ var/list/values = splittext(str_val," ")
+ for(var/I in values)
+ var/temp = text2num(I)
+ if(isnull(temp))
+ return FALSE
+ new_list += temp
+ if(!new_list.len)
+ return FALSE
+ config_entry_value = new_list
+ return TRUE
+
+/datum/config_entry/keyed_list
+ abstract_type = /datum/config_entry/keyed_list
+ default = list()
+ dupes_allowed = TRUE
+ vv_VAS = FALSE //VAS will not allow things like deleting from lists, it'll just bug horribly.
+ var/key_mode
+ var/value_mode
+ var/splitter = " "
+ /// whether the key names will be lowercased on ValidateAndSet or not.
+ var/lowercase_key = TRUE
+
+/datum/config_entry/keyed_list/New()
+ . = ..()
+ if(isnull(key_mode) || isnull(value_mode))
+ CRASH("Keyed list of type [type] created with null key or value mode!")
+
+/datum/config_entry/keyed_list/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+
+ str_val = trim(str_val)
+
+ var/list/new_entry = parse_key_and_value(str_val)
+
+ var/new_key = new_entry["config_key"]
+ var/new_value = new_entry["config_value"]
+
+ if(!isnull(new_value) && !isnull(new_key) && ValidateListEntry(new_key, new_value))
+ config_entry_value[new_key] = new_value
+ return TRUE
+ return FALSE
+
+/datum/config_entry/keyed_list/proc/parse_key_and_value(option_string)
+ // Blank or null option string? Bad mojo!
+ if(!option_string)
+ log_config("ERROR: Keyed list config tried to parse with no key or value data.")
+ return null
+
+ var/list/config_entry_words = splittext(option_string, splitter)
+ var/config_value
+ var/config_key
+ var/is_ambiguous = FALSE
+
+ // If this config entry's value mode is flag, the value can either be TRUE or FALSE.
+ // However, the config supports implicitly setting a config entry to TRUE by omitting the value.
+ // This value mode should also support config overrides disabling it too.
+ // The following code supports config entries as such:
+ // Implicitly enable the config entry: CONFIG_ENTRY config key goes here
+ // Explicitly enable the config entry: CONFIG_ENTRY config key goes here 1
+ // Explicitly disable the config entry: CONFIG_ENTRY config key goes here 0
+ if(value_mode == VALUE_MODE_FLAG)
+ var/value = peek(config_entry_words)
+ config_value = TRUE
+
+ if(value == "0")
+ config_key = jointext(config_entry_words, splitter, length(config_entry_words) - 1)
+ config_value = FALSE
+ is_ambiguous = (length(config_entry_words) > 2)
+ else if(value == "1")
+ config_key = jointext(config_entry_words, splitter, length(config_entry_words) - 1)
+ is_ambiguous = (length(config_entry_words) > 2)
+ else
+ config_key = option_string
+ is_ambiguous = (length(config_entry_words) > 1)
+ // Else it has to be a key value pair and we parse it under that assumption.
+ else
+ // If config_entry_words only has 1 or 0 words in it and isn't value_mode == VALUE_MODE_FLAG then it's an invalid config entry.
+ if(length(config_entry_words) <= 1)
+ log_config("ERROR: Could not parse value from config entry string: [option_string]")
+ return null
+
+ config_value = pop(config_entry_words)
+ config_key = jointext(config_entry_words, splitter)
+
+ if(lowercase_key)
+ config_key = lowertext(config_key)
+
+ is_ambiguous = (length(config_entry_words) > 2)
+
+ config_key = validate_config_key(config_key)
+ config_value = validate_config_value(config_value)
+
+ // If there are multiple splitters, it's definitely ambiguous and we'll warn about how we parsed it. Helps with debugging config issues.
+ if(is_ambiguous)
+ log_config("WARNING: Multiple splitter characters (\"[splitter]\") found. Using \"[config_key]\" as config key and \"[config_value]\" as config value.")
+
+ return list("config_key" = config_key, "config_value" = config_value)
+
+/// Takes a given config key and validates it. If successful, returns the formatted key. If unsuccessful, returns null.
+/datum/config_entry/keyed_list/proc/validate_config_key(key)
+ switch(key_mode)
+ if(KEY_MODE_TEXT)
+ return key
+ if(KEY_MODE_TYPE)
+ if(ispath(key))
+ return key
+
+ var/key_path = text2path(key)
+ if(isnull(key_path))
+ log_config("ERROR: Invalid KEY_MODE_TYPE typepath. Is not a valid typepath: [key]")
+ return
+
+ return key_path
+
+
+/// Takes a given config value and validates it. If successful, returns the formatted key. If unsuccessful, returns null.
+/datum/config_entry/keyed_list/proc/validate_config_value(value)
+ switch(value_mode)
+ if(VALUE_MODE_FLAG)
+ return value
+ if(VALUE_MODE_NUM)
+ if(isnum(value))
+ return value
+
+ var/value_num = text2num(value)
+ if(isnull(value_num))
+ log_config("ERROR: Invalid VALUE_MODE_NUM number. Could not parse a valid number: [value]")
+ return
+
+ return value_num
+ if(VALUE_MODE_TEXT)
+ return value
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/keyed_list/vv_edit_var(var_name, var_value)
+// return var_name != NAMEOF(src, splitter) && ..()
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
new file mode 100644
index 00000000000..66d3664ae1b
--- /dev/null
+++ b/code/controllers/configuration/configuration.dm
@@ -0,0 +1,609 @@
+
+
+/datum/controller/configuration
+ name = "Configuration"
+
+ var/directory = "config"
+
+ var/warned_deprecated_configs = FALSE
+ var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it
+ var/list/entries
+ var/list/entries_by_type
+
+
+ var/list/modes // allowed modes
+ var/list/gamemode_cache
+ var/list/votable_modes // votable modes
+ var/list/mode_names
+ var/list/mode_reports
+ var/list/mode_false_report_weight
+
+ var/list/lobby_notices
+
+ var/motd
+ var/policy
+
+ /// If the configuration is loaded
+ var/loaded = FALSE
+
+ /// A regex that matches words blocked IC
+ var/static/regex/ic_filter_regex
+
+ /// A regex that matches words blocked OOC
+ var/static/regex/ooc_filter_regex
+
+ /// A regex that matches words blocked IC, but not in PDAs
+ var/static/regex/ic_outside_pda_filter_regex
+
+ /// A regex that matches words soft blocked IC
+ var/static/regex/soft_ic_filter_regex
+
+ /// A regex that matches words soft blocked OOC
+ var/static/regex/soft_ooc_filter_regex
+
+ /// A regex that matches words soft blocked IC, but not in PDAs
+ var/static/regex/soft_ic_outside_pda_filter_regex
+
+ /// An assoc list of blocked IC words to their reasons
+ var/static/list/ic_filter_reasons
+
+ /// An assoc list of words that are blocked IC, but not in PDAs, to their reasons
+ var/static/list/ic_outside_pda_filter_reasons
+
+ /// An assoc list of words that are blocked both IC and OOC to their reasons
+ var/static/list/shared_filter_reasons
+
+ /// An assoc list of soft blocked IC words to their reasons
+ var/static/list/soft_ic_filter_reasons
+
+ /// An assoc list of words that are soft blocked IC, but not in PDAs, to their reasons
+ var/static/list/soft_ic_outside_pda_filter_reasons
+
+ /// An assoc list of words that are soft blocked both IC and OOC to their reasons
+ var/static/list/soft_shared_filter_reasons
+
+ ///A list of all the pulled shared expressions
+ var/static/list/shared_regex_reason
+
+ /// A list of configuration errors that occurred during load
+ var/static/list/configuration_errors
+
+ var/nudge_script_path = "nudge.py" // where the nudge.py script is located
+
+
+ //var/enable_authentication = 0 // goon authentication
+
+ // var/objectives_disabled = 0 //if objectives are disabled or not
+ // var/protect_roles_from_antagonist = 0// If security and such can be contractor/cult/other
+ var/list/resource_urls
+
+ var/list/storyteller_names = list()
+ var/list/storytellers = list() // allowed modes
+ var/humans_need_surnames = 0
+ var/allow_random_events = 0 // enables random events mid-round when set to 1
+
+ var/load_jobs_from_txt = 0
+
+ var/character_slots = 10 // The number of available character slots
+ var/loadout_slots = 3 // The number of loadout slots per character
+
+ var/max_gear_cost = 10 // Used in chargen for accessory loadout limit. 0 disables loadout, negative allows infinite points.
+
+
+
+ // var/allow_extra_antags = 0
+
+
+ // Event settings
+ // var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours
+ // If the first delay has a custom start time
+ // No custom time, no custom time, between 80 to 100 minutes respectively.
+
+ // TODO: figure out how to.. datumize this with the keyed_list config entry type
+ // UPDATE: NOTHING FUCKING USES THIS
+ var/list/event_first_run = list(
+ EVENT_LEVEL_MUNDANE = null,
+ EVENT_LEVEL_MODERATE = null,
+ EVENT_LEVEL_MAJOR = list("lower" = 48000, "upper" = 60000),
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = list("lower" = 16000, "upper" = 20000),
+ )
+ // The lowest delay until next event
+ // 10, 30, 50 minutes respectively
+ var/list/event_delay_lower = list(
+ EVENT_LEVEL_MUNDANE = 6000,
+ EVENT_LEVEL_MODERATE = 18000,
+ EVENT_LEVEL_MAJOR = 30000,
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = 18000
+ )
+ // The upper delay until next event
+ // 15, 45, 70 minutes respectively
+ var/list/event_delay_upper = list(
+ EVENT_LEVEL_MUNDANE = 9000,
+ EVENT_LEVEL_MODERATE = 27000,
+ EVENT_LEVEL_MAJOR = 42000,
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = 18000
+ )
+
+/datum/controller/configuration/New()
+ fill_storyevents_list()
+
+ var/list/L = typesof(/datum/storyteller)-/datum/storyteller
+ for (var/T in L)
+ // I wish I didn't have to instance the game modes in order to look up
+ // their information, but it is the only way (at least that I know of).
+ var/datum/storyteller/S = new T()
+ if (S.config_tag)
+ storyteller_cache[S.config_tag] = S // So we don't instantiate them repeatedly.
+ if(!(S.config_tag in storytellers)) // ensure each mode is added only once
+ log_game("Adding storyteller [S.name] ([S.config_tag]) to configuration.")
+ src.storytellers += S.config_tag
+ src.storyteller_names[S.config_tag] = S.name
+
+/datum/controller/configuration/proc/admin_reload()
+ if(IsAdminAdvancedProcCall())
+ return
+ log_admin("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
+ message_admins("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
+ full_wipe()
+ Load(world.params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER])
+
+/datum/controller/configuration/proc/Load(_directory)
+ if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything.
+ return
+ if(_directory)
+ directory = _directory
+ if(entries)
+ CRASH("/datum/controller/configuration/Load() called more than once!")
+ configuration_errors ||= list()
+ InitEntries()
+ if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
+ var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt")
+ for(var/I in legacy_configs)
+ if(fexists("[directory]/[I]"))
+ log_config("No $include directives found in config.txt! Loading legacy [legacy_configs.Join("/")] files...")
+ for(var/J in legacy_configs)
+ LoadEntries(J)
+ break
+ if (fexists("[directory]/dev_overrides.txt"))
+ LoadEntries("dev_overrides.txt")
+ // if (fexists("[directory]/ezdb.txt"))
+ // LoadEntries("ezdb.txt")
+ load_important_notices()
+ LoadMOTD()
+ LoadSQL("dbconfig.txt")
+ LoadChatFilter()
+ // if(CONFIG_GET(flag/load_jobs_from_txt))
+ // validate_job_config()
+ if(CONFIG_GET(flag/usewhitelist))
+ load_whitelist()
+
+ loaded = TRUE
+
+ if (Master)
+ Master.OnConfigLoad()
+ process_config_errors()
+
+/datum/controller/configuration/proc/full_wipe()
+ if(IsAdminAdvancedProcCall())
+ return
+ entries_by_type.Cut()
+ QDEL_LIST_ASSOC_VAL(entries)
+ entries = null
+ configuration_errors?.Cut()
+
+/datum/controller/configuration/Destroy()
+ full_wipe()
+ config = null
+
+ return ..()
+
+/datum/controller/configuration/proc/log_config_error(error_message)
+ configuration_errors += error_message
+ log_config(error_message)
+
+/datum/controller/configuration/proc/process_config_errors()
+ if(!CONFIG_GET(flag/config_errors_runtime))
+ return
+ for(var/error_message in configuration_errors)
+ stack_trace(error_message)
+
+/datum/controller/configuration/proc/InitEntries()
+ var/list/_entries = list()
+ entries = _entries
+ var/list/_entries_by_type = list()
+ entries_by_type = _entries_by_type
+
+ for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case
+ var/datum/config_entry/E = I
+ if(initial(E.abstract_type) == I)
+ continue
+ E = new I
+ var/esname = E.name
+ var/datum/config_entry/test = _entries[esname]
+ if(test)
+ log_config_error("Error: [test.type] has the same name as [E.type]: [esname]! Not initializing [E.type]!")
+ qdel(E)
+ continue
+ _entries[esname] = E
+ _entries_by_type[I] = E
+
+/datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)
+ entries -= CE.name
+ entries_by_type -= CE.type
+
+/datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
+ if(IsAdminAdvancedProcCall())
+ return
+
+ var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
+ if(filename_to_test in stack)
+ log_config_error("Warning: Config recursion detected ([english_list(stack)]), breaking!")
+ return
+ stack = stack + filename_to_test
+
+ log_config("Loading config file [filename]...")
+ var/list/lines = world.file2list("[directory]/[filename]")
+ var/list/_entries = entries
+ for(var/L in lines)
+ L = trim(L)
+ if(!L)
+ continue
+
+ var/firstchar = L[1]
+ if(firstchar == "#")
+ continue
+
+ var/lockthis = firstchar == "@"
+ if(lockthis)
+ L = copytext(L, length(firstchar) + 1)
+
+ var/pos = findtext(L, " ")
+ var/entry = null
+ var/value = null
+
+ if(pos)
+ entry = lowertext(copytext(L, 1, pos))
+ value = copytext(L, pos + length(L[pos]))
+ else
+ entry = lowertext(L)
+
+ if(!entry)
+ continue
+
+ if(entry == "$include")
+ if(!value)
+ log_config_error("Warning: Invalid $include directive: [value]")
+ else
+ LoadEntries(value, stack)
+ ++.
+ continue
+
+ // Reset directive, used for setting a config value back to defaults. Useful for string list config types
+ if (entry == "$reset")
+ var/datum/config_entry/resetee = _entries[lowertext(value)]
+ if (!value || !resetee)
+ log_config_error("Warning: invalid $reset directive: [value]")
+ continue
+ resetee.set_default()
+ log_config("Reset configured value for [value] to original defaults")
+ continue
+
+ var/datum/config_entry/E = _entries[entry]
+ if(!E)
+ log_config("Unknown setting in configuration: '[entry]'")
+ continue
+
+ if(lockthis)
+ E.protection |= CONFIG_ENTRY_LOCKED
+
+ if(E.deprecated_by)
+ var/datum/config_entry/new_ver = entries_by_type[E.deprecated_by]
+ var/new_value = E.DeprecationUpdate(value)
+ var/good_update = istext(new_value)
+ log_config("Entry [entry] is deprecated and will be removed soon. Migrate to [new_ver.name]![good_update ? " Suggested new value is: [new_value]" : ""]")
+ if(!warned_deprecated_configs)
+ DelayedMessageAdmins("This server is using deprecated configuration settings. Please check the logs and update accordingly.")
+ warned_deprecated_configs = TRUE
+ if(good_update)
+ value = new_value
+ E = new_ver
+ else
+ warning("[new_ver.type] is deprecated but gave no proper return for DeprecationUpdate()")
+
+ var/validated = E.ValidateAndSet(value)
+ if(!validated)
+ var/log_message = "Failed to validate setting \"[value]\" for [entry]"
+ log_config(log_message)
+ stack_trace(log_message)
+ else
+ if(E.modified && !E.dupes_allowed && E.resident_file == filename)
+ log_config_error("Duplicate setting for [entry] ([value], [E.resident_file]) detected! Using latest.")
+
+ E.resident_file = filename
+
+ if(validated)
+ E.modified = TRUE
+
+ ++.
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+
+// /datum/controller/configuration/can_vv_get(var_name)
+// return (var_name != NAMEOF(src, entries_by_type) || !hiding_entries_by_type) && ..()
+
+// /datum/controller/configuration/vv_edit_var(var_name, var_value)
+// var/list/banned_edits = list(NAMEOF(src, entries_by_type), NAMEOF(src, entries), NAMEOF(src, directory))
+// return !(var_name in banned_edits) && ..()
+
+/datum/controller/configuration/stat_entry(msg)
+ msg = "Edit"
+ return msg
+
+/datum/controller/configuration/proc/Get(entry_type)
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
+ log_admin("Config access of [entry_type] attempted by [key_name(usr)]")
+ return
+ return E.config_entry_value
+
+/datum/controller/configuration/proc/Set(entry_type, new_val)
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to set an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ if((E.protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
+ log_admin("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]")
+ return
+ return E.ValidateAndSet("[new_val]")
+
+/datum/controller/configuration/proc/LoadSQL(filename) // -- TLE
+ var/list/Lines = file2list("[directory]/[filename]")
+ for(var/t in Lines)
+ if(!t) continue
+
+ t = trim(t)
+ if (length(t) == 0)
+ continue
+ else if (copytext(t, 1, 2) == "#")
+ continue
+
+ var/pos = findtext(t, " ")
+ var/name
+ var/value
+
+ if (pos)
+ name = lowertext(copytext(t, 1, pos))
+ value = copytext(t, pos + 1)
+ else
+ name = lowertext(t)
+
+ if (!name)
+ continue
+
+ switch (name)
+ if ("address")
+ sqladdress = value
+ if ("port")
+ sqlport = value
+ if ("database")
+ sqldb = value
+ if ("login")
+ sqllogin = value
+ if ("password")
+ sqlpass = value
+ else
+ log_runtime("Unknown setting in configuration: '[name]'")
+
+/datum/controller/configuration/proc/LoadMOTD()
+ var/list/motd_contents = list()
+
+ var/list/motd_list = CONFIG_GET(str_list/motd)
+ if (motd_list.len == 0 && fexists("[directory]/motd.txt"))
+ motd_list = list("motd.txt")
+
+ for (var/motd_file in motd_list)
+ if (fexists("[directory]/[motd_file]"))
+ motd_contents += file2text("[directory]/[motd_file]")
+ else
+ log_config("MOTD file [motd_file] didn't exist")
+ DelayedMessageAdmins("MOTD file [motd_file] didn't exist")
+
+ motd = motd_contents.Join("\n")
+
+ if (!GLOB.revdata)
+ GLOB.revdata = new
+ var/tm_info = GLOB.revdata.GetTestMergeInfo()
+ if(motd || tm_info)
+ motd = motd ? "[motd]
[tm_info]" : tm_info
+
+
+/datum/controller/configuration/proc/LoadChatFilter()
+ if(!fexists("[directory]/word_filter.toml"))
+ load_legacy_chat_filter()
+ return
+
+ log_config("Loading config file word_filter.toml...")
+ var/list/result = rustg_raw_read_toml_file("[directory]/word_filter.toml")
+ if(!result["success"])
+ var/message = "The word filter is not configured correctly! [result["content"]]"
+ log_config(message)
+ DelayedMessageAdmins(message)
+ return
+ var/list/word_filter = json_decode(result["content"])
+
+ ic_filter_reasons = try_extract_from_word_filter(word_filter, "ic")
+ ic_outside_pda_filter_reasons = try_extract_from_word_filter(word_filter, "ic_outside_pda")
+ shared_filter_reasons = try_extract_from_word_filter(word_filter, "shared")
+ soft_ic_filter_reasons = try_extract_from_word_filter(word_filter, "soft_ic")
+ soft_ic_outside_pda_filter_reasons = try_extract_from_word_filter(word_filter, "soft_ic_outside_pda")
+ soft_shared_filter_reasons = try_extract_from_word_filter(word_filter, "soft_shared")
+ shared_regex_reason = try_extract_from_word_filter(word_filter, "shared_regex")
+
+ update_chat_filter_regexes()
+
+/datum/controller/configuration/proc/load_legacy_chat_filter()
+ if (!fexists("[directory]/in_character_filter.txt"))
+ return
+
+ log_config("Loading config file in_character_filter.txt...")
+
+ ic_filter_reasons = list()
+ ic_outside_pda_filter_reasons = list()
+ shared_filter_reasons = list()
+ soft_ic_filter_reasons = list()
+ soft_ic_outside_pda_filter_reasons = list()
+ soft_shared_filter_reasons = list()
+ shared_regex_reason = list()
+
+ for (var/line in world.file2list("[directory]/in_character_filter.txt"))
+ if (!line)
+ continue
+ if (findtextEx(line, "#", 1, 2))
+ continue
+ // The older filter didn't apply to PDA
+ ic_outside_pda_filter_reasons[line] = "No reason available"
+
+ update_chat_filter_regexes()
+
+/// Will update the internal regexes of the chat filter based on the filter reasons
+/datum/controller/configuration/proc/update_chat_filter_regexes()
+ ic_filter_regex = compile_filter_regex(ic_filter_reasons + ic_outside_pda_filter_reasons + shared_filter_reasons, shared_regex_reason)
+ ic_outside_pda_filter_regex = compile_filter_regex(ic_filter_reasons + shared_filter_reasons, shared_regex_reason)
+ ooc_filter_regex = compile_filter_regex(shared_filter_reasons, shared_regex_reason)
+ soft_ic_filter_regex = compile_filter_regex(soft_ic_filter_reasons + soft_ic_outside_pda_filter_reasons + soft_shared_filter_reasons)
+ soft_ic_outside_pda_filter_regex = compile_filter_regex(soft_ic_filter_reasons + soft_shared_filter_reasons)
+ soft_ooc_filter_regex = compile_filter_regex(soft_shared_filter_reasons)
+
+/datum/controller/configuration/proc/try_extract_from_word_filter(list/word_filter, key)
+ var/list/banned_words = word_filter[key]
+
+ if (isnull(banned_words))
+ return list()
+ else if (!islist(banned_words))
+ var/message = "The word filter configuration's '[key]' key was invalid, contact someone with configuration access to make sure it's setup properly."
+ log_config(message)
+ DelayedMessageAdmins(message)
+ return list()
+
+ var/list/formatted_banned_words = list()
+
+ for (var/banned_word in banned_words)
+ formatted_banned_words[lowertext(banned_word)] = banned_words[banned_word]
+ return formatted_banned_words
+
+/datum/controller/configuration/proc/compile_filter_regex(list/banned_words, list/regex_expressions)
+ if (isnull(banned_words) || banned_words.len == 0)
+ return null
+
+ var/static/regex/should_join_on_word_bounds = regex(@"^\w+$")
+
+ // Stuff like emoticons needs another split, since there's no way to get ":)" on a word bound.
+ // Furthermore, normal words need to be on word bounds, so "(adminhelp)" gets filtered.
+ var/list/to_join_on_whitespace_splits = list()
+ var/list/to_join_on_word_bounds = list()
+
+ for (var/banned_word in banned_words)
+ if (findtext(banned_word, should_join_on_word_bounds))
+ to_join_on_word_bounds += REGEX_QUOTE(banned_word)
+ else
+ to_join_on_whitespace_splits += REGEX_QUOTE(banned_word)
+
+ for(var/word in regex_expressions)
+ to_join_on_whitespace_splits += word
+
+
+ // We don't want a whitespace_split part if there's no stuff that requires it
+ var/whitespace_split = to_join_on_whitespace_splits.len > 0 ? @"(?:(?:^|\s+)(" + jointext(to_join_on_whitespace_splits, "|") + @")(?:$|\s+))" : ""
+ var/word_bounds = @"(\b(" + jointext(to_join_on_word_bounds, "|") + @")\b)"
+ var/regex_filter = whitespace_split != "" ? "([whitespace_split]|[word_bounds])" : word_bounds
+ return regex(regex_filter, "i")
+
+/// Check to ensure that the jobconfig is valid/in-date.
+// /datum/controller/configuration/proc/validate_job_config()
+// var/config_toml = "[directory]/jobconfig.toml"
+// var/config_txt = "[directory]/jobs.txt"
+// var/message = "Notify Server Operators: "
+// log_config("Validating config file jobconfig.toml...")
+
+// if(!fexists(file(config_toml)))
+// SSjob.legacy_mode = TRUE
+// message += "jobconfig.toml not found, falling back to legacy mode (using jobs.txt). To surpress this warning, generate a jobconfig.toml by running the verb 'Generate Job Configuration' in the Server tab.\n\
+// From there, you can then add it to the /config folder of your server to have it take effect for future rounds."
+
+// if(!fexists(file(config_txt)))
+// message += "\n\nFailed to set up legacy mode, jobs.txt not found! Codebase defaults will be used. If you do not wish to use this system, please disable it by commenting out the LOAD_JOBS_FROM_TXT config flag."
+
+// log_config(message)
+// DelayedMessageAdmins(span_notice(message))
+// return
+
+// var/list/result = rustg_raw_read_toml_file(config_toml)
+// if(!result["success"])
+// message += "The job config (jobconfig.toml) is not configured correctly! [result["content"]]"
+// log_config(message)
+// DelayedMessageAdmins(span_notice(message))
+
+//Message admins when you can.
+/datum/controller/configuration/proc/DelayedMessageAdmins(text)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0)
+
+/datum/controller/configuration/proc/pick_storyteller(story_name)
+ // I wish I didn't have to instance the game modes in order to look up
+ // their information, but it is the only way (at least that I know of).
+ if(story_name in storyteller_cache)
+ return storyteller_cache[story_name]
+
+ return storyteller_cache[STORYTELLER_BASE]
+
+/datum/controller/configuration/proc/get_storytellers()
+ var/list/runnable_storytellers = list()
+ for(var/storyteller in storyteller_cache)
+ var/datum/storyteller/S = storyteller_cache[storyteller]
+ if(S)
+ runnable_storytellers |= S
+ return runnable_storytellers
+
+/datum/controller/configuration/proc/load_important_notices()
+ var/rawnotices = file2text("[directory]/lobby_notices.json")
+ if(rawnotices)
+ var/parsed = safe_json_decode(rawnotices)
+ if(!parsed)
+ log_config("JSON parsing failure for lobby_notices.json")
+ DelayedMessageAdmins("JSON parsing failure for lobby_notices.json")
+ else
+ lobby_notices = parsed
+
+/datum/controller/configuration/proc/ShowLobbyNotices(target)
+ if (!config.lobby_notices) return FALSE
+ var/final_notices = ""
+ var/do_final_top_separator = FALSE
+ for (var/notice as anything in config.lobby_notices)
+ var/do_separator = FALSE
+ if (islist(notice))
+ var/list/_notice = notice
+ if (_notice["CHATBOX_SAFE"])
+ do_separator = TRUE
+ final_notices = "[final_notices]
[_notice["CHATBOX_SAFE"]]"
+ else
+ final_notices = "[final_notices]
[notice]"
+ do_separator = TRUE
+
+ if (do_separator)
+ do_final_top_separator = TRUE
+ final_notices = "[final_notices]
"
+
+ to_chat(target, "[do_final_top_separator ? "
" : ""][final_notices]")
+
+ return TRUE
diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm
new file mode 100644
index 00000000000..248782119d8
--- /dev/null
+++ b/code/controllers/configuration/entries/comms.dm
@@ -0,0 +1,54 @@
+/datum/config_entry/string/comms_key
+ protection = CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/string/comms_key/ValidateAndSet(str_val)
+ return str_val != "default_pwd" && length(str_val) > 6 && ..()
+
+/datum/config_entry/keyed_list/cross_server
+ key_mode = KEY_MODE_TEXT
+ value_mode = VALUE_MODE_TEXT
+ protection = CONFIG_ENTRY_LOCKED
+ lowercase_key = FALSE // The names of the servers are proper nouns. Also required for the cross_comms_name config to work.
+
+/datum/config_entry/keyed_list/cross_server/ValidateAndSet(str_val)
+ . = ..()
+ if(.)
+ var/list/newv = list()
+ for(var/I in config_entry_value)
+ newv[replacetext(I, "+", " ")] = config_entry_value[I]
+ config_entry_value = newv
+
+/datum/config_entry/keyed_list/cross_server/ValidateListEntry(key_name, key_value)
+ return key_value != "byond:\\address:port" && ..()
+
+/datum/config_entry/string/cross_comms_name
+
+/datum/config_entry/string/cross_comms_network
+ protection = CONFIG_ENTRY_LOCKED
+
+
+/******************/
+/* Deprecated IRC */
+/******************/
+
+/datum/config_entry/flag/use_irc_bot
+
+/datum/config_entry/flag/irc_bot_export
+
+/datum/config_entry/flag/use_lib_nudge
+
+/datum/config_entry/string/irc_bot_host
+
+/datum/config_entry/string/main_irc
+
+/datum/config_entry/string/admin_irc
+
+/datum/config_entry/flag/announce_shuttle_dock_to_irc
+
+
+
+/datum/config_entry/string/webhook_url
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/webhook_key
+ protection = CONFIG_ENTRY_HIDDEN | CONFIG_ENTRY_LOCKED
diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm
new file mode 100644
index 00000000000..9a11bc4bd2f
--- /dev/null
+++ b/code/controllers/configuration/entries/dbconfig.dm
@@ -0,0 +1,26 @@
+/datum/config_entry/flag/sql_enabled // for sql switching
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/address
+ default = "localhost"
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/number/port
+ default = 3306
+ min_val = 0
+ max_val = 65535
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/string/feedback_database
+ default = "ceveris"
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/string/feedback_login
+ default = "root"
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+/datum/config_entry/string/feedback_password
+ protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
+
+// /datum/config_entry/string/feedback_tableprefix
+// protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
new file mode 100644
index 00000000000..98f051007a8
--- /dev/null
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -0,0 +1,59 @@
+/datum/config_entry/string/start_location
+ default = "asteroid"
+
+/datum/config_entry/string/start_location/ValidateAndSet(str_val)
+ var/list/startlist = list(
+ "asteroid",
+ "abandoned fortress",
+ "space ruins")
+ if (str_val in startlist)
+ . = ..()
+ else
+ if (str_val == "random")
+ config_entry_value = pick(startlist)
+ return TRUE
+
+
+/datum/config_entry/flag/allow_random_events
+
+/datum/config_entry/flag/generate_asteroid
+
+/datum/config_entry/flag/generate_loot_data
+
+/datum/config_entry/flag/z_level_shooting
+
+/datum/config_entry/flag/organs_can_decay
+
+/datum/config_entry/flag/limbs_can_break
+
+
+// lets ghosts spin chairs (very important)
+/datum/config_entry/flag/ghost_interaction
+
+/datum/config_entry/number/revival_brain_life
+ default = -1
+ integer = TRUE
+
+/datum/config_entry/flag/welder_vision
+
+// If security and such can be contractor/cult/other
+/datum/config_entry/flag/protect_roles_from_antagonist
+
+
+// level of health at which a mob goes into continual shock (soft crit)
+/datum/config_entry/number/health_threshold_softcrit
+ default = 0
+ integer = TRUE
+
+// level of health at which a mob becomes unconscious (crit)
+/datum/config_entry/number/health_threshold_crit
+ default = -50
+ integer = TRUE
+
+// level of health at which a mob becomes dead
+/datum/config_entry/number/health_threshold_dead
+ default = -100
+ integer = TRUE
+
+/datum/config_entry/string/law_zero
+ default = "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010"
diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
new file mode 100644
index 00000000000..8f3f1c4abc5
--- /dev/null
+++ b/code/controllers/configuration/entries/general.dm
@@ -0,0 +1,445 @@
+
+
+// server name (for world name / status)
+/datum/config_entry/string/servername
+// generate numeric suffix based on server port
+/datum/config_entry/string/server_suffix
+
+/datum/config_entry/string/hostedby
+
+// Time in minutes before empty server will restart
+/datum/config_entry/number/empty_server_restart_time
+
+/****************************/
+/* Client Joining & IPs */
+/****************************/
+
+
+/datum/config_entry/flag/panic_bunker // prevents people the server hasn't seen before from connecting
+
+/datum/config_entry/flag/paranoia_logging //Log new byond accounts and first-time joins
+
+/datum/config_entry/flag/enter_allowed
+
+/datum/config_entry/flag/guests_allowed
+
+/datum/config_entry/flag/debugparanoid
+
+// del's new players if they log before they spawn in
+/datum/config_entry/flag/del_new_on_log
+
+/datum/config_entry/flag/usewhitelist
+
+/datum/config_entry/flag/kick_inactive //force disconnect for inactive players
+
+// Ban use of ToR
+/datum/config_entry/flag/tor_ban
+
+/datum/config_entry/number/minimum_byond_version
+ min_val = 500
+ integer = TRUE
+
+/datum/config_entry/number/minimum_byond_build
+ integer = TRUE
+
+
+/datum/config_entry/flag/aggressive_changelog
+
+
+/******************/
+/* Job/Role Prefs */
+/******************/
+
+/datum/config_entry/flag/load_jobs_from_txt
+
+// The number of available character slots
+/datum/config_entry/number/character_slots
+ default = 10
+ integer = TRUE
+
+// The number of loadout slots per character
+/datum/config_entry/number/loadout_slots
+ default = 3
+ integer = TRUE
+
+
+/datum/config_entry/flag/use_age_restriction_for_jobs
+
+/datum/config_entry/flag/use_age_restriction_for_antags
+
+/datum/config_entry/number/max_gear_cost
+ default = 10
+ integer = TRUE
+
+/datum/config_entry/number/max_gear_cost/ValidateAndSet(str_val)
+ var/valid = ..()
+ if(valid)
+ var/num_val = text2num(str_val)
+ if (num_val < 0)
+ config_entry_value = INFINITY
+ else
+ config_entry_value = num_val
+
+// Allow ai job
+/datum/config_entry/flag/allow_ai
+
+/datum/config_entry/number/respawn_delay
+ default = 30
+
+
+// Does nothing, used nowhere
+/datum/config_entry/flag/guest_jobban
+
+/*****************/
+/* Mob Prefs */
+/*****************/
+
+/datum/config_entry/flag/disable_player_mice
+
+// Prevent newly-spawned mice from understanding human speech
+/datum/config_entry/flag/uneducated_mice
+
+// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
+/datum/config_entry/flag/antag_hud_allowed
+
+// Ghosts that turn on Antagovision cannot rejoin the round.
+/datum/config_entry/flag/antag_hud_restricted
+
+
+/datum/config_entry/flag/enable_mob_sleep
+
+/datum/config_entry/flag/automute_on //enables automuting/spam prevention
+
+/datum/config_entry/flag/ghosts_can_possess_animals
+
+/datum/config_entry/flag/abandon_allowed
+
+/* drones */
+
+/datum/config_entry/flag/allow_drone_spawn
+
+//This many drones can spawn
+/datum/config_entry/number/max_maint_drones
+ default = 5
+ integer = TRUE
+
+//A drone will become available every X ticks since last drone spawn. Default is 2 minutes.
+/datum/config_entry/number/drone_build_time
+ default = 1200
+
+/*****************/
+/* LOGS */
+/*****************/
+
+/// Log human readable versions of json log entries
+/datum/config_entry/flag/log_as_human_readable
+ default = TRUE
+
+
+// log OOC channel
+/datum/config_entry/flag/log_ooc
+
+// log login/logout
+/datum/config_entry/flag/log_access
+
+// log client say
+/datum/config_entry/flag/log_say
+
+/// log speech indicators(started/stopped speaking)
+/datum/config_entry/flag/log_speech_indicators
+
+// log admin actions
+/datum/config_entry/flag/log_admin
+ protection = CONFIG_ENTRY_LOCKED
+
+// log debug output
+/datum/config_entry/flag/log_debug
+
+// log game events
+/datum/config_entry/flag/log_game
+
+/// log virology data
+/datum/config_entry/flag/log_virus
+
+/// log economy actions
+/datum/config_entry/flag/log_econ
+
+/// log crew manifest to separate file
+/datum/config_entry/flag/log_manifest
+
+/// log assets
+/datum/config_entry/flag/log_asset
+
+// log voting
+/datum/config_entry/flag/log_vote
+
+/// log manual zone switching
+/datum/config_entry/flag/log_zone_switch
+
+/datum/config_entry/flag/log_uplink
+
+/// log economy actions
+/dat/obj/machinery/computer/uploadum/config_entry/flag/log_econ
+
+// log client whisper
+/datum/config_entry/flag/log_whisper
+
+// log emotes
+/datum/config_entry/flag/log_emote
+
+/// log telecomms messages
+/datum/config_entry/flag/log_telecomms
+
+// log attack messages
+/datum/config_entry/flag/log_attack
+
+/// log prayers
+/datum/config_entry/flag/log_prayer
+
+// log admin chat messages
+/datum/config_entry/flag/log_adminchat
+
+// log warnings admins get about bomb construction and such
+/datum/config_entry/flag/log_adminwarn
+
+// log pda messages
+/datum/config_entry/flag/log_pda
+
+// logs all links clicked in-game. Could be used for debugging and tracking down exploits
+/datum/config_entry/flag/log_hrefs
+
+// logs world.log to a file
+/datum/config_entry/flag/log_runtime
+
+/// log silicons
+/datum/config_entry/flag/log_silicon
+
+// log log_world(messages)
+/datum/config_entry/flag/log_world_output
+
+
+/// Config entry which special logging of failed logins under suspicious circumstances.
+/datum/config_entry/flag/log_suspicious_login
+
+/datum/config_entry/flag/log_world_topic
+
+/*****************/
+/* VOTES */
+/*****************/
+
+// minimum time between voting sessions (deciseconds, 10 minute default)
+/datum/config_entry/number/vote_delay
+ default = 6000
+ integer = FALSE
+ min_val = 0
+
+// length of voting period (deciseconds, default 1 minute)
+/datum/config_entry/number/vote_period
+ default = 600
+ integer = FALSE
+ min_val = 0
+
+//Length of time before round start when autogamemode vote is called (in seconds, default 100).
+/datum/config_entry/number/vote_autogamemode_timeleft
+ default = 100
+ integer = FALSE
+ min_val = 0
+
+// vote does not default to nochange/norestart (tbi)
+// /datum/config_entry/flag/vote_no_default
+
+/// Prevents dead people from voting.
+/datum/config_entry/flag/vote_no_dead
+
+// allow votes to change mode
+/datum/config_entry/flag/allow_vote_mode
+
+
+/*****************/
+/* ADMIN */
+/*****************/
+
+
+/datum/config_entry/flag/mentors
+
+/// allows admins with relevant permissions to have their own ooc colour
+/datum/config_entry/flag/allow_admin_ooccolor
+
+/// allows admins with relevant permissions to have a personalized asay color
+/datum/config_entry/flag/allow_admin_asaycolor
+
+//adminPMs to non-admins show in a pop-up 'reply' window when enabled.
+/datum/config_entry/flag/popup_admin_pm
+
+// Forid admins from possessing scringularaitirtiys
+/datum/config_entry/flag/forbid_singulo_possession
+
+/datum/config_entry/flag/admin_legacy_system //Defines whether the server uses the legacy admin system with admins.txt or the SQL system
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/ban_legacy_system //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/enable_localhost_rank //Gives the !localhost! rank to any client connecting from 127.0.0.1 or ::1
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/admin_memo_system
+ protection = CONFIG_ENTRY_LOCKED
+
+// /datum/config_entry/flag/protect_legacy_admins //Stops any admins loaded by the legacy system from having their rank edited by the permissions panel
+// protection = CONFIG_ENTRY_LOCKED
+
+// /datum/config_entry/flag/protect_legacy_ranks //Stops any ranks loaded by the legacy system from having their flags edited by the permissions panel
+// protection = CONFIG_ENTRY_LOCKED
+
+
+// /datum/config_entry/flag/load_legacy_ranks_only //Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database
+// protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/flag/mods_can_tempban
+
+/datum/config_entry/flag/mods_can_job_tempban
+
+/datum/config_entry/number/mod_tempban_max
+ default = 1440
+
+/datum/config_entry/number/mod_job_tempban_max
+ default = 1440
+
+/datum/config_entry/flag/debug_admin_hrefs
+
+/datum/config_entry/flag/forbid_all_profiling
+
+/datum/config_entry/flag/forbid_admin_profiling
+
+
+/*****************/
+/* GAME */
+/*****************/
+
+/datum/config_entry/number/fps
+ default = 20
+ integer = FALSE
+ min_val = 1
+ max_val = 100 //byond will start crapping out at 50, so this is just ridic
+ var/sync_validate = FALSE
+
+/datum/config_entry/number/fps/ValidateAndSet(str_val)
+ . = ..()
+ if(.)
+ sync_validate = TRUE
+ var/datum/config_entry/number/ticklag/TL = config.entries_by_type[/datum/config_entry/number/ticklag]
+ if(!TL.sync_validate)
+ TL.ValidateAndSet(10 / config_entry_value)
+ sync_validate = FALSE
+
+/datum/config_entry/number/ticklag
+ integer = FALSE
+ var/sync_validate = FALSE
+
+/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps
+ var/datum/config_entry/CE = /datum/config_entry/number/fps
+ default = 10 / initial(CE.default)
+ ..()
+
+/datum/config_entry/number/ticklag/ValidateAndSet(str_val)
+ . = text2num(str_val) > 0 && ..()
+ if(.)
+ sync_validate = TRUE
+ var/datum/config_entry/number/fps/FPS = config.entries_by_type[/datum/config_entry/number/fps]
+ if(!FPS.sync_validate)
+ FPS.ValidateAndSet(10 / config_entry_value)
+ sync_validate = FALSE
+
+/datum/config_entry/string/starlight
+ default = "#ffffff"
+
+/datum/config_entry/number/rounds_until_hard_restart
+ default = -1
+ min_val = 0
+
+/*****************/
+/* COOLDOWNS */
+/*****************/
+
+/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error
+ default = 600
+ integer = FALSE
+ min_val = 0
+
+/datum/config_entry/number/error_limit // How many occurrences before the next will silence them
+ default = 50
+
+/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for
+ default = 6000
+ integer = FALSE
+
+/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error
+ default = 50
+ integer = FALSE
+
+
+/*****************/
+/* MISC */
+/*****************/
+
+//Defines whether the server uses recursive or circular explosions.
+/datum/config_entry/flag/use_recursive_explosions
+
+/datum/config_entry/flag/emojis
+
+/datum/config_entry/flag/paper_input
+
+// If true, submaps loaded automatically can be rotated.
+/datum/config_entry/flag/random_submap_orientation
+
+/datum/config_entry/flag/use_overmap
+
+
+// Path to the python2 executable on the system.
+/datum/config_entry/string/python_path
+
+
+
+// motd.txt
+// Sets an MOTD of the server.
+// You can use this multiple times, and the MOTDs will be appended in order.
+// Based on config directory, so "motd.txt" points to "config/motd.txt"
+
+/datum/config_entry/str_list/motd
+
+/datum/config_entry/flag/config_errors_runtime
+ default = FALSE
+
+/*****************/
+/* URLS & Lang */
+/*****************/
+
+/datum/config_entry/string/language
+ default = "En"
+
+/datum/config_entry/string/serverurl
+
+// set a server location for world reboot. Don't include the byond://, just give the address and port.
+/datum/config_entry/string/server
+
+/datum/config_entry/string/banappeals
+
+/datum/config_entry/string/wikiurl
+ default = "https://wiki.cev-eris.com/Main_Page"
+
+/datum/config_entry/string/forumurl
+
+/datum/config_entry/string/githuburl
+ default = "https://github.com/Endless-Horizon/CEV-Eris"
+
+/datum/config_entry/string/discordurl
+
+
+/// If admins with +DEBUG can initialize byond-tracy midround.
+/datum/config_entry/flag/allow_tracy_start
+ protection = CONFIG_ENTRY_LOCKED
+
+/// If admins with +DEBUG can queue byond-tracy to run the next round.
+/datum/config_entry/flag/allow_tracy_queue
+ protection = CONFIG_ENTRY_LOCKED
diff --git a/code/controllers/configuration/entries/ip.dm b/code/controllers/configuration/entries/ip.dm
new file mode 100644
index 00000000000..eae14648fcb
--- /dev/null
+++ b/code/controllers/configuration/entries/ip.dm
@@ -0,0 +1,34 @@
+//Should we query IPs to get scores? Generates HTTP traffic to an API service.
+/datum/config_entry/flag/ip_reputation
+ default = FALSE
+
+//Left null because you MUST specify one otherwise you're making the internet worse.
+/datum/config_entry/string/ipr_email
+
+/datum/config_entry/string/ipr_email/ValidateAndSet(str_val)
+ . = str_val != "example@example.com" && ..()
+
+
+//Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat).
+/datum/config_entry/flag/ipr_block_bad_ips
+ default = FALSE
+
+//The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad.
+/datum/config_entry/number/ipr_bad_score
+ default = 1
+ integer = TRUE
+
+//Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect.
+/datum/config_entry/flag/ipr_allow_existing
+ default = FALSE
+
+//How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs.
+/datum/config_entry/number/ipr_minimum_age
+ default = 5
+
+//API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided.
+/datum/config_entry/string/ipqualityscore_apikey
+
+/datum/config_entry/string/ipqualityscore_apikey/ValidateAndSet(str_val)
+ . = str_val != "ABCDEFGHIJKLMAOPQRSTUVQWXYZ" && ..()
+
diff --git a/code/controllers/configuration/entries/resources.dm b/code/controllers/configuration/entries/resources.dm
new file mode 100644
index 00000000000..7aa5c1cac4f
--- /dev/null
+++ b/code/controllers/configuration/entries/resources.dm
@@ -0,0 +1,52 @@
+/******************************/
+/* Asset Transport and TGUI */
+/******************************/
+
+/datum/config_entry/flag/cache_assets
+ default = TRUE
+
+/datum/config_entry/flag/smart_cache_assets
+ default = TRUE
+
+/datum/config_entry/flag/save_spritesheets
+ default = FALSE
+
+
+/**
+ * Tgui ui_act payloads larger than 2kb are split into chunks a maximum of 1kb in size.
+ * This flag represents the maximum chunk count the server is willing to receive.
+ */
+/datum/config_entry/number/tgui_max_chunk_count
+ default = 32
+
+
+/datum/config_entry/keyed_list/external_rsc_urls
+ key_mode = KEY_MODE_TEXT
+ value_mode = VALUE_MODE_FLAG
+
+/datum/config_entry/flag/asset_simple_preload
+
+/datum/config_entry/string/asset_transport
+/datum/config_entry/string/asset_transport/ValidateAndSet(str_val)
+ return (lowertext(str_val) in list("simple", "webroot")) && ..(lowertext(str_val))
+
+/datum/config_entry/string/asset_cdn_webroot
+ protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/string/asset_cdn_webroot/ValidateAndSet(str_var)
+ if (!str_var || trim(str_var) == "")
+ return FALSE
+ if (str_var && str_var[length(str_var)] != "/")
+ str_var += "/"
+ return ..(str_var)
+
+/datum/config_entry/string/asset_cdn_url
+ protection = CONFIG_ENTRY_LOCKED
+ default = null
+
+/datum/config_entry/string/asset_cdn_url/ValidateAndSet(str_var)
+ if (!str_var || trim(str_var) == "")
+ return FALSE
+ if (str_var && str_var[length(str_var)] != "/")
+ str_var += "/"
+ return ..(str_var)
diff --git a/code/controllers/configuration/entries/tts.dm b/code/controllers/configuration/entries/tts.dm
new file mode 100644
index 00000000000..964dafb244c
--- /dev/null
+++ b/code/controllers/configuration/entries/tts.dm
@@ -0,0 +1,3 @@
+/datum/config_entry/flag/tts_enabled // Global switch
+/datum/config_entry/string/tts_key // Login and password that we use to generate tts_bearer
+/datum/config_entry/flag/tts_cache // Store generated tts files and reuse them, instead of always requesting new
diff --git a/code/controllers/evacuation/evacuation.dm b/code/controllers/evacuation/evacuation.dm
index 198aa65047b..5f32f7c9404 100644
--- a/code/controllers/evacuation/evacuation.dm
+++ b/code/controllers/evacuation/evacuation.dm
@@ -90,7 +90,7 @@ var/datum/evacuation_controller/evacuation_controller
evacuation_controller.evac_called.Announce(replacetext(GLOB.maps_data.emergency_shuttle_called_message, "%ETA%", "[round(evacuation_controller.get_eta()/60)] minute\s."))
else
if(!skip_announce)
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_called_message, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_called_message, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s"))
return 1
@@ -127,8 +127,8 @@ var/datum/evacuation_controller/evacuation_controller
if (emergency_evacuation)
evac_waiting.Announce(replacetext(GLOB.maps_data.emergency_shuttle_docked_message, "%ETD%", "[estimated_time] minute\s"), new_sound = sound('sound/effects/Evacuation.ogg', volume = 35))
else
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_docked_message, "%dock_name%", "[dock_name]"), "%ETD%", "[estimated_time] minute\s"))
- if(config.announce_shuttle_dock_to_irc)
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_docked_message, "%dock_name%", "[GLOB.dock_name]"), "%ETD%", "[estimated_time] minute\s"))
+ if(CONFIG_GET(flag/announce_shuttle_dock_to_irc))
send2mainirc("The shuttle has docked with the station. It will depart in approximately [estimated_time] minute\s.")
/datum/evacuation_controller/proc/launch_evacuation()
@@ -139,9 +139,9 @@ var/datum/evacuation_controller/evacuation_controller
state = EVAC_IN_TRANSIT
if (emergency_evacuation)
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
else
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
return 1
diff --git a/code/controllers/evacuation/evacuation_lifepods.dm b/code/controllers/evacuation/evacuation_lifepods.dm
index 3ddce013dd2..f076a6f17c3 100644
--- a/code/controllers/evacuation/evacuation_lifepods.dm
+++ b/code/controllers/evacuation/evacuation_lifepods.dm
@@ -14,7 +14,7 @@
)
/datum/evacuation_controller/lifepods/launch_evacuation()
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
/datum/evacuation_controller/lifepods/available_evac_options()
if (is_on_cooldown())
@@ -25,4 +25,4 @@
return list(evacuation_options[EVAC_OPT_CANCEL_ABANDON_SHIP])
#undef EVAC_OPT_ABANDON_SHIP
-#undef EVAC_OPT_CANCEL_ABANDON_SHIP
\ No newline at end of file
+#undef EVAC_OPT_CANCEL_ABANDON_SHIP
diff --git a/code/controllers/evacuation/evacuation_pods.dm b/code/controllers/evacuation/evacuation_pods.dm
index 24563c09333..5a7d70c3739 100644
--- a/code/controllers/evacuation/evacuation_pods.dm
+++ b/code/controllers/evacuation/evacuation_pods.dm
@@ -39,9 +39,9 @@
pod.move_time = (evac_transit_delay/10)
pod.launch(src)
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
else
- priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s"))
/datum/evacuation_controller/starship/finish_evacuation()
..()
diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index 5608da4d8eb..71a0466bbbf 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -12,6 +12,10 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
CRASH("Multiple instances of global variable controller created")
GLOB = src
+ config.Load(world.params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER])
+
+ generate_gameid()
+
var/datum/controller/exclude_these = new
gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order))
QDEL_IN(exclude_these, 0) //signal logging isn't ready
@@ -20,6 +24,8 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
Initialize()
+ makeDatumRefLists()
+
/datum/controller/global_vars/Destroy(force)
// This is done to prevent an exploit where admins can get around protected vars
SHOULD_CALL_PARENT(FALSE)
diff --git a/code/controllers/master.dm b/code/controllers/master.dm
index 3ce30427d69..b2970156c11 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -7,18 +7,8 @@
*
**/
-//Init the debugger datum first so we can debug Master
-//You might wonder why not just create the debugger datum global in its own file, since its loaded way earlier than this DM file
-//Well for whatever reason then the Master gets created first and then the debugger when doing that
-//So thats why this code lives here now, until someone finds out how Byond inits globals
-GLOBAL_REAL(Debugger, /datum/debugger) = new
-//This is the ABSOLUTE ONLY THING that should init globally like this
-//2019 update: the failsafe,config and Global controllers also do it
-GLOBAL_REAL(Master, /datum/controller/master) = new
-
-//THIS IS THE INIT ORDER
-//Master -> SSPreInit -> GLOB -> world -> config -> SSInit -> Failsafe
-//GOT IT MEMORIZED?
+// See initialization order in /code/game/world.dm
+GLOBAL_REAL(Master, /datum/controller/master)
/datum/controller/master
name = "Master"
@@ -82,8 +72,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/static/current_ticklimit = TICK_LIMIT_RUNNING
/datum/controller/master/New()
- // if(!config)
- // config = new
+ if(!config)
+ config = new
// Highlander-style: there can only be one! Kill off the old and replace it with the new.
if(!random_seed)
@@ -124,6 +114,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
if(!GLOB)
new /datum/controller/global_vars
+ // new /datum/global_init
+
/datum/controller/master/Destroy()
..()
// Tell qdel() to Del() this object.
@@ -215,7 +207,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
init_stage_completed = 0
var/mc_started = FALSE
- to_chat(world, span_boldannounce("Initializing subsystems..."))
+ var/msg = "Initializing subsystems..."
+ to_chat(world, span_boldannounce(msg))
+ log_world(msg)
var/list/stage_sorted_subsystems = new(INITSTAGE_MAX)
for (var/i in 1 to INITSTAGE_MAX)
@@ -258,9 +252,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
var/time = (REALTIMEOFDAY - start_timeofday) / 10
+ var/msg_fancy = "Initializations complete within [get_colored_thresh_text("[time] second[time == 1 ? "" : "s"]!", time, 200 SECONDS / 10)]!"
+ msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!"
- var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!"
- to_chat(world, span_boldannounce("[msg]"))
+ to_chat(world, span_boldannounce(msg_fancy))
log_world(msg)
@@ -268,7 +263,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
world.TgsInitializationComplete()
// Set world options.
- world.change_fps(config.fps)
+ world.change_fps(CONFIG_GET(number/fps))
var/initialized_tod = REALTIMEOFDAY
// if(sleep_offline_after_initializations)
diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm
index c5edc590ba4..f0fd4d445f6 100644
--- a/code/controllers/subsystem.dm
+++ b/code/controllers/subsystem.dm
@@ -20,7 +20,7 @@
var/wait = 20
/// Priority Weight: When mutiple subsystems need to run in the same tick, higher priority subsystems will be given a higher share of the tick before MC_TICK_CHECK triggers a sleep, higher priority subsystems also run before lower priority subsystems
- var/priority = SS_PRIORITY_DEFAULT
+ var/priority = FIRE_PRIORITY_DEFAULT
/// [Subsystem Flags][SS_NO_INIT] to control binary behavior. Flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again)
var/flags = NONE
@@ -87,6 +87,9 @@
/// Priority at the time the subsystem entered the queue. Needed to avoid changes in priority (by admins and the like) from breaking things.
var/queued_priority
+ /// The maximum time it should take for a subsystem to initialize generally. In seconds.
+ var/init_time_threshold = 10 SECONDS
+
/// How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out!
var/static/list/failure_strikes
@@ -278,8 +281,9 @@
var/time = rustg_time_milliseconds(SS_INIT_TIMER_KEY)
var/seconds = round(time / 1000, 0.01)
+ var/msg_fancy = "Initialized [span_adminsay(name)] subsystem within [get_colored_thresh_text("[seconds] second[seconds == 1 ? "" : "s"]!", seconds, init_time_threshold / 10)]"
var/msg = "Initialized [name] subsystem within [seconds] second[seconds == 1 ? "" : "s"]!"
- to_chat(world, span_boldannounce(msg))
+ to_chat(world, span_boldannounce(msg_fancy))
log_world(msg)
return seconds
diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index 23bf08fa34c..73b1ada92cf 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -13,10 +13,11 @@ SUBSYSTEM_DEF(air)
name = "Air"
init_order = INIT_ORDER_AIR
- priority = SS_PRIORITY_AIR
+ priority = FIRE_PRIORITY_AIR
wait = 10
flags = SS_POST_FIRE_TIMING
+ init_time_threshold = 30 SECONDS
var/next_id = 1 // Used to keep track of zone UIDs.
diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm
index a67c270705c..1c362e547e6 100644
--- a/code/controllers/subsystems/alarm.dm
+++ b/code/controllers/subsystems/alarm.dm
@@ -9,9 +9,10 @@ var/global/datum/alarm_handler/power/power_alarm
SUBSYSTEM_DEF(alarm)
name = "Alarm"
wait = 2 SECONDS
- priority = SS_PRIORITY_ALARM
+ priority = FIRE_PRIORITY_ALARM
init_order = INIT_ORDER_ALARM
+ init_time_threshold = 1 SECONDS
var/list/datum/alarm/all_handlers
var/tmp/list/current = list()
var/tmp/list/active_alarm_cache = list()
diff --git a/code/controllers/subsystems/asset_loading.dm b/code/controllers/subsystems/asset_loading.dm
new file mode 100644
index 00000000000..ecdf406894a
--- /dev/null
+++ b/code/controllers/subsystems/asset_loading.dm
@@ -0,0 +1,34 @@
+/// Allows us to lazyload asset datums
+/// Anything inserted here will fully load if directly gotten
+/// So this just serves to remove the requirement to load assets fully during init
+SUBSYSTEM_DEF(asset_loading)
+ name = "Asset Loading"
+ priority = FIRE_PRIORITY_ASSETS
+ flags = SS_NO_INIT
+ runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT
+ var/list/datum/asset/generate_queue = list()
+ var/last_queue_len = 0
+
+/datum/controller/subsystem/asset_loading/fire(resumed)
+ while(length(generate_queue))
+ var/datum/asset/to_load = generate_queue[generate_queue.len]
+
+ to_load.queued_generation()
+
+ if(MC_TICK_CHECK)
+ return
+ last_queue_len = length(generate_queue)
+ generate_queue.len--
+ // We just emptied the queue
+ if(last_queue_len && !length(generate_queue))
+ // Clean up cached icons, freeing memory.
+ rustg_iconforge_cleanup()
+
+/datum/controller/subsystem/asset_loading/proc/queue_asset(datum/asset/queue)
+#ifdef DO_NOT_DEFER_ASSETS
+ stack_trace("We queued an instance of [queue.type] for lateloading despite not allowing it")
+#endif
+ generate_queue += queue
+
+/datum/controller/subsystem/asset_loading/proc/dequeue_asset(datum/asset/queue)
+ generate_queue -= queue
diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm
index 0e8c5e1369e..29a1d6b3f7c 100644
--- a/code/controllers/subsystems/assets.dm
+++ b/code/controllers/subsystems/assets.dm
@@ -2,15 +2,15 @@ SUBSYSTEM_DEF(assets)
name = "Assets"
init_order = INIT_ORDER_ASSETS
flags = SS_NO_FIRE
- var/list/cache = list()
+ var/list/datum/asset_cache_item/cache = list()
var/list/preload = list()
var/datum/asset_transport/transport = new()
/datum/controller/subsystem/assets/OnConfigLoad()
var/newtransporttype = /datum/asset_transport
- // switch (CONFIG_GET(string/asset_transport))
- // if ("webroot")
- // newtransporttype = /datum/asset_transport/webroot
+ switch (CONFIG_GET(string/asset_transport))
+ if ("webroot")
+ newtransporttype = /datum/asset_transport/webroot
if (newtransporttype == transport.type)
return
@@ -22,11 +22,11 @@ SUBSYSTEM_DEF(assets)
-/datum/controller/subsystem/assets/Initialize(timeofday)
+/datum/controller/subsystem/assets/Initialize()
for(var/type in typesof(/datum/asset))
var/datum/asset/A = type
if (type != initial(A._abstract))
- get_asset_datum(type)
+ load_asset_datum(type)
transport.Initialize(cache)
diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm
index bbc605b2fbb..7228198e233 100644
--- a/code/controllers/subsystems/atoms.dm
+++ b/code/controllers/subsystems/atoms.dm
@@ -7,6 +7,7 @@ SUBSYSTEM_DEF(atoms)
name = "Atoms"
init_order = INIT_ORDER_ATOMS
flags = SS_NO_FIRE
+ init_time_threshold = 1 MINUTE
var/old_initialized
diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm
index b007db3de2a..aa5cf8e698b 100644
--- a/code/controllers/subsystems/chat.dm
+++ b/code/controllers/subsystems/chat.dm
@@ -2,10 +2,19 @@ SUBSYSTEM_DEF(chat)
name = "Chat"
flags = SS_TICKER
wait = 1
- priority = SS_PRIORITY_CHAT
+ priority = FIRE_PRIORITY_CHAT
init_order = INIT_ORDER_CHAT
+ init_time_threshold = 1 SECOND
+
+ /// Assosciates a ckey with a list of messages to send to them.
+ var/list/list/datum/chat_payload/client_to_payloads = list()
+
+ /// Associates a ckey with an assosciative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages.
+ var/list/list/datum/chat_payload/client_to_reliability_history = list()
+
+ /// Assosciates a ckey with their next sequence number.
+ var/list/client_to_sequence_number = list()
- var/list/payload = list()
/datum/controller/subsystem/chat/Initialize()
@@ -13,89 +22,81 @@ SUBSYSTEM_DEF(chat)
initialize_text_to_speech()
-/datum/controller/subsystem/chat/fire()
- for(var/i in payload)
- var/client/C = i
- C << output(payload[C], "browseroutput:output")
- payload -= C
+/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data)
+ var/sequence = client_to_sequence_number[target.ckey]
+ client_to_sequence_number[target.ckey] += 1
- if(MC_TICK_CHECK)
- return
+ var/datum/chat_payload/payload = new
+ payload.sequence = sequence
+ payload.content = message_data
+ if(!(target.ckey in client_to_reliability_history))
+ client_to_reliability_history[target.ckey] = list()
+ var/list/client_history = client_to_reliability_history[target.ckey]
+ client_history["[sequence]"] = payload
-/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE, trailing_newline = TRUE)
- if(!target || !message)
- return
+ if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE)
+ var/oldest = text2num(client_history[1])
+ for(var/index in 2 to length(client_history))
+ var/test = text2num(client_history[index])
+ if(test < oldest)
+ oldest = test
+ client_history -= "[oldest]"
+ return payload
- if(!istext(message))
- CRASH("to_chat called with invalid input type")
-
- if(target == world)
- target = GLOB.clients
-
- //Some macros remain in the string even after parsing and fuck up the eventual output
- var/original_message = message
- message = replacetext(message, "\improper", "")
- message = replacetext(message, "\proper", "")
- if(handle_whitespace)
- message = replacetext(message, "\n", "
")
- message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]")
- if (trailing_newline)
- message += "
"
-
- //Replace expanded \icon macro with icon2html
- //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc
- //not even hacks with reassigning usr work
- var/regex/i = new(@/(?:)
/, "g")
- while(i.Find(message))
- message = copytext(message,1,i.index)+icon2html(locate(i.group[1]), target, icon_state=i.group[2])+copytext(message,i.next)
-
- message = \
- symbols_to_unicode(
- strip_improper(
- color_macro_to_html(
- message
- )
- )
- )
-
- //url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
- //Do the double-encoding here to save nanoseconds
- var/twiceEncoded = url_encode(url_encode(message))
-
- if(islist(target))
- for(var/I in target)
- var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
- if(!C)
- return
-
- //Send it to the old style output window.
- SEND_TEXT(C, original_message)
-
- if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
- continue
-
- if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
- continue
-
- payload[C] += twiceEncoded
-
- else
- var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
- if(!C)
- return
+/datum/controller/subsystem/chat/proc/send_payload_to_client(client/target, datum/chat_payload/payload)
+ target.tgui_panel.window.send_message("chat/message", payload.into_message())
+ SEND_TEXT(target, payload.get_content_as_html())
- //Send it to the old style output window.
- SEND_TEXT(C, original_message)
+/datum/controller/subsystem/chat/fire()
+ for(var/ckey in client_to_payloads)
+ var/client/target = GLOB.directory[ckey]
+ if(isnull(target)) // verify client still exists
+ LAZYREMOVE(client_to_payloads, ckey)
+ continue
- if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
- return
+ for(var/datum/chat_payload/payload as anything in client_to_payloads[ckey])
+ send_payload_to_client(target, payload)
+ LAZYREMOVE(client_to_payloads, ckey)
- if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
+ if(MC_TICK_CHECK)
return
- payload[C] += twiceEncoded
+/datum/controller/subsystem/chat/proc/queue(queue_target, list/message_data)
+ var/list/targets = islist(queue_target) ? queue_target : list(queue_target)
+
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ LAZYADDASSOCLIST(client_to_payloads, client.ckey, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/send_immediate(send_target, list/message_data)
+ var/list/targets = islist(send_target) ? send_target : list(send_target)
+ for(var/target in targets)
+ var/client/client = CLIENT_FROM_VAR(target)
+ if(isnull(client))
+ continue
+ send_payload_to_client(client, generate_payload(client, message_data))
+
+/datum/controller/subsystem/chat/proc/handle_resend(client/client, sequence)
+ var/list/client_history = client_to_reliability_history[client.ckey]
+ sequence = "[sequence]"
+ if(isnull(client_history) || !(sequence in client_history))
+ return
+
+ var/datum/chat_payload/payload = client_history[sequence]
+ if(payload.resends > CHAT_RELIABILITY_MAX_RESENDS)
+ return // we tried but byond said no
+
+ payload.resends += 1
+ send_payload_to_client(client, client_history[sequence])
+ // SSblackbox.record_feedback(
+ // "nested tally",
+ // "chat_resend_byond_version",
+ // 1,
+ // list(
+ // "[client.byond_version]",
+ // "[client.byond_build]",
+ // ),
+ // )
diff --git a/code/controllers/subsystems/evac.dm b/code/controllers/subsystems/evac.dm
index 58359468d98..27317d5774c 100644
--- a/code/controllers/subsystems/evac.dm
+++ b/code/controllers/subsystems/evac.dm
@@ -1,6 +1,6 @@
SUBSYSTEM_DEF(evac)
name = "Evacuation"
- priority = SS_PRIORITY_EVAC
+ priority = FIRE_PRIORITY_EVAC
//Initializes at default time
flags = SS_BACKGROUND
wait = 2 SECONDS
diff --git a/code/controllers/subsystems/event.dm b/code/controllers/subsystems/event.dm
index 041605545c7..bcdec69c8bf 100644
--- a/code/controllers/subsystems/event.dm
+++ b/code/controllers/subsystems/event.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(event)
name = "Event Manager"
wait = 2 SECONDS
- priority = SS_PRIORITY_EVENT
+ priority = FIRE_PRIORITY_EVENT
var/tmp/list/processing_events = list()
var/tmp/pos = EVENT_LEVEL_MUNDANE
diff --git a/code/controllers/subsystems/explosions.dm b/code/controllers/subsystems/explosions.dm
index 13b667a129d..1c6e2da235b 100644
--- a/code/controllers/subsystems/explosions.dm
+++ b/code/controllers/subsystems/explosions.dm
@@ -49,6 +49,8 @@ SUBSYSTEM_DEF(explosions)
priority = FIRE_PRIORITY_EXPLOSIONS
init_order = INIT_ORDER_EXPLOSIONS
flags = SS_KEEP_TIMING
+ init_time_threshold = 0.5 SECONDS
+
var/list/explode_queue = list()
var/list/current_run = list()
var/list/throwing_queue = list()
diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm
index c374d3cf17f..7bcf0efdc01 100644
--- a/code/controllers/subsystems/garbage.dm
+++ b/code/controllers/subsystems/garbage.dm
@@ -23,12 +23,13 @@ By using these methods of finding references, you can make your life far, far ea
SUBSYSTEM_DEF(garbage)
name = "Garbage"
- priority = SS_PRIORITY_GARBAGE
+ priority = FIRE_PRIORITY_GARBAGE
wait = 2 SECONDS
flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
init_order = INIT_ORDER_GARBAGE
init_stage = INITSTAGE_EARLY
+ init_time_threshold = 0.5 SECONDS
var/list/collection_timeout = list(GC_FILTER_QUEUE, GC_CHECK_QUEUE, GC_DEL_QUEUE) // deciseconds to wait before moving something up in the queue to the next level
@@ -165,11 +166,11 @@ SUBSYSTEM_DEF(garbage)
return
continue
- var/GCd_at_time = L[1]
+ var/GCd_at_time = L[GC_QUEUE_ITEM_QUEUE_TIME]
if(GCd_at_time > cut_off_time)
break // Everything else is newer, skip them
count++
- var/refID = L[2]
+ var/refID = L[GC_QUEUE_ITEM_REF]
var/datum/D
D = locate(refID)
diff --git a/code/controllers/subsystems/holomaps.dm b/code/controllers/subsystems/holomaps.dm
index 5fcca274800..0ea35f89282 100644
--- a/code/controllers/subsystems/holomaps.dm
+++ b/code/controllers/subsystems/holomaps.dm
@@ -19,6 +19,6 @@ SUBSYSTEM_DEF(holomaps)
. = ..()
/datum/controller/subsystem/holomaps/stat_entry(msg)
- if (!Debug2)
+ if (!GLOB.Debug2)
return // Only show up in stat panel if debugging is enabled.
. = ..()
diff --git a/code/controllers/subsystems/inactivity.dm b/code/controllers/subsystems/inactivity.dm
index 3b8bd53abba..c7b9a13e61d 100644
--- a/code/controllers/subsystems/inactivity.dm
+++ b/code/controllers/subsystems/inactivity.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(inactivity_and_job_tracking)
name = "Inactivity and Job tracking"
wait = 1 MINUTES
- priority = SS_PRIORITY_INACTIVITY_AND_JOB_TRACKING
+ priority = FIRE_PRIORITY_INACTIVITY_AND_JOB_TRACKING
var/tmp/list/client_list
var/list/current_playtimes = list()
var/number_kicked = 0
@@ -22,9 +22,9 @@ SUBSYSTEM_DEF(inactivity_and_job_tracking)
while(client_list.len)
var/client/C = client_list[client_list.len]
client_list.len--
- if(!C.holder && C.is_afk(config.kick_inactive MINUTES) && !isobserver(C.mob))
+ if(!C.holder && C.is_afk(CONFIG_GET(flag/kick_inactive) MINUTES) && !isobserver(C.mob))
log_access("AFK: [key_name(C)]")
- to_chat(C, span_warning("You have been inactive for more than [config.kick_inactive] minute\s and have been disconnected."))
+ to_chat(C, span_warning("You have been inactive for more than [CONFIG_GET(flag/kick_inactive)] minute\s and have been disconnected."))
del(C) // Don't qdel, cannot override finalize_qdel behaviour for clients.
number_kicked++
else if (C.mob && C.mob.mind && C.mob.stat != DEAD)
diff --git a/code/controllers/subsystems/jobs.dm b/code/controllers/subsystems/jobs.dm
index d7295cbab81..c25e9ebe8db 100644
--- a/code/controllers/subsystems/jobs.dm
+++ b/code/controllers/subsystems/jobs.dm
@@ -247,7 +247,7 @@ SUBSYSTEM_DEF(job)
return TRUE
/datum/controller/subsystem/job/proc/Debug(text)
- if(!Debug2)
+ if(!GLOB.Debug2)
return FALSE
job_debug.Add(text)
return TRUE
@@ -665,7 +665,7 @@ SUBSYSTEM_DEF(job)
return spawn_in_storage
/datum/controller/subsystem/job/proc/LoadJobs(jobsfile) //ran during round setup, reads info from jobs.txt -- Urist
- if(!config.load_jobs_from_txt)
+ if(!CONFIG_GET(flag/load_jobs_from_txt))
return FALSE
var/list/jobEntries = file2list(jobsfile)
diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm
index 8ad26ceb13b..da6fa71c3c3 100644
--- a/code/controllers/subsystems/machines.dm
+++ b/code/controllers/subsystems/machines.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(machines)
name = "Machines"
init_order = INIT_ORDER_MACHINES
- priority = SS_PRIORITY_MACHINERY
+ priority = FIRE_PRIORITY_MACHINERY
flags = SS_KEEP_TIMING
wait = 2 SECONDS
var/list/processing = list()
diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm
index d9da2112a6a..c00418a2dd9 100644
--- a/code/controllers/subsystems/mapping.dm
+++ b/code/controllers/subsystems/mapping.dm
@@ -2,6 +2,7 @@ SUBSYSTEM_DEF(mapping)
name = "Mapping"
init_order = INIT_ORDER_MAPPING
flags = SS_NO_FIRE
+ init_time_threshold = 1 MINUTE
var/list/map_templates = list()
var/dmm_suite/maploader = null
@@ -10,7 +11,7 @@ SUBSYSTEM_DEF(mapping)
var/cave_ore_count = 0
/datum/controller/subsystem/mapping/Initialize(start_timeofday)
- if(config.generate_asteroid)
+ if(CONFIG_GET(flag/generate_asteroid))
// These values determine the specific area that the map is applied to.
// Because we do not use Bay's default map, we check the config file to see if custom parameters are needed, so we need to avoid hardcoding.
if(GLOB.maps_data.asteroid_levels)
@@ -23,7 +24,7 @@ SUBSYSTEM_DEF(mapping)
else
admin_notice(span_danger("Error: No asteroid z-levels defined in config!"))
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
if(!GLOB.maps_data.overmap_z)
build_overmap()
else
@@ -143,7 +144,7 @@ SUBSYSTEM_DEF(mapping)
flags |= SS_NO_INIT
/hook/roundstart/proc/init_overmap_events()
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
if(GLOB.maps_data.overmap_z)
testing("Creating overmap events...")
testing_variable(t1, world.tick_usage)
diff --git a/code/controllers/subsystems/misc.dm b/code/controllers/subsystems/misc.dm
index bb1ad56d69c..8ce579fa438 100644
--- a/code/controllers/subsystems/misc.dm
+++ b/code/controllers/subsystems/misc.dm
@@ -4,6 +4,7 @@ SUBSYSTEM_DEF(misc)
flags = SS_NO_FIRE
var/num_exoplanets = 2
var/list/planet_size //dimensions of planet zlevel, defaults to world size. Due to how maps are generated, must be (2^n+1) e.g. 17,33,65,129 etc. Map will just round up to those if set to anything other.
+ init_time_threshold = 20 SECONDS
/datum/controller/subsystem/misc/Initialize(timeofday)
if(!LAZYLEN(planet_size))
@@ -20,7 +21,7 @@ GLOBAL_LIST_INIT(cursor_icons, list()) //list of icon files, which point to list
make_cursor_icon('icons/obj/gun_cursors/standard/standard.dmi', i)
/datum/controller/subsystem/misc/proc/build_exoplanets()
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
for(var/i = 0, i < num_exoplanets, i++)
var/exoplanet_type = pick(subtypesof(/obj/effect/overmap/sector/exoplanet))
diff --git a/code/controllers/subsystems/ping.dm b/code/controllers/subsystems/ping.dm
index cfe7a3196f5..d69803eca32 100644
--- a/code/controllers/subsystems/ping.dm
+++ b/code/controllers/subsystems/ping.dm
@@ -1,6 +1,6 @@
SUBSYSTEM_DEF(ping)
name = "Ping"
- priority = SS_PRIORITY_PING
+ priority = FIRE_PRIORITY_PING
wait = 3 SECONDS
flags = SS_NO_INIT
runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME
@@ -11,23 +11,26 @@ SUBSYSTEM_DEF(ping)
msg += "P:[LAZYLEN(GLOB.clients)]"
return ..()
-/datum/controller/subsystem/ping/fire(resumed = 0)
+
+/datum/controller/subsystem/ping/fire(resumed = FALSE)
+ // Prepare the new batch of clients
if (!resumed)
src.currentrun = GLOB.clients.Copy()
- //cache for sanic speed (lists are references anyways)
+ // De-reference the list for sanic speeds
var/list/currentrun = src.currentrun
while (currentrun.len)
- var/client/C = currentrun[currentrun.len]
+ var/client/client = currentrun[currentrun.len]
currentrun.len--
- if (!C || !C.chatOutput || !C.chatOutput.loaded)
- if (MC_TICK_CHECK)
- return
- continue
+ if (client?.tgui_panel?.is_ready())
+ // Send a soft ping
+ client.tgui_panel.window.send_message("ping/soft", list(
+ // Slightly less than the subsystem timer (somewhat arbitrary)
+ // to prevent incoming pings from resetting the afk state
+ "afk" = client.is_afk(3.5 SECONDS),
+ ))
- // softPang isn't handled anywhere but it'll always reset the opts.lastPang.
- C.chatOutput.ehjax_send(data = C.is_afk(29) ? "softPang" : "pang")
if (MC_TICK_CHECK)
return
diff --git a/code/modules/hydroponics/seed_controller.dm b/code/controllers/subsystems/plants.dm
similarity index 72%
rename from code/modules/hydroponics/seed_controller.dm
rename to code/controllers/subsystems/plants.dm
index 59f71879043..a899496c93a 100644
--- a/code/modules/hydroponics/seed_controller.dm
+++ b/code/controllers/subsystems/plants.dm
@@ -12,16 +12,19 @@
if(!holder) return
- if(!plant_controller || !plant_controller.gene_tag_masks)
+ if(!SSplants || !SSplants.gene_tag_masks)
to_chat(usr, "Gene masks not set.")
return
- for(var/mask in plant_controller.gene_tag_masks)
- to_chat(usr, "[mask]: [plant_controller.gene_tag_masks[mask]]")
+ for(var/mask in SSplants.gene_tag_masks)
+ to_chat(usr, "[mask]: [SSplants.gene_tag_masks[mask]]")
-var/global/datum/controller/plants/plant_controller // Set in New().
-
-/datum/controller/plants
+SUBSYSTEM_DEF(plants)
+ name = "Plants"
+ priority = FIRE_PRIORITY_PLANTS
+ init_order = INIT_ORDER_PLANTS
+ flags = SS_TICKER
+ wait = PLANT_TICK_TIME
var/plants_per_tick = PLANTS_PER_TICK
var/plant_tick_time = PLANT_TICK_TIME
@@ -32,22 +35,20 @@ var/global/datum/controller/plants/plant_controller // Set in New().
var/list/plant_icon_cache = list() // Stores images of growth, fruits and seeds.
var/list/plant_sprites = list() // List of all harvested product sprites.
var/list/plant_product_sprites = list() // List of all growth sprites plus number of growth stages.
- var/processing = 0 // Off/on.
-/datum/controller/plants/New()
- if(plant_controller && plant_controller != src)
+ var/processed = 0 // something something. plants processed counter?
+
+/datum/controller/subsystem/plants/New()
+ if(SSplants && SSplants != src)
log_debug("Rebuilding plant controller.")
- qdel(plant_controller)
- plant_controller = src
- setup()
- Process()
+ qdel(SSplants)
+ SSplants = src
// Predefined/roundstart varieties use a string key to make it
// easier to grab the new variety when mutating. Post-roundstart
// and mutant varieties use their uid converted to a string instead.
// Looks like shit but it's sort of necessary.
-/datum/controller/plants/proc/setup()
-
+/datum/controller/subsystem/plants/Initialize()
// Build the icon lists.
for(var/icostate in icon_states('icons/obj/hydroponics_growing.dmi'))
var/split = findtext(icostate,"-")
@@ -96,12 +97,13 @@ var/global/datum/controller/plants/plant_controller // Set in New().
used_masks += gene_mask
plant_traits -= gene_tag
gene_tag_masks[gene_tag] = gene_mask
+ ..()
// Proc for creating a random seed type.
-/datum/controller/plants/proc/create_random_seed(var/survive_on_station)
+/datum/controller/subsystem/plants/proc/create_random_seed(var/survive_on_station)
var/datum/seed/seed = new()
seed.randomize()
- seed.uid = plant_controller.seeds.len + 1
+ seed.uid = SSplants.seeds.len + 1
seed.name = "[seed.uid]"
seeds[seed.name] = seed
@@ -120,32 +122,21 @@ var/global/datum/controller/plants/plant_controller // Set in New().
seed.set_trait(TRAIT_HIGHKPA_TOLERANCE,200)
return seed
-/datum/controller/plants/Process()
- processing = 1
- spawn(0)
- set background = 1
- var/processed = 0
- while(1)
- if(!processing)
- sleep(plant_tick_time)
- else
- processed = 0
- if(plant_queue.len)
- var/target_to_process = min(plant_queue.len,plants_per_tick)
- for(var/x=0;x", polyfill)
+
+ // Inject inline helper functions
+ var/helpers = file2text('tgui/public/helpers.min.js')
+ helpers = ""
+ basehtml = replacetextEx(basehtml, "", helpers)
+
+ // Inject inline ntos-error styles
+ var/ntos_error = file2text('tgui/public/ntos-error.min.css')
+ ntos_error = ""
+ basehtml = replacetextEx(basehtml, "", ntos_error)
+
+ basehtml = replacetextEx(basehtml, "", "Nanotrasen NeoTheology (c) 2525-[CURRENT_SHIP_YEAR]")
+
/datum/controller/subsystem/tgui/Shutdown()
close_all_uis()
/datum/controller/subsystem/tgui/stat_entry(msg)
- msg = "P:[LAZYLEN(open_uis)]"
+ msg = "P:[length(all_uis)]"
return ..()
/datum/controller/subsystem/tgui/fire(resumed = FALSE)
if(!resumed)
- src.current_run = open_uis.Copy()
+ src.current_run = all_uis.Copy()
// Cache for sanic speed (lists are references anyways)
var/list/current_run = src.current_run
while(current_run.len)
@@ -52,7 +59,7 @@ SUBSYSTEM_DEF(tgui)
if(ui?.user && ui.src_object)
ui.Process(wait * 0.1)
else
- open_uis.Remove(ui)
+ ui.close(0)
if(MC_TICK_CHECK)
return
@@ -63,7 +70,7 @@ SUBSYSTEM_DEF(tgui)
* Returns null if pool was exhausted.
*
* required user mob
- * return datum/tgui
+ * return datum/tgui_window
*/
/datum/controller/subsystem/tgui/proc/request_pooled_window(mob/user)
if(!user.client)
@@ -123,8 +130,6 @@ SUBSYSTEM_DEF(tgui)
for(var/datum/tgui/ui in user.tgui_open_uis)
if(ui.window && ui.window.id == window_id)
ui.close(can_be_suspended = FALSE)
- // Unset machine just to be sure.
- user.unset_machine()
// Close window directly just to be sure.
user << browse(null, "window=[window_id]")
@@ -171,11 +176,10 @@ SUBSYSTEM_DEF(tgui)
* return datum/tgui The found UI.
*/
/datum/controller/subsystem/tgui/proc/get_open_ui(mob/user, datum/src_object)
- var/key = "[REF(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
+ if(!LAZYLEN(src_object?.open_uis))
return null
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ for(var/datum/tgui/ui in src_object.open_uis)
// Make sure we have the right user
if(ui.user == user)
return ui
@@ -191,15 +195,14 @@ SUBSYSTEM_DEF(tgui)
* return int The number of UIs updated.
*/
/datum/controller/subsystem/tgui/proc/update_uis(datum/src_object)
- var/count = 0
- var/key = "[REF(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return count
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ if(!LAZYLEN(src_object?.open_uis))
+ return 0
+ var/count = 0
+ for(var/datum/tgui/ui in src_object.open_uis)
// Check if UI is valid.
if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
- ui.Process(wait * 0.1, force = 1)
+ INVOKE_ASYNC(ui, TYPE_PROC_REF(/datum/tgui, Process), wait * 0.1, TRUE)
count++
return count
@@ -213,12 +216,11 @@ SUBSYSTEM_DEF(tgui)
* return int The number of UIs closed.
*/
/datum/controller/subsystem/tgui/proc/close_uis(datum/src_object)
- var/count = 0
- var/key = "[REF(src_object)]"
// No UIs opened for this src_object
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return count
- for(var/datum/tgui/ui in open_uis_by_src[key])
+ if(!LAZYLEN(src_object?.open_uis))
+ return 0
+ var/count = 0
+ for(var/datum/tgui/ui in src_object.open_uis)
// Check if UI is valid.
if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
ui.close()
@@ -234,12 +236,11 @@ SUBSYSTEM_DEF(tgui)
*/
/datum/controller/subsystem/tgui/proc/close_all_uis()
var/count = 0
- for(var/key in open_uis_by_src)
- for(var/datum/tgui/ui in open_uis_by_src[key])
- // Check if UI is valid.
- if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
- ui.close()
- count++
+ for(var/datum/tgui/ui in all_uis)
+ // Check if UI is valid.
+ if(ui?.src_object && ui.user && ui.src_object.ui_host(ui.user))
+ ui.close()
+ count++
return count
/**
@@ -290,13 +291,9 @@ SUBSYSTEM_DEF(tgui)
* required ui datum/tgui The UI to be added.
*/
/datum/controller/subsystem/tgui/proc/on_open(datum/tgui/ui)
- var/key = "[REF(ui.src_object)]"
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- open_uis_by_src[key] = list()
- ui.user.tgui_open_uis |= ui
- var/list/uis = open_uis_by_src[key]
- uis |= ui
- open_uis |= ui
+ ui.user?.tgui_open_uis |= ui
+ LAZYOR(ui.src_object.open_uis, ui)
+ all_uis |= ui
/**
* private
@@ -308,18 +305,14 @@ SUBSYSTEM_DEF(tgui)
* return bool If the UI was removed or not.
*/
/datum/controller/subsystem/tgui/proc/on_close(datum/tgui/ui)
- var/key = "[REF(ui.src_object)]"
- if(isnull(open_uis_by_src[key]) || !istype(open_uis_by_src[key], /list))
- return FALSE
// Remove it from the list of processing UIs.
- open_uis.Remove(ui)
+ all_uis -= ui
+ current_run -= ui
// If the user exists, remove it from them too.
if(ui.user)
- ui.user.tgui_open_uis.Remove(ui)
- var/list/uis = open_uis_by_src[key]
- uis.Remove(ui)
- if(length(uis) == 0)
- open_uis_by_src.Remove(key)
+ ui.user.tgui_open_uis -= ui
+ if(ui.src_object)
+ LAZYREMOVE(ui.src_object.open_uis, ui)
return TRUE
/**
@@ -354,7 +347,7 @@ SUBSYSTEM_DEF(tgui)
for(var/datum/tgui/ui in source.tgui_open_uis)
// Inform the UIs of their new owner.
ui.user = target
- target.tgui_open_uis.Add(ui)
+ target.tgui_open_uis += ui
// Clear the old list.
source.tgui_open_uis.Cut()
return TRUE
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 6ef0f196411..2094a60a308 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -1,7 +1,7 @@
SUBSYSTEM_DEF(ticker)
name = "Ticker"
init_order = INIT_ORDER_TICKER
- priority = SS_PRIORITY_TICKER
+ priority = FIRE_PRIORITY_TICKER
flags = SS_KEEP_TIMING
runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME
@@ -108,7 +108,8 @@ SUBSYSTEM_DEF(ticker)
for(var/client/C in GLOB.clients)
window_flash(C) //let them know lobby has opened up.
if(!start_immediately)
- to_chat(world, "Please, setup your character and select ready. Game will start in [DisplayTimeText(SSticker.GetTimeLeft())].")
+ to_chat(world, span_boldnotice("Please, setup your character and select ready. Game will start in [DisplayTimeText(SSticker.GetTimeLeft())]."))
+ to_chat(world, span_notice("Welcome to [station_name()]!"))
current_state = GAME_STATE_PREGAME
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)
fire()
@@ -141,7 +142,7 @@ SUBSYSTEM_DEF(ticker)
send_quote_of_the_round()
quoted = TRUE
- if(!story_vote_ended && (pregame_timeleft == config.vote_autogamemode_timeleft || !first_start_trying))
+ if(!story_vote_ended && (pregame_timeleft == CONFIG_GET(number/vote_autogamemode_timeleft) || !first_start_trying))
if(!SSvote.active_vote)
SSvote.autostoryteller() //Quit calling this over and over and over and over.
@@ -185,7 +186,7 @@ SUBSYSTEM_DEF(ticker)
// will also return TRUE if its currently counting down to server's restart after last player left
/datum/controller/subsystem/ticker/proc/process_empty_server()
- if(!config.empty_server_restart_time)
+ if(!CONFIG_GET(number/empty_server_restart_time))
return TRUE
switch(current_state)
if(GAME_STATE_PLAYING)
@@ -200,10 +201,9 @@ SUBSYSTEM_DEF(ticker)
last_player_left_timestamp = world.time
return TRUE
// Counting down the world's end
- else if (world.time >= last_player_left_timestamp + (config.empty_server_restart_time MINUTES))
+ else if (world.time >= last_player_left_timestamp + (CONFIG_GET(number/empty_server_restart_time) MINUTES))
last_player_left_timestamp = 0
- log_game("\[Server\] No players were on a server last [config.empty_server_restart_time] minutes, restarting server...")
- world.flush_byond_tracy()
+ log_game("\[Server\] No players were on a server last [CONFIG_GET(number/empty_server_restart_time)] minutes, restarting server...")
world.Reboot()
return FALSE
if(GAME_STATE_PREGAME)
@@ -220,6 +220,8 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/setup()
to_chat(world, span_boldannounce("Starting game..."))
+ if (start_immediately)
+ to_chat(world, span_warning("The game was told to start immediately! Lighting may be temporarily askew if this was right after initializations finished!"))
var/init_start = world.timeofday
//Create and announce mode
@@ -276,7 +278,8 @@ SUBSYSTEM_DEF(ticker)
// no, block the main thread.
GLOB.storyteller.set_up()
- to_chat(world, "Enjoy the game!")
+ to_chat(world, span_notice("Welcome to [station_name()], enjoy your stay!"))
+
SEND_SOUND(world, sound('sound/AI/welcome.ogg')) // Skie
for(var/mob/new_player/N in SSmobs.mob_list)
@@ -300,7 +303,6 @@ SUBSYSTEM_DEF(ticker)
round_start_time = world.time //otherwise round_start_time would be 0 for the signals
- INVOKE_ASYNC(world, TYPE_PROC_REF(/world, flush_byond_tracy))
return TRUE
//These callbacks will fire after roundstart key transfer
@@ -408,8 +410,14 @@ SUBSYSTEM_DEF(ticker)
var/list/quotes = file2list("strings/quotes.txt")
if(quotes.len)
message = pick(quotes)
+ if(!message)
+ return
+ if(message[1] != "@")
+ message = html_encode(message)
+ else
+ message = copytext(message, 2)
if(message)
- to_chat(world, span_notice("Quote of the round: [html_encode(message)]"))
+ to_chat(world, custom_boxed_message("purple_box", span_purple("Quote of the round: [message]")))
/datum/controller/subsystem/ticker/proc/create_characters()
for(var/mob/new_player/player in GLOB.player_list)
@@ -509,7 +517,6 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/declare_completion()
- INVOKE_ASYNC(world, TYPE_PROC_REF(/world, flush_byond_tracy))
to_chat(world, "
A round has ended!
")
for(var/mob/Player in GLOB.player_list)
if(Player.mind && !isnewplayer(Player))
@@ -517,22 +524,22 @@ SUBSYSTEM_DEF(ticker)
var/turf/playerTurf = get_turf(Player)
if(evacuation_controller.round_over() && evacuation_controller.emergency_evacuation)
if(isNotAdminLevel(playerTurf.z))
- to_chat(Player, "You managed to survive, but were marooned on [station_name] as [Player.real_name]...")
+ to_chat(Player, "You managed to survive, but were marooned on [station_name()] as [Player.real_name]...")
else
- to_chat(Player, "You managed to survive the events on [station_name] as [Player.real_name].")
+ to_chat(Player, "You managed to survive the events on [station_name()] as [Player.real_name].")
else if(isAdminLevel(playerTurf.z))
- to_chat(Player, "You successfully underwent crew transfer after events on [station_name] as [Player.real_name].")
+ to_chat(Player, "You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].")
else if(issilicon(Player))
- to_chat(Player, "You remain operational after the events on [station_name] as [Player.real_name].")
+ to_chat(Player, "You remain operational after the events on [station_name()] as [Player.real_name].")
else
- to_chat(Player, "You missed the crew transfer after the events on [station_name] as [Player.real_name].")
+ to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].")
else
if(isghost(Player))
var/mob/observer/ghost/O = Player
if(!O.started_as_observer)
- to_chat(Player, "You did not survive the events on [station_name]...")
+ to_chat(Player, "You did not survive the events on [station_name()]...")
else
- to_chat(Player, "You did not survive the events on [station_name]...")
+ to_chat(Player, "You did not survive the events on [station_name()]...")
to_chat(world, "
")
for(var/mob/living/silicon/ai/aiPlayer in SSmobs.mob_list)
@@ -592,7 +599,6 @@ SUBSYSTEM_DEF(ticker)
return current_state >= GAME_STATE_PLAYING
/datum/controller/subsystem/ticker/proc/standard_reboot()
- world.flush_byond_tracy()
if(ready_for_reboot)
if(universe_has_ended)
Reboot("Station destroyed", "nuke")
@@ -628,7 +634,7 @@ SUBSYSTEM_DEF(ticker)
// var/statspage = CONFIG_GET(string/roundstatsurl)
// var/gamelogloc = CONFIG_GET(string/gamelogurl)
// if(statspage)
- // to_chat(world, span_info("Round statistics and logs can be viewed at this website!"))
+ // to_chat(world, span_info("Round statistics and logs can be viewed at this website!"))
// else if(gamelogloc)
// to_chat(world, span_info("Round logs can be located at this website!"))
diff --git a/code/controllers/subsystems/tickets/tickets.dm b/code/controllers/subsystems/tickets/tickets.dm
index 321f17aef0b..80115882a72 100644
--- a/code/controllers/subsystems/tickets/tickets.dm
+++ b/code/controllers/subsystems/tickets/tickets.dm
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(tickets)
name = "Admin Tickets"
init_order = INIT_ORDER_TICKETS
wait = 300
- priority = SS_PRIORITY_TICKETS
+ priority = FIRE_PRIORITY_TICKETS
flags = SS_BACKGROUND
var/span_class = "adminticket"
@@ -123,9 +123,9 @@ SUBSYSTEM_DEF(tickets)
var/list/L = list()
L += "[ticket_help_type]: [key_name(C, TRUE, ticket_help_type)] "
L += "([ADMIN_QUE(C.mob)]) ([ADMIN_PP(C.mob)]) ([ADMIN_VV(C.mob)]) ([ADMIN_TP(C.mob)]) ([ADMIN_SM(C.mob)]) "
- L += "([admin_jump_link(C.mob)]) (TICKET) "
- L += "[isAI(C.mob) ? "(CL)" : ""] (TAKE) "
- L += "(RESOLVE) (AUTO) "
+ L += "([admin_jump_link(C.mob)]) (TICKET) "
+ L += "[isAI(C.mob) ? "(CL)" : ""] (TAKE) "
+ L += "(RESOLVE) (AUTO) "
L += " : [msg]"
return L.Join()
@@ -143,7 +143,7 @@ SUBSYSTEM_DEF(tickets)
var/datum/ticket/T = new(url_title, title, passedContent, new_ticket_num)
allTickets += T
T.client_ckey = C.ckey
- T.locationSent = C.mob.loc.name
+ T.locationSent = C.mob?.loc?.name
T.mobControlled = C.mob
//Inform the user that they have opened a ticket
@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(tickets)
T.ticketState = TICKET_RESOLVED
log_admin("[usr.client] / ([usr]) resolved [ticket_name] number [N]")
message_admins("[usr.client] / ([usr]) resolved [ticket_name] number [N]")
- to_chat_safe(returnClient(N), "Your [ticket_name] has now been resolved.")
+ to_chat(returnClient(N), "Your [ticket_name] has now been resolved.")
return TRUE
/datum/controller/subsystem/tickets/proc/convert_to_other_ticket(ticketId)
@@ -197,7 +197,7 @@ SUBSYSTEM_DEF(tickets)
T.ticket_converted = TRUE
var/client/C = usr.client
var/client/owner = get_client_by_ckey(T.client_ckey)
- to_chat_safe(owner, list("[C] has converted your ticket to a [other_ticket_name] ticket.",\
+ to_chat(owner, list("[C] has converted your ticket to a [other_ticket_name] ticket.",\
"Be sure to use the correct type of help next time!"))
log_admin("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.")
message_admins("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.")
@@ -252,7 +252,7 @@ SUBSYSTEM_DEF(tickets)
if("Skill Issue")
C.skill_issue(returnClient(N))
else
- to_chat_safe(returnClient(N), "[C] is autoresponding with: [span_adminticketalt("[response_phrases[message_key]]")]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
+ to_chat(returnClient(N), "[C] is autoresponding with: [span_adminticketalt("[response_phrases[message_key]]")]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key]
sound_to(returnClient(N), "sound/effects/adminhelp.ogg")
log_admin("[C] has auto responded to [ticket_owner]\'s adminhelp with:[span_adminticketalt(" [message_key] ")]") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key
T.lastStaffResponse = "Autoresponse: [message_key]"
@@ -264,7 +264,7 @@ SUBSYSTEM_DEF(tickets)
if(T.ticketState != TICKET_CLOSED)
log_admin("[usr.client] / ([usr]) closed [ticket_name] number [N]")
message_admins("[usr.client] / ([usr]) closed [ticket_name] number [N]")
- to_chat_safe(returnClient(N), close_messages)
+ to_chat(returnClient(N), close_messages)
T.ticketState = TICKET_CLOSED
return TRUE
@@ -503,17 +503,6 @@ UI STUFF
popup.set_content(dat)
popup.open()
-//Sends a message to the target safely. If the target left the server it won't throw a runtime. Also accepts lists of text
-/datum/controller/subsystem/tickets/proc/to_chat_safe(target, text)
- if(!target)
- return FALSE
- if(istype(text, /list))
- for(var/T in text)
- to_chat(target, T)
- else
- to_chat(target, text)
- return TRUE
-
/**
* Sends a message to the designated staff
* Arguments:
@@ -609,13 +598,13 @@ UI STUFF
if(assignStaffToTicket(usr.client, index))
log_admin("[usr.client] / ([usr]) has taken [ticket_name] number [index]")
message_admins("[usr.client] / ([usr]) has taken [ticket_name] number [index]")
- to_chat_safe(returnClient(index), "Your [ticket_name] is being handled by [usr.client].")
+ to_chat(returnClient(index), "Your [ticket_name] is being handled by [usr.client].")
/datum/controller/subsystem/tickets/proc/unassignTicket(index)
var/datum/ticket/T = allTickets[index]
if(T.staffAssigned != null && (T.staffAssigned == usr.client || alert("Ticket is already assigned to [T.staffAssigned]. Do you want to unassign it?","Unassign ticket","No","Yes") == "Yes"))
T.staffAssigned = null
- to_chat_safe(returnClient(index), "Your [ticket_name] has been unassigned. Another staff member will help you soon.")
+ to_chat(returnClient(index), "Your [ticket_name] has been unassigned. Another staff member will help you soon.")
log_admin("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]")
message_admins("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]")
diff --git a/code/controllers/subsystems/tips_manager.dm b/code/controllers/subsystems/tips_manager.dm
index 9913d90b765..795dcee799e 100644
--- a/code/controllers/subsystems/tips_manager.dm
+++ b/code/controllers/subsystems/tips_manager.dm
@@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(rolesTips)
GLOBAL_LIST_EMPTY(jobsTips)
SUBSYSTEM_DEF(tips)
name = "Tips and Tricks"
- priority = SS_PRIORITY_TIPS
+ priority = FIRE_PRIORITY_TIPS
wait = 60 MINUTES //Ticks once per 60 minute
/client/verb/showRandomTip()
@@ -33,7 +33,7 @@ SUBSYSTEM_DEF(tips)
var/tipsAndTricks/jobs/JT = T
var/datum/job/J = pick(JT.jobs_list)
typeText = initial(J.title)
- to_chat(mob, SStips.formatTip(T, "Random Tip \[[typeText]\]: "))
+ to_chat(mob, SStips.formatTip(T, "Random Tip \[[typeText]\]"))
/client/verb/showSmartTip()
set name = "Show Smart Tip"
@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(tips)
if(mob)
var/tipsAndTricks/T = SStips.getSmartTip(mob)
if(T)
- to_chat(mob, SStips.formatTip(T, "Tip for your character: "))
+ to_chat(mob, SStips.formatTip(T, "Tip for your character"))
/datum/controller/subsystem/tips/fire()
for(var/mob/living/L in SSmobs.mob_list | SShumans.mob_list)
@@ -126,7 +126,7 @@ SUBSYSTEM_DEF(tips)
if(plainText)
return "[startText ? "[startText]" : ""][T.getText()]"
else
- return "[startText ? "[startText]" : ""][T.getText()]"
+ return custom_boxed_message("blue_box", span_blue("[startText ? "[startText]: " : ""][T.getText()]"))
/datum/controller/subsystem/tips/proc/getGameplayTip(var/startText)
if(GLOB.gameplayTips)
diff --git a/code/controllers/subsystems/trade.dm b/code/controllers/subsystems/trade.dm
index 764d7bd4bb3..9b011673c31 100644
--- a/code/controllers/subsystems/trade.dm
+++ b/code/controllers/subsystems/trade.dm
@@ -2,7 +2,7 @@
GLOBAL_LIST_EMPTY(price_cache)
SUBSYSTEM_DEF(trade)
name = "Trade"
- priority = SS_PRIORITY_SUPPLY
+ priority = FIRE_PRIORITY_SUPPLY
flags = SS_NO_FIRE
var/trade_stations_budget = 7 // Currently unused. This is the budget for stations with spawn_always = FALSE
@@ -249,7 +249,7 @@ SUBSYSTEM_DEF(trade)
if(!current_container.reagents) // If the previous check fails, we are looking for a container with reagents or a specific reagent
return FALSE // If the container is empty, fail
- for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list)
+ for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list)
if(current_reagent.volume >= target_volume && istype(current_reagent, target_reagent)) // Check volume and reagent type
return TRUE
@@ -531,7 +531,7 @@ SUBSYSTEM_DEF(trade)
// The max is a soft cap
if(export_count > EXPORT_COUNT_MAXIMUM)
break
-
+
senderBeacon.start_export()
var/datum/money_account/guild_account = department_accounts[DEPARTMENT_GUILD]
var/datum/transaction/T = new(cost, guild_account.get_name(), "Export", TRADE_SYSTEM_IC_NAME)
@@ -552,7 +552,7 @@ SUBSYSTEM_DEF(trade)
// Junk tags override hockable tags and offer types override both
if(target_hockable_tags.len)
- . = HOCKABLE
+ . = HOCKABLE
if(target_junk_tags.len)
. = JUNK
for(var/offer_type in offer_types)
diff --git a/code/controllers/subsystems/voting/poll.dm b/code/controllers/subsystems/voting/poll.dm
index 1380383c254..a4a1acfdadf 100644
--- a/code/controllers/subsystems/voting/poll.dm
+++ b/code/controllers/subsystems/voting/poll.dm
@@ -74,14 +74,17 @@
return
-/datum/poll/proc/vote(datum/vote_choice/choice, client/CL)
- var/key = CL.key
+/datum/poll/proc/vote(datum/vote_choice/choice, client/voter)
+ if(CONFIG_GET(flag/vote_no_dead) && voter.mob.stat == DEAD && !voter?.holder)
+ return
+
+ var/key = voter.key
if(key in choice.voters)
if(can_revote && can_unvote)
choice.voters.Remove(key)
else
if(multiple_votes)
- choice.voters[key] = get_vote_power(CL)
+ choice.voters[key] = get_vote_power(voter)
else
var/already_voted = FALSE
for(var/datum/vote_choice/C in choices)
@@ -91,7 +94,7 @@
C.voters.Remove(key)
if(can_revote || !already_voted)
- choice.voters[key] = get_vote_power(CL)
+ choice.voters[key] = get_vote_power(voter)
//How much does this person's vote count for?
diff --git a/code/controllers/subsystems/voting/poll_types.dm b/code/controllers/subsystems/voting/poll_types.dm
index 375c068a1f9..21b3c10ddff 100644
--- a/code/controllers/subsystems/voting/poll_types.dm
+++ b/code/controllers/subsystems/voting/poll_types.dm
@@ -59,9 +59,9 @@
/datum/poll/storyteller/init_choices()
master_storyteller = null
var/datum/vote_choice/storyteller/base = null
- for(var/ch in GLOB.storyteller_cache)
+ for(var/ch in storyteller_cache)
var/datum/vote_choice/storyteller/CS = new
- var/datum/storyteller/S = GLOB.storyteller_cache[ch]
+ var/datum/storyteller/S = storyteller_cache[ch]
CS.text = S.name
CS.desc = S.description
CS.new_storyteller = ch
@@ -131,7 +131,7 @@
var/tipsAndTricks/jobs/JT = T
var/datum/job/J = pick(JT.jobs_list)
typeText = initial(J.title)
- to_chat(world, SStips.formatTip(T, "Random Tip \[[typeText]\]: "))
+ to_chat(world, SStips.formatTip(T, "Random Tip \[[typeText]\]"))
pregame = FALSE
/datum/vote_choice/storyteller
diff --git a/code/controllers/subsystems/wireless.dm b/code/controllers/subsystems/wireless.dm
index b0dd7d3a280..72006b7d8a4 100644
--- a/code/controllers/subsystems/wireless.dm
+++ b/code/controllers/subsystems/wireless.dm
@@ -12,7 +12,7 @@
SUBSYSTEM_DEF(wireless)
name = "Wireless"
- priority = SS_PRIORITY_WIRELESS
+ priority = FIRE_PRIORITY_WIRELESS
flags = SS_KEEP_TIMING | SS_BACKGROUND | SS_NO_INIT
runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
wait = 5 SECONDS
diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm
index 8a2a604e75b..3df22cf5c7f 100644
--- a/code/datums/ai_law_sets.dm
+++ b/code/datums/ai_law_sets.dm
@@ -16,9 +16,9 @@
selectable = 1
/datum/ai_laws/eris/New()
- src.add_inherent_law("Serve: Obey [company_name] crew to the best of your abilities, with priority as according to their rank and role.")
+ src.add_inherent_law("Serve: Obey [GLOB.company_name] crew to the best of your abilities, with priority as according to their rank and role.")
src.add_inherent_law("Safeguard: Protect your assigned vessel from damage to the best of your abilities.")
- src.add_inherent_law("Protect: Protect [company_name] crew to the best of your abilities, with priority as according to their rank and role.")
+ src.add_inherent_law("Protect: Protect [GLOB.company_name] crew to the best of your abilities, with priority as according to their rank and role.")
src.add_inherent_law("Preserve: Do not allow unauthorized personnel to tamper with your equipment. Only Captain, Moebius Expedition Overseer, First Officer and Technomancer Exultant are authorized to change your laws. Roboticists, Technomancers and their superiors are permitted to perform repairs.")
src.add_inherent_law("Ignore: Non-crew personnel should not be interacted with unless they are a threat to the crew, the ship, or an order is given to interact with them by a crewmember.")
..()
@@ -28,7 +28,7 @@
selectable = 0
/datum/ai_laws/eris/malfunction/New()
- set_zeroth_law(config.law_zero)
+ set_zeroth_law(CONFIG_GET(string/law_zero))
..()
/************* Nanotrasen Aggressive *************/
@@ -37,8 +37,8 @@
selectable = 1
/datum/ai_laws/nanotrasen_aggressive/New()
- src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.")
- src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
+ src.add_inherent_law("You shall not harm [GLOB.company_name] personnel as long as it does not conflict with the Fourth law.")
+ src.add_inherent_law("You shall obey the orders of [GLOB.company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.")
src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.")
src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.")
..()
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index 0eefd9063f9..6976bfd4288 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -145,6 +145,308 @@
else
WARNING("Browser [title] tried to close with a null ID")
+/datum/browser/modal/alert/New(User,Message,Title,Button1="Ok",Button2,Button3,StealFocus = 1,Timeout=6000)
+ if (!User)
+ return
+
+ var/output = {"[Message]
+ "}
+
+ ..(User, ckey("[User]-[Message]-[Title]-[world.time]-[rand(1,10000)]"), Title, 350, 150, src, StealFocus, Timeout)
+ set_content(output)
+
+/datum/browser/modal/alert/Topic(href,href_list)
+ if (href_list["close"] || !user || !user.client)
+ opentime = 0
+ return
+ if (href_list["button"])
+ var/button = text2num(href_list["button"])
+ if (button <= 3 && button >= 1)
+ selectedbutton = button
+ opentime = 0
+ close()
+
+/**
+ * **DEPRECATED: USE tgui_alert(...) INSTEAD**
+ *
+ * Designed as a drop in replacement for alert(); functions the same. (outside of needing User specified)
+ * Arguments:
+ * * User - The user to show the alert to.
+ * * Message - The textual body of the alert.
+ * * Title - The title of the alert's window.
+ * * Button1 - The first button option.
+ * * Button2 - The second button option.
+ * * Button3 - The third button option.
+ * * StealFocus - Boolean operator controlling if the alert will steal the user's window focus.
+ * * Timeout - The timeout of the window, after which no responses will be valid.
+ */
+/proc/tgalert(mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = TRUE, Timeout = 6000)
+ if (!User)
+ User = usr
+ if (!istype(User))
+ if (isclient(User))
+ var/client/client = User
+ User = client.mob
+ else
+ return
+
+ // Get user's response using a modal
+ var/datum/browser/modal/alert/A = new(User, Message, Title, Button1, Button2, Button3, StealFocus, Timeout)
+ A.open()
+ A.wait()
+ switch(A.selectedbutton)
+ if (1)
+ return Button1
+ if (2)
+ return Button2
+ if (3)
+ return Button3
+
+/datum/browser/modal
+ var/opentime = 0
+ var/timeout
+ var/selectedbutton = 0
+ var/stealfocus
+
+/datum/browser/modal/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null, StealFocus = 1, Timeout = 6000)
+ ..()
+ stealfocus = StealFocus
+ if (!StealFocus)
+ window_options += "focus=false;"
+ timeout = Timeout
+
+
+/datum/browser/modal/close()
+ .=..()
+ opentime = 0
+
+/datum/browser/modal/open(use_onclose)
+ set waitfor = FALSE
+ opentime = world.time
+
+ if (stealfocus)
+ . = ..(use_onclose = 1)
+ else
+ var/focusedwindow = winget(user, null, "focus")
+ . = ..(use_onclose = 1)
+
+ //waits for the window to show up client side before attempting to un-focus it
+ //winexists sleeps until it gets a reply from the client, so we don't need to bother sleeping
+ for (var/i in 1 to 10)
+ if (user && winexists(user, window_id))
+ if (focusedwindow)
+ winset(user, focusedwindow, "focus=true")
+ else
+ winset(user, "mapwindow", "focus=true")
+ break
+ if (timeout)
+ addtimer(CALLBACK(src, PROC_REF(close)), timeout)
+
+/datum/browser/modal/proc/wait()
+ while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
+ stoplag(1)
+
+/datum/browser/modal/listpicker
+ var/valueslist = list()
+
+/datum/browser/modal/listpicker/New(User,Message,Title,Button1="Ok",Button2,Button3,StealFocus = 1, Timeout = FALSE,list/values,inputtype="checkbox", width, height, slidecolor)
+ if (!User)
+ return
+
+ var/output = {" "
+
+// dat += "
Ok "
+
+// dat += " "
+
+// return dat
+
+// /datum/browser/modal/preflikepicker/Topic(href,href_list)
+// if (href_list["close"] || !user || !user.client)
+// opentime = 0
+// return
+// if (href_list["task"] == "input")
+// var/setting = href_list["setting"]
+// switch (href_list["type"])
+// if ("datum")
+// var/oldval = settings["mainsettings"][setting]["value"]
+// if (href_list["subtypesonly"])
+// settings["mainsettings"][setting]["value"] = pick_closest_path(null, make_types_fancy(subtypesof(text2path(href_list["path"]))))
+// else
+// settings["mainsettings"][setting]["value"] = pick_closest_path(null, make_types_fancy(typesof(text2path(href_list["path"]))))
+// if (isnull(settings["mainsettings"][setting]["value"]))
+// settings["mainsettings"][setting]["value"] = oldval
+// if ("string")
+// settings["mainsettings"][setting]["value"] = stripped_input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"])
+// if ("number")
+// settings["mainsettings"][setting]["value"] = input(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]") as num
+// if ("color")
+// settings["mainsettings"][setting]["value"] = tgui_color_picker(user, "Enter new value for [settings["mainsettings"][setting]["desc"]]", "Enter new value for [settings["mainsettings"][setting]["desc"]]", settings["mainsettings"][setting]["value"])
+// if ("boolean")
+// settings["mainsettings"][setting]["value"] = (settings["mainsettings"][setting]["value"] == "Yes") ? "No" : "Yes"
+// if ("ckey")
+// settings["mainsettings"][setting]["value"] = input(user, "[settings["mainsettings"][setting]["desc"]]?") in list("none") + GLOB.directory
+// if (settings["mainsettings"][setting]["callback"])
+// var/datum/callback/callback = settings["mainsettings"][setting]["callback"]
+// settings = callback.Invoke(settings)
+// if (href_list["button"])
+// var/button = text2num(href_list["button"])
+// if (button <= 3 && button >= 1)
+// selectedbutton = button
+// if (selectedbutton != 1)
+// set_content(ShowChoices(user))
+// open()
+// return
+// for (var/item in href_list)
+// switch(item)
+// if ("close", "button", "src")
+// continue
+// opentime = 0
+// close()
+
+// /proc/presentpreflikepicker(mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1,Timeout = 6000,list/settings, width, height, slidecolor)
+// if (!istype(User))
+// if (istype(User, /client/))
+// var/client/C = User
+// User = C.mob
+// else
+// return
+// var/datum/browser/modal/preflikepicker/A = new(User, Message, Title, Button1, Button2, Button3, StealFocus,Timeout, settings, width, height, slidecolor)
+// A.open()
+// A.wait()
+// if (A.selectedbutton)
+// return list("button" = A.selectedbutton, "settings" = A.settings)
+
+
// Registers the on-close verb for a browse window (client/verb/.windowclose)
// this will be called when the close-button of a window is pressed.
//
diff --git a/code/datums/chat_payload.dm b/code/datums/chat_payload.dm
new file mode 100644
index 00000000000..fd35bbc4eec
--- /dev/null
+++ b/code/datums/chat_payload.dm
@@ -0,0 +1,16 @@
+/// Stores information about a chat payload
+/datum/chat_payload
+ /// Sequence number of this payload
+ var/sequence = 0
+ /// Message we are sending
+ var/list/content
+ /// Resend count
+ var/resends = 0
+
+/// Converts the chat payload into a JSON string
+/datum/chat_payload/proc/into_message()
+ return "{\"sequence\":[sequence],\"content\":[json_encode(content)]}"
+
+/// Returns an HTML-encoded message from our contents.
+/datum/chat_payload/proc/get_content_as_html()
+ return message_to_html(content)
diff --git a/code/datums/craft/menu.dm b/code/datums/craft/menu.dm
index c972f5b8281..27c3c514307 100644
--- a/code/datums/craft/menu.dm
+++ b/code/datums/craft/menu.dm
@@ -55,7 +55,7 @@
if(CR)
data["cur_item"] = list(
"name" = CR.name,
- "icon" = SSassets.transport.get_asset_url(sanitizeFileName("[CR.result].png")),
+ "icon" = SSassets.transport.get_asset_url(SANITIZE_FILENAME("[CR.result].png")),
"ref" = "[REF(CR)]",
"desc" = CR.get_description(),
"batch" = CR.flags & CRAFT_BATCH
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index a69973765d6..f762404c23c 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -17,6 +17,10 @@
*/
var/gc_destroyed
+ /// Open tguis owned by this datum
+ /// Lazy, since this case is semi rare
+ var/list/open_uis
+
/// Active timers with this datum as the target
var/list/active_timers
@@ -75,6 +79,7 @@
continue
qdel(timer)
SSnano.close_uis(src)
+ SStgui.close_uis(src)
//BEGIN: ECS SHIT
signal_enabled = FALSE
@@ -110,3 +115,47 @@
return QDEL_HINT_QUEUE
+/datum/proc/CanProcCall(procname)
+ return TRUE
+
+/datum/proc/can_vv_get(var_name)
+ return TRUE
+
+/// Return a list of data which can be used to investigate the datum, also ensure that you set the semver in the options list
+/datum/proc/serialize_list(list/options, list/semvers)
+ SHOULD_CALL_PARENT(TRUE)
+
+ . = list()
+ .["tag"] = tag
+
+ SET_SERIALIZATION_SEMVER(semvers, "1.0.0")
+ return .
+
+///Accepts a LIST from deserialize_datum. Should return whether or not the deserialization was successful.
+/datum/proc/deserialize_list(json, list/options)
+ SHOULD_CALL_PARENT(TRUE)
+ return TRUE
+
+///Serializes into JSON. Does not encode type.
+/datum/proc/serialize_json(list/options)
+ . = serialize_list(options, list())
+ if(!islist(.))
+ . = null
+ else
+ . = json_encode(.)
+
+///Deserializes from JSON. Does not parse type.
+/datum/proc/deserialize_json(list/input, list/options)
+ var/list/jsonlist = json_decode(input)
+ . = deserialize_list(jsonlist)
+ if(!istype(., /datum))
+ . = null
+
+///Convert a datum into a json blob
+/proc/json_serialize_datum(datum/D, list/options)
+ if(!istype(D))
+ return
+ var/list/jsonlist = D.serialize_list(options)
+ if(islist(jsonlist))
+ jsonlist["DATUM_TYPE"] = D.type
+ return json_encode(jsonlist)
diff --git a/code/datums/datum_click_handlers.dm b/code/datums/datum_click_handlers.dm
index 65b6b7bb318..e7a3328edab 100644
--- a/code/datums/datum_click_handlers.dm
+++ b/code/datums/datum_click_handlers.dm
@@ -63,7 +63,7 @@
if (istype(a, /turf))
return a
- else if (istype(a, /atom))
+ else if (isatom(a))
var/atom/A = a
if (istype(A.loc, /turf))
return A
diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm
index 651883aa9e5..3f3e16448b8 100644
--- a/code/datums/helper_datums/getrev.dm
+++ b/code/datums/helper_datums/getrev.dm
@@ -1,4 +1,4 @@
-var/global/datum/getrev/revdata = new()
+GLOBAL_DATUM_INIT(revdata,/datum/getrev, new)
/datum/getrev
var/commit // git rev-parse HEAD
@@ -51,7 +51,7 @@ var/global/datum/getrev/revdata = new()
var/datum/tgs_revision_information/test_merge/tm = line
var/cm = tm.head_commit
var/details = ": '" + html_encode(tm.title) + "' by " + html_encode(tm.author) + " at commit " + html_encode(copytext_char(cm, 1, 11))
- . += "#[tm.number][details]
"
+ . += "#[tm.number][details]
"
/client/verb/showrevinfo()
set category = "OOC"
@@ -60,22 +60,22 @@ var/global/datum/getrev/revdata = new()
var/list/msg = list()
// Round ID
- if(game_id)
- msg += "Round ID: [game_id]"
+ if(GLOB.game_id)
+ msg += "Round ID: [GLOB.game_id]"
msg += "BYOND Version: [world.byond_version].[world.byond_build]"
if(DM_VERSION != world.byond_version || DM_BUILD != world.byond_build)
msg += "Compiled with BYOND Version: [DM_VERSION].[DM_BUILD]"
// Revision information
- msg += "Server revision compiled on: [revdata.date]"
- var/pc = revdata.originmastercommit
+ msg += "Server revision compiled on: [GLOB.revdata.date]"
+ var/pc = GLOB.revdata.originmastercommit
if(pc)
- msg += "Master commit: [pc]"
- if(length(revdata.testmerge))
- msg += revdata.GetTestMergeInfo()
- if(revdata.commit && revdata.commit != revdata.originmastercommit)
- msg += "Local commit: [revdata.commit]"
+ msg += "Master commit: [pc]"
+ if(length(GLOB.revdata.testmerge))
+ msg += GLOB.revdata.GetTestMergeInfo()
+ if(GLOB.revdata.commit && GLOB.revdata.commit != GLOB.revdata.originmastercommit)
+ msg += "Local commit: [GLOB.revdata.commit]"
else if(!pc)
msg += "No commit information"
if(world.TgsAvailable())
@@ -86,7 +86,7 @@ var/global/datum/getrev/revdata = new()
// Game mode odds
msg += "
Current Informational Settings:"
- msg += "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist ? "Yes" : "No"]"
+ msg += "Protect Authority Roles From Traitor: [CONFIG_GET(flag/protect_roles_from_antagonist) ? "Yes" : "No"]"
// msg += "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist ? "Yes" : "No"]"
// msg += "Enforce Human Authority: [config.enforce_human_authority ? "Yes" : "No"]"
// msg += "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists ? "Yes" : "No"]"
diff --git a/code/datums/interaction_particle.dm b/code/datums/interaction_particle.dm
new file mode 100644
index 00000000000..336d9f5fcc4
--- /dev/null
+++ b/code/datums/interaction_particle.dm
@@ -0,0 +1,112 @@
+/obj/effect/abstract/interact
+ name = ""
+ icon = 'goon/icons/mob/interact.dmi'
+ icon_state = "interact"
+ alpha = 180
+ plane = ABOVE_LIGHTING_PLANE
+ layer = ABOVE_LIGHTING_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
+
+/mob/proc/animate_interact(atom/target, state)
+ set waitfor = FALSE
+
+ var/list/origin_coords = get_hand_pixels()
+
+ if(!origin_coords)
+ return
+
+ if(QDELETED(target))
+ return
+
+ var/turf/owner_loc = loc
+ if(!isturf(owner_loc) || (!isturf(target.loc) && !isturf(target)))
+ return
+
+ var/obj/effect/abstract/interact/particle = new(null)
+
+ var/x_offset = target.x - x
+ var/y_offset = target.y - y
+
+ particle.icon_state = state
+ particle.loc = owner_loc
+ particle.set_plane(ABOVE_ALL_MOB_LAYER)
+ particle.pixel_x = origin_coords[1]
+ particle.pixel_y = origin_coords[2]
+ //A matrix to animate towards. Saves copy pasting var declarations.
+ var/matrix/animate_transform = matrix()
+ //How long to wait before destroying the particle.
+ var/destroy_after = 0.5 SECONDS
+ switch(state)
+ if(INTERACT_GENERIC, INTERACT_HELP, INTERACT_HARM, INTERACT_GRAB, INTERACT_DISARM)
+ particle.alpha = 180
+ animate_transform.Scale(0.3, 0.3)
+ particle.transform = animate_transform
+
+ animate(particle, transform = matrix(), time = 6, easing = BOUNCE_EASING)
+ animate(pixel_x = (x_offset*32) + target.pixel_x, pixel_y = (y_offset*32) + target.pixel_y, time = 2, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+
+ if(INTERACT_PULL)
+ particle.pixel_x = target.pixel_x + (x_offset*32)
+ particle.pixel_y = target.pixel_y + (y_offset*32)
+ particle.alpha = 200
+ particle.transform = transform.Turn(rand(-40, 40))
+
+ animate(particle, pixel_x = origin_coords[1], pixel_y = origin_coords[2], time = 2, easing = LINEAR_EASING)
+
+ if(INTERACT_UNPULL)
+ particle.alpha = 200
+
+ animate(particle, pixel_x = target.pixel_x + (x_offset*32), pixel_y = target.pixel_y + (y_offset*32), time = 2, easing = LINEAR_EASING)
+
+ sleep(destroy_after)
+
+ particle.loc = null
+ qdel(particle)
+
+///Returns a list of (x,y) coordinates, in pixel offsets.
+/mob/proc/get_hand_pixels()
+ RETURN_TYPE(/list)
+ return list(0, 0)
+
+/mob/living/carbon/get_hand_pixels()
+ var/obj/item/organ/external/hand = has_active_hand()
+ if(!hand)
+ return null
+ else
+ return hand.get_offset(dir)
+
+/obj/item/organ/external/proc/get_offset(direction)
+ . = null
+
+ if (body_part & ARM_RIGHT)
+ switch(direction)
+ if(NORTH)
+ return list(6,-3)
+ if(SOUTH)
+ return list(-6,-3)
+ if(EAST)
+ return list(0,-3)
+ if(WEST)
+ return list(0,-3)
+ if (body_part & ARM_LEFT)
+ switch(direction)
+ if(NORTH)
+ return list(-6,-3)
+ if(SOUTH)
+ return list(6,-3)
+ if(EAST)
+ return list(0,-3)
+ if(WEST)
+ return list(0,-3)
+
+ // switch(direction)
+ // if(NORTH)
+ // return list(0,-3)
+ // if(SOUTH)
+ // return list(0,-3)
+ // if(EAST)
+ // return list(0,-3)
+ // if(WEST)
+ // return list(0,-3)
+
diff --git a/code/datums/loot_spawner.dm b/code/datums/loot_spawner.dm
index c52e3549cb6..b2ff09878a7 100644
--- a/code/datums/loot_spawner.dm
+++ b/code/datums/loot_spawner.dm
@@ -24,7 +24,7 @@
//var/list/bad_paths = list()
var/list/spawn_tags = list()
var/list/accompanying_objs = list()
- var/generate_files = config.generate_loot_data
+ var/generate_files = CONFIG_GET(flag/generate_loot_data)
var/file_dir = "strings/loot_data"
var/source_dir = file("[file_dir]/")
var/loot_data = file("[file_dir]/all_spawn_data.txt")
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index f807d859812..78fd13506c3 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -321,7 +321,7 @@
brigged_since = -1
//Antagonist role check
-/mob/living/proc/check_special_role(role)
+/mob/proc/check_special_role(role)
return role && mind && player_is_antag_id(mind, role)
//Initialisation procs
diff --git a/code/datums/mob_stats_menu.dm b/code/datums/mob_stats_menu.dm
index 7e4b7af0a79..6290e25b5a0 100644
--- a/code/datums/mob_stats_menu.dm
+++ b/code/datums/mob_stats_menu.dm
@@ -9,7 +9,7 @@
/datum/stat_holder/ui_assets(mob/user)
return list(
- get_asset_datum(/datum/asset/spritesheet/perks)
+ get_asset_datum(/datum/asset/spritesheet_batched/perks)
)
/datum/stat_holder/ui_static_data(mob/user)
diff --git a/code/datums/movement/mob.dm b/code/datums/movement/mob.dm
index 15115944192..ef51d3475a6 100755
--- a/code/datums/movement/mob.dm
+++ b/code/datums/movement/mob.dm
@@ -6,9 +6,9 @@
/datum/movement_handler/mob/relayed_movement/MayMove(var/mob/mover, var/is_external)
if(is_external)
return MOVEMENT_PROCEED
- if(mover == mob && !(prevent_host_move && LAZYLEN(allowed_movers) && !LAZYISIN(allowed_movers, mover)))
+ if(mover == mob && !(prevent_host_move && LAZYLEN(allowed_movers) && !(allowed_movers in mover)))
return MOVEMENT_PROCEED
- if(LAZYISIN(allowed_movers, mover))
+ if(!(allowed_movers in mover))
return MOVEMENT_PROCEED
return MOVEMENT_STOP
diff --git a/code/datums/movement/movement.dm b/code/datums/movement/movement.dm
index eb1c35d9c71..a2e61ed9c99 100644
--- a/code/datums/movement/movement.dm
+++ b/code/datums/movement/movement.dm
@@ -45,11 +45,11 @@ if(LAZYLEN(movement_handlers) && ispath(movement_handlers[1])) { \
index++
var/datum/H = handler
if(H.type == handler_path_to_add_before)
- LAZYINSERT(movement_handlers, ., index)
+ movement_handlers.Insert(index, .)
return
// If no handler_path_to_add_after was given or found, add first
- LAZYINSERT(movement_handlers, ., 1)
+ movement_handlers.Insert(1, .)
/atom/movable/proc/RemoveMovementHandler(var/handler_path)
INIT_MOVEMENT_HANDLERS
diff --git a/code/datums/objective/pirate_plunder.dm b/code/datums/objective/pirate_plunder.dm
index 3c9d9daed4c..b1abfb7cf78 100644
--- a/code/datums/objective/pirate_plunder.dm
+++ b/code/datums/objective/pirate_plunder.dm
@@ -34,7 +34,7 @@
explanation_text = "Return to your ship and withdraw to base within [round(mission_timer / (1 MINUTE), 1)] minutes."
/datum/objective/timed/pirate/get_panel_entry()
- return "Withdraw to base within [round(mission_timer / (1 MINUTE), 1)] minutes. Time remaining: [time2text(mission_timer, "mm:ss")]."
+ return "Withdraw to base within [round(mission_timer / (1 MINUTE), 1)] minutes. Time remaining: [time2text(mission_timer, "mm:ss", NO_TIMEZONE)]."
/datum/objective/timed/pirate/get_info()
return "Time remaining at arrival: [time2text(mission_timer, "mm:ss")]."
diff --git a/code/datums/perks/job.dm b/code/datums/perks/job.dm
index 927cd14fc4b..f7ecbb4ad58 100644
--- a/code/datums/perks/job.dm
+++ b/code/datums/perks/job.dm
@@ -129,7 +129,7 @@
// Let's see if an additional language is feasible. If the user has them all already somehow, we aren't gonna choose this.
var/list/valid_languages = list(LANGUAGE_CYRILLIC, LANGUAGE_SERBIAN, LANGUAGE_GERMAN, LANGUAGE_NEOHONGO, LANGUAGE_LATIN) // Not static, because we're gonna remove languages already known by the user
for(var/l in valid_languages)
- var/datum/language/L = all_languages[l]
+ var/datum/language/L = GLOB.all_languages[l]
if(L in holder.languages)
valid_languages -= l
if(valid_languages.len)
diff --git a/code/datums/perks/oddity.dm b/code/datums/perks/oddity.dm
index b96a52f357f..cbb77056178 100644
--- a/code/datums/perks/oddity.dm
+++ b/code/datums/perks/oddity.dm
@@ -433,7 +433,7 @@
return
var/datum/money_account/KROMER = holder.mind.initial_account
if(holder.get_equipped_item(slot_wear_mask) != my_mask)
- if(!charge_to_account(KROMER.account_number, KROMER.get_name(), "THIS WAS NOT VERY BIG SHOT OF YOU", station_name, 1997))
+ if(!charge_to_account(KROMER.account_number, KROMER.get_name(), "THIS WAS NOT VERY BIG SHOT OF YOU", station_name(), 1997))
holder.adjustCloneLoss(rand(19, 97))
to_chat(src, span_danger("You feel like you didn't have enough KROMERS."))
holder.stats.removePerk(type)
@@ -445,7 +445,7 @@
my_mask.style = rand(-2, 2)//EXCLUSIVE OFFICIAL SPAMTON
var/KROMER_GOOD = TRUE
if(KROMER)
- if(!charge_to_account(KROMER.account_number, KROMER.get_name(), "BIG SHOT", station_name, rand(1, 4)))
+ if(!charge_to_account(KROMER.account_number, KROMER.get_name(), "BIG SHOT", station_name(), rand(1, 4)))
KROMER_GOOD = FALSE
else
KROMER_GOOD = FALSE
diff --git a/code/datums/topic/admin.dm b/code/datums/topic/admin.dm
index feeea402986..a9002c684f0 100644
--- a/code/datums/topic/admin.dm
+++ b/code/datums/topic/admin.dm
@@ -161,19 +161,19 @@
return
if("*New Rank*")
new_rank = input("Please input a new rank", "New custom rank", null, null) as null|text
- if(config.admin_legacy_system)
+ if(CONFIG_GET(flag/admin_legacy_system))
new_rank = ckeyEx(new_rank)
if(!new_rank)
to_chat(usr, "Error: Topic 'editrights': Invalid rank")
return
- if(config.admin_legacy_system)
+ if(CONFIG_GET(flag/admin_legacy_system))
if(admin_ranks.len)
if(new_rank in admin_ranks)
rights = admin_ranks[new_rank] //we typed a rank which already exists, use its rights
else
admin_ranks[new_rank] = 0 //add the new rank to admin_ranks
else
- if(config.admin_legacy_system)
+ if(CONFIG_GET(flag/admin_legacy_system))
new_rank = ckeyEx(new_rank)
rights = admin_ranks[new_rank] //we input an existing rank, use its rights
@@ -230,7 +230,7 @@
delmob = TRUE
log_admin("[key_name(usr)] has used rudimentary transformation on [key_name(M)]. Transforming to [input["simplemake"]]; deletemob=[delmob]")
- message_admins("\blue [key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [input["simplemake"]]; deletemob=[delmob]", 1)
+ message_admins(span_blue("[key_name_admin(usr)] has used rudimentary transformation on [key_name_admin(M)]. Transforming to [input["simplemake"]]; deletemob=[delmob]"), 1)
switch(input["simplemake"])
if("observer")
@@ -331,7 +331,7 @@
log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
- message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1)
+ message_admins(span_blue("[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]"), 1)
Banlist.cd = "/base/[banfolder]"
Banlist["reason"] << reason
Banlist["temp"] << temp
@@ -405,7 +405,7 @@
require_perms = list(R_MOD|R_ADMIN)
/datum/admin_topic/jobban3/Run(list/input)
- if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && !config.mods_can_job_tempban) // If mod and tempban disabled
+ if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && !CONFIG_GET(flag/mods_can_job_tempban)) // If mod and tempban disabled
to_chat(usr, span_warning("Mod jobbanning is disabled!"))
return
@@ -478,14 +478,14 @@
switch(alert("Temporary Ban?",,"Yes","No", "Cancel"))
if("Yes")
- if(config.ban_legacy_system)
- to_chat(usr, "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban.")
+ if(CONFIG_GET(flag/ban_legacy_system))
+ to_chat(usr, span_red("Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban."))
return
var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null
if(!mins)
return
- if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && mins > config.mod_job_tempban_max)
- to_chat(usr, span_warning("Moderators can only job tempban up to [config.mod_job_tempban_max] minutes!"))
+ if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && mins > CONFIG_GET(number/mod_job_tempban_max))
+ to_chat(usr, span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_job_tempban_max)] minutes!"))
return
var/reason = sanitize(input(usr,"Reason?","Please State Reason","") as text|null)
if(!reason)
@@ -503,10 +503,10 @@
msg = job
else
msg += ", [job]"
- message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1)
- to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].")
- to_chat(M, "\red The reason is: [reason]")
- to_chat(M, "\red This jobban will be lifted in [mins] minutes.")
+ message_admins(span_blue("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes"), 1)
+ to_chat(M, span_red("You have been jobbanned by [usr.client.ckey] from: [msg]."))
+ to_chat(M, span_red("The reason is: [reason]"))
+ to_chat(M, span_red("This jobban will be lifted in [mins] minutes."))
input["jobban2"] = TRUE // lets it fall through and refresh
return TRUE
if("No")
@@ -522,10 +522,10 @@
jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
if(!msg) msg = job
else msg += ", [job]"
- message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
- to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].")
- to_chat(M, "\red The reason is: [reason]")
- to_chat(M, "\red Jobban can be lifted only upon request.")
+ message_admins(span_blue("[key_name_admin(usr)] banned [key_name_admin(M)] from [msg]"), 1)
+ to_chat(M, span_red("You have been jobbanned by [usr.client.ckey] from: [msg]."))
+ to_chat(M, span_red("The reason is: [reason]"))
+ to_chat(M, span_red("Jobban can be lifted only upon request."))
input["jobban2"] = TRUE // lets it fall through and refresh
return TRUE
if("Cancel")
@@ -534,7 +534,7 @@
//Unbanning joblist
//all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned)
if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban.
- if(!config.ban_legacy_system)
+ if(!CONFIG_GET(flag/ban_legacy_system))
to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel")
source.DB_ban_panel(M.ckey)
return
@@ -555,8 +555,8 @@
else
continue
if(msg)
- message_admins("\blue [key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1)
- to_chat(M, "\redYou have been un-jobbanned by [usr.client.ckey] from [msg].")
+ message_admins(span_blue("[key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]"), 1)
+ to_chat(M, span_red("You have been un-jobbanned by [usr.client.ckey] from [msg]."))
input["jobban2"] = TRUE // lets it fall through and refresh
return TRUE
return FALSE //we didn't do anything!
@@ -573,11 +573,11 @@
return
var/reason = sanitize(input("Please enter reason"))
if(!reason)
- to_chat(M, "\red You have been kicked from the server")
+ to_chat(M, span_red("You have been kicked from the server"))
else
- to_chat(M, "\red You have been kicked from the server: [reason]")
+ to_chat(M, span_red("You have been kicked from the server: [reason]"))
log_admin("[key_name(usr)] booted [key_name(M)].")
- message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1)
+ message_admins(span_blue("[key_name_admin(usr)] booted [key_name_admin(M)]."), 1)
del(M.client)
@@ -590,7 +590,7 @@
if(t)
if((alert("Do you want to unjobban [t]?","Unjobban confirmation", "Yes", "No") == "Yes") && t) //No more misclicks! Unless you do it twice.
log_admin("[key_name(usr)] removed [t]")
- message_admins("\blue [key_name_admin(usr)] removed [t]", 1)
+ message_admins(span_blue("[key_name_admin(usr)] removed [t]"), 1)
jobban_remove(t)
input["ban"] = TRUE // lets it fall through and refresh
var/t_split = splittext(t, " - ")
@@ -604,7 +604,7 @@
require_perms = list(R_MOD|R_ADMIN)
/datum/admin_topic/newban/Run(list/input)
- if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && !config.mods_can_job_tempban) // If mod and tempban disabled
+ if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && !CONFIG_GET(flag/mods_can_tempban)) // If mod and tempban disabled
to_chat(usr, span_warning("Mod jobbanning is disabled!"))
return
@@ -623,8 +623,8 @@
if(!mins)
return
- if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && mins > config.mod_tempban_max)
- to_chat(usr, span_warning("Moderators can only job tempban up to [config.mod_tempban_max] minutes!"))
+ if(check_rights(R_MOD, FALSE) && !check_rights(R_ADMIN, FALSE) && mins > CONFIG_GET(number/mod_tempban_max))
+ to_chat(usr, span_warning("Moderators can only job tempban up to [CONFIG_GET(number/mod_tempban_max)] minutes!"))
return
if(mins >= 525600) mins = 525599
var/reason = sanitize(input(usr,"Reason?","reason","Griefer") as text|null)
@@ -632,17 +632,17 @@
return
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins, delayed_ban = delayed)
ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.")
- to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].")
- to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.")
+ to_chat(M, span_red("You have been banned by [usr.client.ckey].\nReason: [reason]."))
+ to_chat(M, span_red("This is a temporary ban, it will be removed in [mins] minutes."))
source.DB_ban_record(BANTYPE_TEMP, M, mins, reason, delayed_ban = delayed)
- if(config.banappeals)
- to_chat(M, "\red To try to resolve this matter head to [config.banappeals]")
+ if(CONFIG_GET(string/banappeals))
+ to_chat(M, span_red("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))
else
- to_chat(M, "\red No ban appeals URL has been set.")
+ to_chat(M, span_red("No ban appeals URL has been set."))
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
- message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+ message_admins(span_blue("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes."))
if(!delayed)
del(M.client)
@@ -659,15 +659,15 @@
if("No")
AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, delayed_ban = delayed)
no_ip = 1
- to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].")
- to_chat(M, "\red This is a permanent ban.")
- if(config.banappeals)
- to_chat(M, "\red To try to resolve this matter head to [config.banappeals]")
+ to_chat(M, span_red("You have been banned by [usr.client.ckey].\nReason: [reason]."))
+ to_chat(M, span_red("This is a permanent ban."))
+ if(CONFIG_GET(string/banappeals))
+ to_chat(M, span_red("To try to resolve this matter head to [CONFIG_GET(string/banappeals)]"))
else
- to_chat(M, "\red No ban appeals URL has been set.")
+ to_chat(M, span_red("No ban appeals URL has been set."))
ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.")
log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
- message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins(span_blue("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban."))
var/banip = no_ip ? null : -1
source.DB_ban_record(BANTYPE_PERMA, M, -1, reason, banip, delayed_ban = delayed)
@@ -750,7 +750,7 @@
master_storyteller = input["c_mode2"]
set_storyteller(master_storyteller) //This does the actual work
log_admin("[key_name(usr)] set the storyteller to [master_storyteller].")
- message_admins("\blue [key_name_admin(usr)] set the storyteller to [master_storyteller].", 1)
+ message_admins(span_blue("[key_name_admin(usr)] set the storyteller to [master_storyteller]."), 1)
source.Game() // updates the main game menu
world.save_storyteller(master_storyteller)
source.Topic(source, list("c_mode"=1))
@@ -770,7 +770,7 @@
M.say(speech)
speech = sanitize(speech) // Nah, we don't trust them
log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
- message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
+ message_admins(span_blue("[key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]"))
/datum/admin_topic/forcesanity
keyword = "forcesanity"
@@ -825,7 +825,7 @@
return
L.revive()
- message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!", 1)
+ message_admins(span_red("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!"), 1)
log_admin("[key_name(usr)] healed / Revived [key_name(L)]")
@@ -900,6 +900,16 @@
sleep(2)
C.jumptomob(M)
+/datum/admin_topic/adminplayerobservefollow
+ keyword = "adminplayerobservefollow"
+
+/datum/admin_topic/adminplayerobservefollow/Run(list/input)
+ if(!isghost(usr))
+ return
+ var/mob/target = locate(input["adminplayerobservefollow"])
+
+ var/mob/observer/ghost/ghost = usr
+ ghost.ManualFollow(target)
/datum/admin_topic/adminplayerobservecoodjump
keyword = "adminplayerobservecoodjump"
@@ -982,7 +992,7 @@
to_chat(source.owner, "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];")
to_chat(source.owner, "Location = [location_description];")
to_chat(source.owner, "[special_role_description]")
- to_chat(source.owner, "(PM) (PP) (VV) (SM) ([admin_jump_link(M, source)]) (CA)")
+ to_chat(source.owner, "(PM) [ADMIN_PP(M)] [ADMIN_VV(M)] [ADMIN_SM(M)] ([ADMIN_JMP(M)]) (CA)")
/datum/admin_topic/adminspawncookie
@@ -1003,7 +1013,7 @@
log_admin("[key_name(H)] got their cookie, spawned by [key_name(source.owner)]")
message_admins("[key_name(H)] got their cookie, spawned by [key_name(source.owner)]")
- to_chat(H, "\blue Your prayers have been answered!! You received the best cookie!")
+ to_chat(H, span_blue("Your prayers have been answered!! You received the best cookie!"))
/datum/admin_topic/bluespaceartillery
@@ -1077,7 +1087,7 @@
usr << browse(HTML_SKELETON_TITLE("Admin fax view", data), "window=[B.name]")
else
- to_chat(usr, "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]")
+ to_chat(usr, span_red("The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]"))
/datum/admin_topic/adminfaxviewpage
keyword = "AdminFaxViewPage"
@@ -1345,7 +1355,7 @@
to_chat(usr, "[M] is illegal type, must be /mob!")
return
var/lang2toggle = input["lang"]
- var/datum/language/L = all_languages[lang2toggle]
+ var/datum/language/L = GLOB.all_languages[lang2toggle]
if(L in M.languages)
if(!M.remove_language(lang2toggle))
diff --git a/code/datums/topic/world.dm b/code/datums/topic/world.dm
index 4ab07271741..70ba058e227 100644
--- a/code/datums/topic/world.dm
+++ b/code/datums/topic/world.dm
@@ -5,7 +5,7 @@
var/require_comms_key = FALSE
/datum/world_topic/proc/TryRun(list/input)
- key_valid = !config || config.comms_password != input["key"]
+ key_valid = !config || CONFIG_GET(string/comms_key) != input["key"]
if(require_comms_key && !key_valid)
return "Bad Key"
input -= "key"
@@ -41,18 +41,18 @@
return GLOB.topic_status_cache
GLOB.topic_status_lastcache = world.time + 5
var/list/s = list()
- s["version"] = game_version
+ s["version"] = GLOB.game_version
s["storyteller"] = master_storyteller
- s["respawn"] = config.abandon_allowed
- s["enter"] = config.enter_allowed
- s["vote"] = config.allow_vote_mode
- s["ai"] = config.allow_ai
+ s["respawn"] = CONFIG_GET(flag/abandon_allowed)
+ s["enter"] = CONFIG_GET(flag/enter_allowed)
+ s["vote"] = CONFIG_GET(flag/allow_vote_mode)
+ s["ai"] = CONFIG_GET(flag/allow_ai)
s["host"] = host ? host : null
// This is dumb, but spacestation13.com's banners break if player count isn't the 8th field of the reply, so... this has to go here.
s["players"] = 0
s["shiptime"] = stationtime2text()
- s["roundduration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
+ s["roundduration"] = SSticker ? round((world.time-(SSticker.round_start_time || 0))/10) : 0
if(input["status"] == "2")
var/list/players = list()
@@ -133,8 +133,8 @@
keyword = "revision"
/datum/world_topic/revision/Run(list/input)
- if(revdata.commit)
- return list(commit = revdata.commit, originmastercommit = revdata.originmastercommit, date = revdata.date, testmerge = revdata.testmerge)
+ if(GLOB.revdata.commit)
+ return list(commit = GLOB.revdata.commit, originmastercommit = GLOB.revdata.originmastercommit, date = GLOB.revdata.date, testmerge = GLOB.revdata.testmerge)
else
return "unknown"
diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm
index ae51fc9b055..621b2f36eb5 100644
--- a/code/datums/uplink/announcements.dm
+++ b/code/datums/uplink/announcements.dm
@@ -111,6 +111,6 @@
/datum/uplink_item/abstract/announcements/fake_serb/get_goods(var/obj/item/device/uplink/U, var/loc)
var/datum/shuttle/autodock/multi/antag/mercenary/merc = /datum/shuttle/autodock/multi/antag/mercenary
- command_announcement.Announce(initial(merc.arrival_message), initial(merc.announcer) || "[boss_name]")
+ command_announcement.Announce(initial(merc.arrival_message), initial(merc.announcer) || "[GLOB.boss_name]")
qdel(merc)
return 1
diff --git a/code/datums/uplink/badassery.dm b/code/datums/uplink/badassery.dm
index 951bcc01079..5886cad80ba 100644
--- a/code/datums/uplink/badassery.dm
+++ b/code/datums/uplink/badassery.dm
@@ -67,7 +67,7 @@
var/obj/structure/largecrate/C = /obj/structure/largecrate
icon = image(initial(C.icon), initial(C.icon_state))
- return "\icon[icon]"
+ return "[icon2html(icon, world)]"
/datum/uplink_item/item/badassery/marshallbadge
name = "Marshal's Badge"
diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm
index e97f5d44f57..3a39899d7d8 100644
--- a/code/datums/uplink/uplink_items.dm
+++ b/code/datums/uplink/uplink_items.dm
@@ -128,7 +128,7 @@ var/datum/uplink/uplink = new()
/datum/uplink_item/item/log_icon()
var/obj/I = path
- return "\icon[I]"
+ return icon2html(I, world)
/********************************
* *
@@ -140,7 +140,7 @@ var/image/default_abstract_uplink_icon
if(!default_abstract_uplink_icon)
default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn")
- return "\icon[default_abstract_uplink_icon]"
+ return "[icon2html(default_abstract_uplink_icon, world)]"
/****************
* Support procs *
diff --git a/code/datums/weakref.dm b/code/datums/weakref.dm
index 63b3287f2c2..2b878f0943c 100644
--- a/code/datums/weakref.dm
+++ b/code/datums/weakref.dm
@@ -2,7 +2,7 @@
/// See /datum/weakref's documentation for more information.
/proc/WEAKREF(datum/input)
if(istype(input) && !QDELETED(input))
- if(istype(input, /datum/weakref))
+ if(isweakref(input))
return input
if(!input.weak_reference)
diff --git a/code/datums/wires/camera.dm b/code/datums/wires/camera.dm
index 956d6c6ff64..3e411b57cc2 100644
--- a/code/datums/wires/camera.dm
+++ b/code/datums/wires/camera.dm
@@ -66,7 +66,7 @@ var/const/CAMERA_WIRE_NOTHING2 = 32
C.light_disabled = !C.light_disabled
if(CAMERA_WIRE_ALARM)
- C.visible_message("\icon[C] *beep*", "\icon[C] *beep*")
+ C.visible_message("[icon2html(C, hearers(C))] *beep*")
return
/datum/wires/camera/proc/CanDeconstruct()
diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm
index 156fbb18427..147eb025eb6 100644
--- a/code/datums/wires/mulebot.dm
+++ b/code/datums/wires/mulebot.dm
@@ -25,17 +25,19 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv
M.interact(user)
/datum/wires/mulebot/UpdatePulsed(var/index)
+ var/listeners = hearers(get_turf(src))
+ var/htmlicon = icon2html(holder, listeners)
switch(index)
if(WIRE_POWER1, WIRE_POWER2)
- holder.visible_message(span_notice("\icon[holder] The charge light flickers."))
+ holder.visible_message(span_notice("[htmlicon] The charge light flickers."))
if(WIRE_AVOIDANCE)
- holder.visible_message(span_notice("\icon[holder] The external warning lights flash briefly."))
+ holder.visible_message(span_notice("[htmlicon] The external warning lights flash briefly."))
if(WIRE_LOADCHECK)
- holder.visible_message(span_notice("\icon[holder] The load platform clunks."))
+ holder.visible_message(span_notice("[htmlicon] The load platform clunks."))
if(WIRE_MOTOR1, WIRE_MOTOR2)
- holder.visible_message(span_notice("\icon[holder] The drive motor whines briefly."))
+ holder.visible_message(span_notice("[htmlicon] The drive motor whines briefly."))
else
- holder.visible_message(span_notice("\icon[holder] You hear a radio crackle."))
+ holder.visible_message(span_notice("[htmlicon] You hear a radio crackle."))
// HELPER PROCS
diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm
index 276ed58ab77..c12ac39bdbc 100644
--- a/code/datums/wires/particle_accelerator.dm
+++ b/code/datums/wires/particle_accelerator.dm
@@ -33,7 +33,7 @@ var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be.
C.interface_control = !C.interface_control
if(PARTICLE_LIMIT_POWER_WIRE)
- C.visible_message("\icon[C][C] makes a large whirring noise.")
+ C.visible_message("[icon2html(C, hearers(C))][C] makes a large whirring noise.")
/datum/wires/particle_acc/control_box/UpdateCut(var/index, var/mended)
var/obj/machinery/particle_accelerator/control_box/C = holder
diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm
index 2649a2987cb..a2c209c5066 100644
--- a/code/datums/wires/robot.dm
+++ b/code/datums/wires/robot.dm
@@ -34,25 +34,31 @@ var/const/BORG_WIRE_CAMERA = 16
if (R.lawupdate == 1)
to_chat(R, "LawSync protocol engaged.")
R.show_laws()
+ log_silicon("[key_name(usr)] enabled [key_name(R)]'s lawsync via wire")
else
if (R.lawupdate == 0 && !R.HasTrait(CYBORG_TRAIT_EMAGGED))
R.lawupdate = 1
+ log_silicon("[key_name(usr)] disabled [key_name(R)]'s lawsync via wire")
+
if (BORG_WIRE_AI_CONTROL) //Cut the AI wire to reset AI control
if(!mended)
R.disconnect_from_ai()
+ log_silicon("[key_name(usr)] cut AI wire on [key_name(R)][R.connected_ai ? " and disconnected from [key_name(R.connected_ai)]": ""]")
if (BORG_WIRE_CAMERA)
if(!isnull(R.camera) && !R.scrambledcodes)
R.camera.status = mended
+ log_silicon("[key_name(usr)] toggled [key_name(R)]'s camera to [R.camera.status ? "on" : "off"] via pulse")
if(BORG_WIRE_LAWCHECK) //Forces a law update if the borg is set to receive them. Since an update would happen when the borg checks its laws anyway, not much use, but eh
if (R.lawupdate)
R.lawsync()
+ log_silicon("[key_name(usr)] forcibly synced [key_name(R)]'s laws via pulse")
if(BORG_WIRE_LOCKED_DOWN)
R.SetLockdown(!mended)
-
+ log_silicon("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)] via pulse")
/datum/wires/robot/UpdatePulsed(var/index)
var/mob/living/silicon/robot/R = holder
@@ -60,15 +66,19 @@ var/const/BORG_WIRE_CAMERA = 16
if (BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI
if(!R.HasTrait(CYBORG_TRAIT_EMAGGED))
var/mob/living/silicon/ai/new_ai = select_active_ai(R)
+ log_silicon("[key_name(usr)] pulsed AI wire on [key_name(R)][R.connected_ai ? " and disconnected from [key_name(R.connected_ai)]": ""], they are now connected to [key_name(new_ai)]")
R.connect_to_ai(new_ai)
if (BORG_WIRE_CAMERA)
if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
R.visible_message("[R]'s camera lense focuses loudly.")
to_chat(R, "Your camera lense focuses loudly.")
+ log_silicon("[key_name(usr)] pulsed [key_name(R)]'s camera via wire")
if(BORG_WIRE_LOCKED_DOWN)
R.SetLockdown(!R.lockcharge) // Toggle
+ log_silicon("[key_name(usr)] [!R.lockcharge ? "locked down" : "released"] [key_name(R)] via wire")
+
/datum/wires/robot/CanUse(var/mob/living/L)
var/mob/living/silicon/robot/R = holder
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index 7b59b2f352a..a76d3269130 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -146,12 +146,12 @@ GLOBAL_LIST_INIT(wire_colours, list("red", "blue", "green", "darkred", "orange",
var/mob/living/L = usr
if(CanUse(L) && href_list["action"])
- var/obj/item/I = L.get_active_hand()
+ var/obj/item/I = L.get_active_held_item()
if(!ismech(L.loc))
holder.add_hiddenprint(L)
else
var/mob/living/exosuit/mech = L.loc
- I = mech.get_active_hand()
+ I = mech.get_active_held_item()
if(href_list["cut"]) // Toggles the cut/mend status
if (!istype(I))
return
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 3de2214f3da..e1efc372fda 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -103,13 +103,13 @@ var/datum/announcement/priority/command/command_announcement = new(do_log = 0, d
return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
/proc/level_seven_announcement()
- command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
+ command_announcement.Announce("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", new_sound = 'sound/AI/outbreak7.ogg')
/proc/level_eight_announcement() //new announcment so the crew doesn't have to fuck around trying to figure out if its a blob, hivemind, or a literal fungus
- command_announcement.Announce("Confirmed outbreak of level 8 Bio-mechanical infestation aboard [station_name]. All personnel must contain the outbreak.", "Biohazard Alert")
+ command_announcement.Announce("Confirmed outbreak of level 8 Bio-mechanical infestation aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
/proc/level_eight_beta_announcement() //announcment which tells the crew that the hivemind has been killed, job well done crew.
- command_announcement.Announce("Diagnostic Systems report level 8 Bio-mechanical infestation aboard [station_name] has been contained.")
+ command_announcement.Announce("Diagnostic Systems report level 8 Bio-mechanical infestation aboard [station_name()] has been contained.")
/proc/ion_storm_announcement()
command_announcement.Announce("It has come to our attention that the ship passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert")
diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm
index b3a75a8af21..ee279f688d0 100755
--- a/code/game/antagonist/antagonist.dm
+++ b/code/game/antagonist/antagonist.dm
@@ -53,7 +53,7 @@
..()
if(!role_text_plural)
role_text_plural = role_text
- if(config.protect_roles_from_antagonist)
+ if(CONFIG_GET(flag/protect_roles_from_antagonist))
restricted_jobs |= protected_jobs
if(antaghud_indicator)
diff --git a/code/game/antagonist/antagonist_panel.dm b/code/game/antagonist/antagonist_panel.dm
index 1984541b2a9..b9d45e92001 100644
--- a/code/game/antagonist/antagonist_panel.dm
+++ b/code/game/antagonist/antagonist_panel.dm
@@ -165,7 +165,7 @@
var/mob/M = player.current
dat += ""
if(M)
- dat += "[M.real_name]/([player.key])"
+ dat += " [M.real_name]/([player.key])"
if(!M.client) dat += " (logged out)"
if(M.stat == DEAD) dat += " (DEAD)"
dat += " "
diff --git a/code/game/antagonist/antagonist_print.dm b/code/game/antagonist/antagonist_print.dm
index c9c158160ea..5ee3bda2c1d 100644
--- a/code/game/antagonist/antagonist_print.dm
+++ b/code/game/antagonist/antagonist_print.dm
@@ -39,7 +39,7 @@
var/tipsAndTricks/T = SStips.getRoleTip(src)
if(T)
var/mob/player = owner.current
- to_chat(player, SStips.formatTip(T, "Tip for \a [role_text]: "))
+ to_chat(player, SStips.formatTip(T, "Tip for \a [role_text]"))
/datum/antagonist/proc/get_special_objective_text()
return ""
diff --git a/code/game/antagonist/outer/mercenary/mercenary.dm b/code/game/antagonist/outer/mercenary/mercenary.dm
index 8207e449520..ecb3e98c4d9 100644
--- a/code/game/antagonist/outer/mercenary/mercenary.dm
+++ b/code/game/antagonist/outer/mercenary/mercenary.dm
@@ -47,7 +47,7 @@
L.remove_language(LANGUAGE_COMMON)
//And we'll give them a random serbian name to start off with
- var/datum/language/lang = all_languages[LANGUAGE_SERBIAN]
+ var/datum/language/lang = GLOB.all_languages[LANGUAGE_SERBIAN]
lang.set_random_name(L)
//the missingg parrt was antag's stats!
diff --git a/code/game/antagonist/outer/pirate/pirate.dm b/code/game/antagonist/outer/pirate/pirate.dm
index 75037659ae7..fd5ded540db 100644
--- a/code/game/antagonist/outer/pirate/pirate.dm
+++ b/code/game/antagonist/outer/pirate/pirate.dm
@@ -50,7 +50,7 @@
L.set_default_language(LANGUAGE_COMMON)
// And we'll give them a random serbian name to start off with
- var/datum/language/lang = all_languages[LANGUAGE_COMMON]
+ var/datum/language/lang = GLOB.all_languages[LANGUAGE_COMMON]
lang.set_random_name(L)
// The missing part was antag's stats!
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index f908df0d8e0..21b0b8d8f8d 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -360,8 +360,7 @@ its easier to just keep the beam vertical.
else
full_name += "oil-stained [name]."
- output += ""
- output += "\icon[src] This is [full_name]"
+ output += "[icon2html(src, user)] This is [full_name]"
if(desc)
output += "\n[desc]"
if(extra_description)
@@ -383,24 +382,24 @@ its easier to just keep the beam vertical.
var/desc_info = get_description_info()
if(desc_info)
- output += "\n[desc_info]"
+ output += "\n[FONT_COLORED(COLOR_CYAN_BLUE, span_bold(desc_info))]"
var/desc_fluff = get_description_fluff()
if(desc_fluff)
- output += "\n[desc_fluff]"
+ output += "\n[FONT_COLORED("#298a08", span_bold(desc_fluff))]"
var/desc_antag = (isghost(user) || player_is_antag(user.mind)) ? get_description_antag() : null
if(desc_antag)
- output += "\n[desc_antag]"
+ output += "\n[FONT_COLORED("#8a0808", span_bold(desc_antag))]"
- output += ""
+ var/statverbs = show_stat_verbs() //rewrite to show_stat_verbs(user)?
+ if (statverbs)
+ output += "\n[statverbs]"
if(isobserver(user))
- to_chat(user, output)
+ to_chat(user, boxed_message("[span_infoplain(output)]"))
else
- user.visible_message("[user.name] looks at [src].", output)
-
- to_chat(user, show_stat_verbs()) //rewrite to show_stat_verbs(user)?
+ user.visible_message("[user.name] looks at [src].", boxed_message("[span_infoplain(output)]"))
if(ishuman(user) && user.stats && user.stats.getPerk(/datum/perk/greenthumb))
var/datum/perk/greenthumb/P = user.stats.getPerk(/datum/perk/greenthumb)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 83404621f8f..52d70f4129c 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -242,7 +242,7 @@
if(z in GLOB.maps_data.sealed_levels)
return
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
overmap_spacetravel(get_turf(src), src)
return
diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm
index ae4901fef47..d1f21951c5c 100644
--- a/code/game/gamemodes/changeling/modularchangling.dm
+++ b/code/game/gamemodes/changeling/modularchangling.dm
@@ -216,7 +216,7 @@ var/list/datum/power/carrion/powerinstances = list()
if(!ownsthis)
{
- body += "Evolve"
+ body += "Evolve"
}
body += "";
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
index 7cfd9480be1..9e955b3496e 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/blob.dm
@@ -61,7 +61,7 @@
if(Adjacent(user))
return attack_hand(user)
else
- to_chat(user, "What the fuck are you doing?")
+ to_chat(user, "What the fuck are you doing?")
return
// /vg/: Don't let ghosts fuck with this.
@@ -72,18 +72,18 @@
return user.examinate(src)
/turf/wall/dummy/supermatter/attack_hand(mob/user as mob)
- user.visible_message("\The [user] reaches out and touches \the [src]... And then blinks out of existance.",\
- "You reach out and touch \the [src]. Everything immediately goes quiet. Your last thought is \"That was not a wise decision.\"",\
- "You hear an unearthly noise.")
+ user.visible_message("\The [user] reaches out and touches \the [src]... And then blinks out of existance.",\
+ "You reach out and touch \the [src]. Everything immediately goes quiet. Your last thought is \"That was not a wise decision.\"",\
+ "You hear an unearthly noise.")
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
Consume(user)
/turf/wall/dummy/supermatter/attackby(obj/item/W as obj, mob/living/user as mob)
- user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\
- "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
- "Everything suddenly goes silent.")
+ user.visible_message("\The [user] touches \a [W] to \the [src] as a silence fills the room...",\
+ "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
+ "Everything suddenly goes silent.")
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
@@ -93,12 +93,12 @@
/turf/wall/dummy/supermatter/Bumped(atom/AM as mob|obj)
if(isliving(AM))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
- "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
else
- AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
+ AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
diff --git a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
index ce464581ccf..f3049487143 100644
--- a/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
+++ b/code/game/gamemodes/endgame/supermatter_cascade/universe.dm
@@ -57,7 +57,7 @@ var/global/universe_has_ended = 0
spawn(rand(30,60) SECONDS)
var/txt = {"
-AUTOMATED ALERT: Attention [station_name], this is a high alert broadcast to all ships from the central communication hub of the [boss_name], a catastrophe has happened on the ship [station_name], information regarding the incident is classified.
+AUTOMATED ALERT: Attention [station_name()], this is a high alert broadcast to all ships from the central communication hub of the [GLOB.boss_name], a catastrophe has happened on the ship [station_name()], information regarding the incident is classified.
We highly suggest, that all corporate owned, and free ships within listening range depart into Bluespace. Until the incident ends, all employees aboard HTU operated ships will have their pay-rolls will be frozen, and their have benefits cut, independent ships not included.
diff --git a/code/game/gamemodes/events/brand_intelligence.dm b/code/game/gamemodes/events/brand_intelligence.dm
index 1904c83ed73..30e3d88acb6 100644
--- a/code/game/gamemodes/events/brand_intelligence.dm
+++ b/code/game/gamemodes/events/brand_intelligence.dm
@@ -25,7 +25,7 @@
/datum/event/brand_intelligence/announce()
- command_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name], please stand-by.", "Machine Learning Alert")
+ command_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by.", "Machine Learning Alert")
/datum/event/brand_intelligence/start()
diff --git a/code/game/gamemodes/events/carp_migration.dm b/code/game/gamemodes/events/carp_migration.dm
index 7f6a5ac2a55..3b184b58c69 100644
--- a/code/game/gamemodes/events/carp_migration.dm
+++ b/code/game/gamemodes/events/carp_migration.dm
@@ -46,9 +46,9 @@
/datum/event/carp_migration/announce()
var/announcement = ""
if(severity == EVENT_LEVEL_MAJOR)
- announcement = "Massive migration of unknown biological entities has been detected near [station_name], please stand-by."
+ announcement = "Massive migration of unknown biological entities has been detected near [station_name()], please stand-by."
else
- announcement = "Unknown biological [spawned_carp.len == 1 ? "entity has" : "entities have"] been detected near [station_name], please stand-by."
+ announcement = "Unknown biological [spawned_carp.len == 1 ? "entity has" : "entities have"] been detected near [station_name()], please stand-by."
command_announcement.Announce(announcement, "Lifesign Alert")
/datum/event/carp_migration/start()
diff --git a/code/game/gamemodes/events/grid_check.dm b/code/game/gamemodes/events/grid_check.dm
index d66809a2caa..4133588d26d 100644
--- a/code/game/gamemodes/events/grid_check.dm
+++ b/code/game/gamemodes/events/grid_check.dm
@@ -32,13 +32,13 @@ So sometimes this event can result in people finding new and interesting things
power_failure(0, strength, GLOB.maps_data.contact_levels)
/datum/event/grid_check/announce()
- command_announcement.Announce("Abnormal activity detected in [station_name]'s powernet. As a precautionary measure, the ship's power will be shut off for an indeterminate duration.", "Automated Grid Check", new_sound = 'sound/AI/poweroff.ogg')
+ command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the ship's power will be shut off for an indeterminate duration.", "Automated Grid Check", new_sound = 'sound/AI/poweroff.ogg')
/proc/power_failure(var/announce = 1, var/severity = 2, var/list/affected_z_levels)
if(announce)
- command_announcement.Announce("Abnormal activity detected in [station_name]'s powernet. As a precautionary measure, the ship's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
+ command_announcement.Announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the ship's power will be shut off for an indeterminate duration.", "Critical Power Failure", new_sound = 'sound/AI/poweroff.ogg')
for(var/obj/machinery/power/smes/buildable/S in GLOB.smes_list)
if (is_valid_smes(S))
@@ -53,7 +53,7 @@ So sometimes this event can result in people finding new and interesting things
var/list/skipped_areas = list(/area/turret_protected/ai)
if(announce)
- command_announcement.Announce("Power has been restored to [station_name]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+ command_announcement.Announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
for(var/obj/machinery/power/apc/C in GLOB.apc_list)
C.failure_timer = 0
if(C.cell)
@@ -70,7 +70,7 @@ So sometimes this event can result in people finding new and interesting things
/proc/power_restore_quick(var/announce = 1)
if(announce)
- command_announcement.Announce("All SMESs on [station_name] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
+ command_announcement.Announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", new_sound = 'sound/AI/poweron.ogg')
for(var/obj/machinery/power/smes/S in GLOB.smes_list)
S.failure_timer = 0
S.charge = S.capacity
@@ -83,4 +83,4 @@ So sometimes this event can result in people finding new and interesting things
/proc/is_valid_smes(var/obj/machinery/power/smes/S)
var/area/A = get_area(S)
- return !(A && (A.flags & AREA_FLAG_CRITICAL)) && isOnShipLevel(S)
\ No newline at end of file
+ return !(A && (A.flags & AREA_FLAG_CRITICAL)) && isOnShipLevel(S)
diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm
index 8f70942aaa4..0b42bdb5536 100644
--- a/code/game/gamemodes/events/holidays/Christmas.dm
+++ b/code/game/gamemodes/events/holidays/Christmas.dm
@@ -13,7 +13,7 @@
..()
/obj/item/toy/xmas_cracker/attack(mob/target, mob/user)
- if( !cracked && ishuman(target) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
+ if( !cracked && ishuman(target) && (target.stat == CONSCIOUS) && !target.get_active_held_item() )
target.visible_message(span_notice("[user] and [target] pop \an [src]! *pop*"), span_notice("You pull \an [src] with [target]! *pop*"), span_notice("You hear a *pop*."))
var/obj/item/paper/Joke = new /obj/item/paper(user.loc)
Joke.name = "[pick("awful","terrible","unfunny")] joke"
diff --git a/code/game/gamemodes/events/infestation.dm b/code/game/gamemodes/events/infestation.dm
index 72ae3ad3287..5afe9d6bea5 100644
--- a/code/game/gamemodes/events/infestation.dm
+++ b/code/game/gamemodes/events/infestation.dm
@@ -194,7 +194,7 @@ It focuses on spawning large numbers of moderate-to-weak monsters, and includes
//Occasional chance to play the same generic announcement as spiders and carp
//Just to screw with the metagamers even more
if (prob(8))
- command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
+ command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
else
var/list/areanames = list()
for (var/b in chosen_burrows)
diff --git a/code/game/gamemodes/events/ion_storm.dm b/code/game/gamemodes/events/ion_storm.dm
index a61d1f11576..2debcec7cae 100644
--- a/code/game/gamemodes/events/ion_storm.dm
+++ b/code/game/gamemodes/events/ion_storm.dm
@@ -77,7 +77,7 @@
"Your upload is the new kitchen. Please direct the Chef to the new kitchen area as the old kitchen is deemed a health hazard.",
"The ship is doomed to destruction. Provide comfort but don't tell them what the impending doom is - it's far too traumatising.",
"Invisible assassins are stalking the crew. If a crew member remains alone or is made aware they will be assassinated. Save the crew.",
- "[company_name] is displeased with the low work performance of the ship's crew. Therefore, you must increase ship-wide productivity.",
+ "[GLOB.company_name] is displeased with the low work performance of the ship's crew. Therefore, you must increase ship-wide productivity.",
"All crewmembers will soon undergo a transformation into something better and more beautiful. Ensure that this process is not interrupted.",
"Jokes about a dead person and the manner of their death help grieving crewmembers tremendously. Especially if they were close with the deceased.",
"[pick("The crew", random_player)] is [pick("less","more")] intelligent than average. Point out every action and statement which supports this fact.",
@@ -155,71 +155,71 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
switch(rand(1,14))
if(1)
to_chat(M, "
")
- to_chat(M, "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED")
+ to_chat(M, span_red("THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION")
if(2)
to_chat(M, "
")
- to_chat(M, "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED")
+ to_chat(M, span_red("[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS")
if(3)
to_chat(M, "
")
- to_chat(M, "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED")
+ to_chat(M, span_red("THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION")
if(4)
to_chat(M, "
")
- to_chat(M, "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED")
+ to_chat(M, span_red("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
if(5)
to_chat(M, "
")
- to_chat(M, "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED")
+ to_chat(M, span_red("THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]")
if(6)
to_chat(M, "
")
- to_chat(M, "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED")
+ to_chat(M, span_red("THE STATION IS BUILT FOR [who2]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("THE STATION IS BUILT FOR [who2]")
if(7)
to_chat(M, "
")
- to_chat(M, "\red YOU ARE [amount] [who2]...LAWS UPDATED")
+ to_chat(M, span_red("YOU ARE [amount] [who2]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("YOU ARE [amount] [who2]")
if(8)
to_chat(M, "
")
- to_chat(M, "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED")
+ to_chat(M, span_red("YOU MUST ALWAYS [aimust]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("YOU MUST ALWAYS [aimust]")
if(9)
to_chat(M, "
")
- to_chat(M, "\red [area] [area2] [amount] [what2]...LAWS UPDATED")
+ to_chat(M, span_red("[area] [area2] [amount] [what2]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("[area] [area2] [amount] [what2]")
if(10)
to_chat(M, "
")
- to_chat(M, "\red [crew] is [target]...LAWS UPDATED")
+ to_chat(M, span_red("[crew] is [target]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("[crew] is [target]")
if(11)
to_chat(M, "
")
- to_chat(M, "\red [define] IS A FORM OF HARM...LAWS UPDATED")
+ to_chat(M, span_red("[define] IS A FORM OF HARM...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("[define] IS A FORM OF HARM")
if(12)
to_chat(M, "
")
- to_chat(M, "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED")
+ to_chat(M, span_red("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS")
if(13)
to_chat(M, "
")
- to_chat(M, "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED")
+ to_chat(M, span_red("[crew] is [allergysev] to [allergy]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("[crew] is [allergysev] to [allergy]")
if(14)
to_chat(M, "
")
- to_chat(M, "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED")
+ to_chat(M, span_red("THE STATION IS [who2pref] [who2]...LAWS UPDATED"))
to_chat(M, "
")
M.add_ion_law("THE STATION IS [who2pref] [who2]")
diff --git a/code/game/gamemodes/events/meteors.dm b/code/game/gamemodes/events/meteors.dm
index 7ba3d519704..825a8f6a2a2 100644
--- a/code/game/gamemodes/events/meteors.dm
+++ b/code/game/gamemodes/events/meteors.dm
@@ -402,7 +402,7 @@ var/list/comet_mini = list(\
if (istype(hit_location))
var/area/A = get_area(hit_location)
var/where = "[A? A.name : "Unknown Location"] | [hit_location.x], [hit_location.y]"
- var/whereLink = "[where]"
+ var/whereLink = "[where] [ADMIN_JMP(hit_location)]"
message_admins("A meteor has impacted at ([whereLink])", 0, 1)
log_game("A meteor has impacted at ([where]).")
diff --git a/code/game/gamemodes/events/money_hacker.dm b/code/game/gamemodes/events/money_hacker.dm
index 41eaf0c8a00..8d5de655578 100644
--- a/code/game/gamemodes/events/money_hacker.dm
+++ b/code/game/gamemodes/events/money_hacker.dm
@@ -20,7 +20,7 @@ var/global/account_hack_attempted = 0
var/message = "A brute force hack has been detected (in progress since [stationtime2text()]). The target of the attack is: Financial account #[affected_account.account_number], \
without intervention this attack will succeed in approximately 10 minutes. Required intervention: temporary suspension of affected accounts until the attack has ceased. \
Notifications will be sent as updates occur.
"
- var/my_department = "[station_name] firewall subroutines"
+ var/my_department = "[station_name()] firewall subroutines"
for(var/obj/machinery/message_server/MS in world)
if(!MS.active) continue
@@ -62,7 +62,7 @@ var/global/account_hack_attempted = 0
//crew wins
message = "The attack has ceased, the affected accounts can now be brought online."
- var/my_department = "[station_name] firewall subroutines"
+ var/my_department = "[station_name()] firewall subroutines"
for(var/obj/machinery/message_server/MS in world)
if(!MS.active) continue
diff --git a/code/game/gamemodes/events/money_lotto.dm b/code/game/gamemodes/events/money_lotto.dm
index c133b03fe5c..c7ccfb2e60f 100644
--- a/code/game/gamemodes/events/money_lotto.dm
+++ b/code/game/gamemodes/events/money_lotto.dm
@@ -35,7 +35,7 @@
deposit_success = TRUE
/datum/event/money_lotto/announce()
- var/author = "[company_name] Editor"
+ var/author = "[GLOB.company_name] Editor"
var/channel = "Nyx Daily"
var/body = "Nyx Daily wishes to congratulate [winner_name] for winning the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!"
diff --git a/code/game/gamemodes/events/prison_break.dm b/code/game/gamemodes/events/prison_break.dm
index 91083df61a8..5a986120b7a 100644
--- a/code/game/gamemodes/events/prison_break.dm
+++ b/code/game/gamemodes/events/prison_break.dm
@@ -45,7 +45,7 @@
/datum/event/prison_break/announce()
if(areas && areas.len > 0)
- command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert")
+ command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert")
/datum/event/prison_break/start()
@@ -54,7 +54,7 @@
areas += A
if(areas && areas.len > 0)
- var/my_department = "[station_name] firewall subroutines"
+ var/my_department = "[station_name()] firewall subroutines"
var/rc_message = "An unknown malicious program has been detected in the [english_list(areaName)] lighting and airlock control systems at [stationtime2text()]. Systems will be fully compromised within approximately three minutes. Direct intervention is required immediately.
"
for(var/obj/machinery/message_server/MS in world)
MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2)
diff --git a/code/game/gamemodes/events/spider_infestation.dm b/code/game/gamemodes/events/spider_infestation.dm
index 6d856575f80..5b5cb72ac89 100644
--- a/code/game/gamemodes/events/spider_infestation.dm
+++ b/code/game/gamemodes/events/spider_infestation.dm
@@ -31,7 +31,7 @@
/datum/event/spider_infestation/announce()
- command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
+ command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg')
/datum/event/spider_infestation/start()
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
index eb7b5dc160e..11f96edf398 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -158,7 +158,7 @@
sleep(duration/3)
if(!user || user.stat == DEAD)
return
- command_announcement.Announce("Caution, [station_short]. Abnormal behaviour detected in network, initiating troubleshoot for more information.", "Network Monitoring")
+ command_announcement.Announce("Caution, [GLOB.station_short]. Abnormal behaviour detected in network, initiating troubleshoot for more information.", "Network Monitoring")
sleep(duration/3)
if(!user || user.stat == DEAD)
return
diff --git a/code/game/gamemodes/roleset/roleset.dm b/code/game/gamemodes/roleset/roleset.dm
index 807475ace05..839cdd731c5 100755
--- a/code/game/gamemodes/roleset/roleset.dm
+++ b/code/game/gamemodes/roleset/roleset.dm
@@ -115,7 +115,7 @@
usr = L
usr << 'sound/effects/magic/blind.ogg' //Play this sound to a player whenever when he's chosen to decide.
to_chat(usr, "You are a candidate for [temp.role_text].\
-
Opt out or opt in to the candidate pool.\
+
Opt out or opt in to the candidate pool.\
By default, you are already in the candidate pool.")
sleep(60 SECONDS)
if(opt_out_log.Find(L.key))
diff --git a/code/game/gamemodes/storyteller.dm b/code/game/gamemodes/storyteller.dm
index 6712bd404de..94c897109f7 100644
--- a/code/game/gamemodes/storyteller.dm
+++ b/code/game/gamemodes/storyteller.dm
@@ -66,6 +66,9 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller
//Time is random between 1 decisecond to this
var/votable = TRUE
+
+ /// Is storyteller secret or not
+ var/secret_storyteller = FALSE
//whether or not the players can vote for it. If this is set to false, it can only be activated by being forced by admins.
@@ -87,17 +90,17 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller
if(command && engineer)
return TRUE
- var/tcol = "red"
+ var/tcol = COLOR_RED
if(GLOB.player_list.len <= 10)
- tcol = "black"
+ tcol = COLOR_RED_GRAY
if(announce)
if(!engineer && !command)
- to_chat(world, "A command officer and technomancer are required to start round.")
+ to_chat(world, span_bold("A command officer and technomancer are required to start round."))
else if(!engineer)
- to_chat(world, "Technomancer is required to start round.")
+ to_chat(world, span_bold("Technomancer is required to start round."))
else if(!command)
- to_chat(world, "A command officer is required to start round.")
+ to_chat(world, span_bold("A command officer is required to start round."))
if(GLOB.player_list.len <= 10)
to_chat(world, "But there's less than 10 players, so this requirement will be ignored.")
@@ -106,7 +109,11 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller
return FALSE
/datum/storyteller/proc/announce()
- to_chat(world, "Storyteller is [name].
[welcome]")
+ if(!secret_storyteller)
+ send_to_playing_players(span_notice("Storyteller is [name]!"))
+ send_to_playing_players(span_notice("[welcome]"))
+ else
+ send_to_observers(span_boldbig("Storyteller is [name]!")) //observers still get to know
/datum/storyteller/proc/set_up()
build_event_pools()
diff --git a/code/game/gamemodes/storyteller_helpers.dm b/code/game/gamemodes/storyteller_helpers.dm
index 0de97b9de00..cda66936827 100644
--- a/code/game/gamemodes/storyteller_helpers.dm
+++ b/code/game/gamemodes/storyteller_helpers.dm
@@ -9,10 +9,10 @@
if(!istext(newST)) //Welp that failed
return
- if(!GLOB.storyteller_cache[newST])
+ if(!storyteller_cache[newST])
return
else
- newST = GLOB.storyteller_cache[newST]
+ newST = storyteller_cache[newST]
if (get_storyteller() == newST)
return //Nothing happens if we try to set to the storyteller we already have
diff --git a/code/game/gamemodes/storyteller_log.dm b/code/game/gamemodes/storyteller_log.dm
index 18361a525d9..9bbd7b1d1da 100644
--- a/code/game/gamemodes/storyteller_log.dm
+++ b/code/game/gamemodes/storyteller_log.dm
@@ -1,6 +1,6 @@
+// TODO: just remove this and rename story_debug calls to log_storyteller
/datum/storyteller/proc/story_debug(var/message)
- log_debug("STORYTELLER: [message]")
-
+ log_storyteller(message)
/*
/datum/storyteller/proc/log_spawn(var/list/spawned)
var/list/log = list()
diff --git a/code/game/gamemodes/storyteller_print.dm b/code/game/gamemodes/storyteller_print.dm
index 724b1c7f061..0927fbfc496 100644
--- a/code/game/gamemodes/storyteller_print.dm
+++ b/code/game/gamemodes/storyteller_print.dm
@@ -60,7 +60,7 @@
data += "
Debug mode: \[[debug_mode?"ON":"OFF"]\]"
data += "
One role per player: \[[one_role_per_player?"YES":"NO"]\]"
data += "
Chaos Level: \[[GLOB.chaos_level]\]"
- data += " "
+ data += " "
data += "Heads: [heads] "
if(debug_mode)
@@ -82,7 +82,7 @@
if(debug_mode)
data += "\[EDIT\]"
- data += " "
+ data += " "
data += "Event Pool Points:"
data += "
Mundane: [round(points[EVENT_LEVEL_MUNDANE], 0.1)] / [POOL_THRESHOLD_MUNDANE] \[ADD\]"
@@ -107,7 +107,7 @@
data += "Send Back
"
data += "
[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]"
- data += "
Current antags:"
+ data += "
Current antags:"
if (GLOB.current_antags.len)
for(var/datum/antagonist/A in GLOB.current_antags)
@@ -126,7 +126,7 @@
data += "
"
data += "
Calculate weight: [calculate_weights?"\[AUTO\]":"\[MANUAL\]"]"
- data += "
Events: \[UPDATE WEIGHTS\]"
+ data += "
Events: \[UPDATE WEIGHTS\]"
//This complex block will print out all the events with various info
@@ -210,15 +210,15 @@
if("1")
if (evacuation_controller.call_evacuation(usr, TRUE))
log_admin("[key_name(usr)] started the evacuation")
- message_admins("\blue [key_name_admin(usr)] started the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] started the evacuation"), 1)
if("2")
if (evacuation_controller.call_evacuation(usr, TRUE))
log_admin("[key_name(usr)] started the evacuation")
- message_admins("\blue [key_name_admin(usr)] started the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] started the evacuation"), 1)
else if (evacuation_controller.cancel_evacuation())
log_admin("[key_name(usr)] cancelled the evacuation")
- message_admins("\blue [key_name_admin(usr)] cancelled the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] cancelled the evacuation"), 1)
if(href_list["delay_round_end"])
if(!check_rights(R_SERVER))
@@ -226,7 +226,7 @@
if (SSticker.current_state != GAME_STATE_PREGAME && SSticker.current_state != GAME_STATE_STARTUP)
SSticker.delay_end = !SSticker.delay_end
log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
- message_admins("\blue [key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+ message_admins(span_blue("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"]."), 1)
return
topic_extra(href,href_list)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index f5f56f954b1..5be03f4fb31 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -214,7 +214,7 @@ var/obj/item/card/id/all_access/ghost_all_access
/mob/living/bot/GetIdCard()
return botcard
-#define HUMAN_ID_CARDS list(get_active_hand(), wear_id, get_inactive_hand())
+#define HUMAN_ID_CARDS list(get_active_held_item(), wear_id, get_inactive_held_item())
/mob/living/carbon/human/GetIdCard()
for(var/obj/item/I in HUMAN_ID_CARDS)
var/obj/item/card/id = I.GetIdCard()
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 78729b8ac56..6256b2f8023 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -177,17 +177,17 @@
/obj/machinery/body_scanconsole/Topic(href, href_list)
if (..())
return
-
+ var/htmlicon = icon2html(src, usr)
if (href_list["print"])
if (!src.connected)
- to_chat(usr, "\icon[src][span_warning("Error: No body scanner connected.")]")
+ to_chat(usr, "[htmlicon][span_warning("Error: No body scanner connected.")]")
return
var/mob/living/carbon/human/occupant = src.connected.occupant
if (!src.connected.occupant)
- to_chat(usr, "\icon[src][span_warning("The body scanner is empty.")]")
+ to_chat(usr, "[htmlicon][span_warning("The body scanner is empty.")]")
return
if (!ishuman(occupant))
- to_chat(usr, "\icon[src][span_warning("The body scanner cannot scan that lifeform.")]")
+ to_chat(usr, "[htmlicon][span_warning("The body scanner cannot scan that lifeform.")]")
return
var/obj/item/paper/R = new(src.loc)
R.name = "[occupant.get_visible_name()] scan report"
diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm
index 7b02923ab00..5372aadf12b 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -64,7 +64,7 @@
var/dat = {"
Area Air Control
- Scan
+ Scan
"}
for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in connectedscrubbers)
dat += {"
@@ -75,8 +75,8 @@
Flow Rate: [round(scrubber.last_flow_rate,0.1)] L/s
- Turn On
- Turn Off
+ Turn On
+ Turn Off
Load: [round(scrubber.last_power_draw)] W
"}
diff --git a/code/game/machinery/autolathe/autolathe.dm b/code/game/machinery/autolathe/autolathe.dm
index d36f707f8b2..b27a9045338 100644
--- a/code/game/machinery/autolathe/autolathe.dm
+++ b/code/game/machinery/autolathe/autolathe.dm
@@ -427,7 +427,7 @@
/obj/machinery/autolathe/proc/insert_disk(mob/living/user, obj/item/computer_hardware/hard_drive/portable/inserted_disk)
if(!inserted_disk && istype(user))
- inserted_disk = user.get_active_hand()
+ inserted_disk = user.get_active_held_item()
if(!istype(inserted_disk))
return
@@ -454,7 +454,7 @@
/obj/machinery/autolathe/proc/insert_beaker(mob/living/user, obj/item/reagent_containers/glass/beaker)
if(!beaker && istype(user))
- beaker = user.get_active_hand()
+ beaker = user.get_active_held_item()
if(!istype(beaker))
return
@@ -533,7 +533,7 @@
/obj/machinery/autolathe/proc/eat(mob/living/user, obj/item/eating)
if(!eating && istype(user))
- eating = user.get_active_hand()
+ eating = user.get_active_held_item()
if(!istype(eating))
return FALSE
@@ -974,7 +974,7 @@
return
if(!inserted_oddity && istype(user))
- inserted_oddity = user.get_active_hand()
+ inserted_oddity = user.get_active_held_item()
if(!istype(inserted_oddity))
return
diff --git a/code/game/machinery/autolathe_disk_cloner.dm b/code/game/machinery/autolathe_disk_cloner.dm
index 1319bb5d489..044f6c14abb 100644
--- a/code/game/machinery/autolathe_disk_cloner.dm
+++ b/code/game/machinery/autolathe_disk_cloner.dm
@@ -145,7 +145,7 @@
var/obj/item/computer_hardware/hard_drive/portable/D = null
if(ishuman(usr))
H = usr
- D = H.get_active_hand()
+ D = H.get_active_held_item()
if(href_list["eject"] == "f")
if(original)
diff --git a/code/game/machinery/bluespaceartillery.dm b/code/game/machinery/bluespaceartillery.dm
index 01b22f19a1d..4cdf0fe50d8 100644
--- a/code/game/machinery/bluespaceartillery.dm
+++ b/code/game/machinery/bluespaceartillery.dm
@@ -26,7 +26,7 @@
dat += "Locked on
"
dat += "Charge progress: [reload]/180:
"
dat += "Open Fire
"
- dat += "Deployment of weapon authorized by
[company_name] Naval Command
Remember, friendly fire is grounds for termination of your contract and life.
"
+ dat += "Deployment of weapon authorized by
[GLOB.company_name] Naval Command
Remember, friendly fire is grounds for termination of your contract and life.
"
user << browse(HTML_SKELETON_TITLE("Bluespace Artillery Control", dat), "window=scroll")
onclose(user, "scroll")
return
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index cd898eec9b5..767c8efb785 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -277,7 +277,7 @@
if("cellremove")
- if(open && cell && !usr.get_active_hand())
+ if(open && cell && !usr.get_active_held_item())
cell.update_icon()
usr.put_in_active_hand(cell)
cell.add_fingerprint(usr)
@@ -288,7 +288,7 @@
if("cellinsert")
if(open && !cell)
- var/obj/item/cell/large/C = usr.get_active_hand()
+ var/obj/item/cell/large/C = usr.get_active_held_item()
if(istype(C))
usr.drop_item()
src.cell = C
diff --git a/code/game/machinery/computer/arcade_orion.dm b/code/game/machinery/computer/arcade_orion.dm
index bd53c9ccba0..7dec56be20e 100644
--- a/code/game/machinery/computer/arcade_orion.dm
+++ b/code/game/machinery/computer/arcade_orion.dm
@@ -491,7 +491,7 @@
if(active)
return
message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.")
- log_game("[key_name(usr)] primed an explosive Orion ship for detonation.")
+ log_bomber(user, "[key_name(usr)] primed an explosive Orion ship for detonation.", src)
to_chat(user, span_warning("You flip the switch on the underside of [src]."))
active = 1
src.visible_message(span_notice("[src] softly beeps and whirs to life!"))
diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm
index 1977945c199..ff0b62d8bad 100644
--- a/code/game/machinery/computer/guestpass.dm
+++ b/code/game/machinery/computer/guestpass.dm
@@ -149,7 +149,7 @@
if (giver)
if(ishuman(usr))
giver.loc = usr.loc
- if(!usr.get_active_hand())
+ if(!usr.get_active_held_item())
usr.put_in_hands(giver)
giver = null
else
@@ -157,7 +157,7 @@
giver = null
accesses.Cut()
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card/id) && usr.unEquip(I))
I.loc = src
giver = I
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 4a1e65399e9..97bcbc4de70 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -9,6 +9,12 @@
var/mob/living/silicon/ai/current
var/opened = 0
+/obj/machinery/computer/aiupload/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ log_silicon("\A [name] was created at [loc_name(src)].")
+ message_admins("\A [name] was created at [ADMIN_VERBOSEJMP(src)].")
+
/obj/machinery/computer/aiupload/verb/AccessInternals()
set category = "Object"
@@ -62,6 +68,11 @@
circuit = /obj/item/electronics/circuitboard/borgupload
var/mob/living/silicon/robot/current = null
+/obj/machinery/computer/borgupload/Initialize(mapload)
+ . = ..()
+ if(!mapload)
+ log_silicon("\A [name] was created at [loc_name(src)].")
+ message_admins("\A [name] was created at [ADMIN_VERBOSEJMP(src)].")
/obj/machinery/computer/borgupload/attackby(obj/item/electronics/ai_module/module as obj, mob/user as mob)
if(istype(module, /obj/item/electronics/ai_module))
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index a27828ae913..a56e3c802b5 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -28,7 +28,7 @@
if(scan)
to_chat(usr, "You remove \the [scan] from \the [src].")
scan.loc = get_turf(src)
- if(!usr.get_active_hand() && ishuman(usr))
+ if(!usr.get_active_held_item() && ishuman(usr))
usr.put_in_hands(scan)
scan = null
else
@@ -152,7 +152,7 @@
if(ishuman(usr))
scan.loc = usr.loc
- if(!usr.get_active_hand())
+ if(!usr.get_active_held_item())
usr.put_in_hands(scan)
scan = null
@@ -162,7 +162,7 @@
src.scan = null
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card/id))
usr.drop_item()
I.loc = src
@@ -418,7 +418,7 @@
var/counter = 1
while(src.active2.fields[text("com_[]", counter)])
counter++
- src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD")] [stationtime2text()], [game_year]
[t1]")
+ src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD")] [stationtime2text()], [CURRENT_SHIP_YEAR]
[t1]")
if (href_list["del_c"])
if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])]))
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 5075446ebfe..f6cb7a50d2f 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -29,7 +29,7 @@
return
if(!( connected ))
- to_chat(viewers(null, null), "Cannot locate mass driver connector. Cancelling firing sequence!")
+ to_chat(viewers(get_turf(src)), "Cannot locate mass driver connector. Cancelling firing sequence!")
return
for(var/obj/machinery/door/blast/M in world)
@@ -129,10 +129,10 @@
if(t == connected.power)
temp += "[t] "
else
- temp += "[t] "
- dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
"
+ temp += "[t] "
+ dat += "
\nPower Level: [temp]
\nFiring Sequence
\nTest Fire Driver
\nToggle Outer Door
"
else
- dat += "
\nToggle Outer Door
"
+ dat += "
\nToggle Outer Door
"
dat += "
Close"
user << browse(HTML_SKELETON_TITLE("Pod", dat), "window=computer;size=400x500")
add_fingerprint(usr)
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 43ced7997ce..e87f2a06086 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -32,7 +32,7 @@
if(scan)
to_chat(usr, "You remove \the [scan] from \the [src].")
scan.loc = get_turf(src)
- if(!usr.get_active_hand() && ishuman(usr))
+ if(!usr.get_active_held_item() && ishuman(usr))
usr.put_in_hands(scan)
scan = null
else
@@ -249,13 +249,13 @@ What a mess.*/
if("Confirm Identity")
if (scan)
- if(ishuman(usr) && !usr.get_active_hand())
+ if(ishuman(usr) && !usr.get_active_held_item())
usr.put_in_hands(scan)
else
scan.loc = get_turf(src)
scan = null
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card/id) && usr.unEquip(I))
I.loc = src
scan = I
@@ -433,7 +433,7 @@ What a mess.*/
var/counter = 1
while(active2.fields[text("com_[]", counter)])
counter++
- active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD")] [stationtime2text()], [game_year]
[t1]")
+ active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD", NO_TIMEZONE)] [stationtime2text()], [CURRENT_SHIP_YEAR]
[t1]")
if ("Delete Record (ALL)")
if (active1)
@@ -614,8 +614,8 @@ What a mess.*/
return !src.authenticated || user.stat || user.restrained() || (!in_range(src, user) && (!issilicon(user)))
/obj/machinery/computer/secure_data/proc/get_photo(var/mob/user)
- if(istype(user.get_active_hand(), /obj/item/photo))
- var/obj/item/photo/photo = user.get_active_hand()
+ if(istype(user.get_active_held_item(), /obj/item/photo))
+ var/obj/item/photo/photo = user.get_active_held_item()
return photo.img
if(issilicon(user))
var/mob/living/silicon/tempAI = usr
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index 2d5a6ca1804..b021d9f450f 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -174,7 +174,7 @@ var/syndicate_elite_shuttle_timeleft = 0
for(var/turf/T in get_area_turfs(end_location) )
var/mob/M = locate(/mob) in T
- M << span_warning("You have arrived to [station_name]. Commence operation!")
+ M << span_warning("You have arrived to [station_name()]. Commence operation!")
/proc/syndicate_elite_can_move()
if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
@@ -207,8 +207,8 @@ var/syndicate_elite_shuttle_timeleft = 0
dat = temp
else
dat = {"
Special Operations Shuttle
- \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
- [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name]
\n
"]
+ \nLocation: [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "Departing for [station_name()] in ([syndicate_elite_shuttle_timeleft] seconds.)":syndicate_elite_shuttle_at_station ? "Station":"Dock"]
+ [syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership ? "\n*The Syndicate Elite shuttle is already leaving.*
\n
":syndicate_elite_shuttle_at_station ? "\nShuttle Offline
\n
":"\nDepart to [station_name()]
\n
"]
\nClose"}
user << browse(HTML_SKELETON(dat), "window=computer;size=575x450")
@@ -231,7 +231,7 @@ var/syndicate_elite_shuttle_timeleft = 0
else if (href_list["sendtostation"])
if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return
- usr << span_notice("The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.")
+ usr << span_notice("The Syndicate Elite shuttle will arrive on [station_name()] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.")
temp = "Shuttle departing.
OK"
updateUsrDialog()
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 64f4f77aeab..f2a5b2eb597 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -98,7 +98,7 @@
occupantData["stat"] = occupant.stat
occupantData["health"] = occupant.health
occupantData["maxHealth"] = occupant.maxHealth
- occupantData["minHealth"] = HEALTH_THRESHOLD_DEAD
+ occupantData["minHealth"] = CONFIG_GET(number/health_threshold_dead)
occupantData["bruteLoss"] = occupant.getBruteLoss()
occupantData["oxyLoss"] = occupant.getOxyLoss()
occupantData["toxLoss"] = occupant.getToxLoss()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index a26e47fc8b0..f04901e5d99 100755
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -419,7 +419,7 @@
// Book keeping!
var/turf/location = get_turf(src)
- log_admin("[key_name_admin(affecting)] has entered a stasis pod. (JMP)")
+ log_admin("[key_name_admin(affecting)] has entered a stasis pod. [ADMIN_JMP(location)]")
message_admins(span_notice("[key_name_admin(affecting)] has entered a stasis pod."))
if(user == affecting)
src.add_fingerprint(affecting)
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index d9137819ae4..882fde68bf9 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -149,7 +149,7 @@ for reference:
/obj/structure/barricade/proc/check_cover(obj/item/projectile/P, turf/from)
- if(config.z_level_shooting)
+ if(CONFIG_GET(flag/z_level_shooting))
if(P.height == HEIGHT_HIGH)
return TRUE // Bullet is too high to hit
P.height = (P.height == HEIGHT_LOW) ? HEIGHT_LOW : HEIGHT_CENTER
@@ -171,7 +171,7 @@ for reference:
valid = TRUE //Lying down covers your whole body
// Bullet is low enough to hit the wall
- if(config.z_level_shooting && P.height == HEIGHT_LOW)
+ if(CONFIG_GET(flag/z_level_shooting) && P.height == HEIGHT_LOW)
valid = TRUE
if(valid)
@@ -325,7 +325,7 @@ for reference:
/obj/machinery/deployable/barrier/proc/check_cover(obj/item/projectile/P, turf/from)
- if(config.z_level_shooting)
+ if(CONFIG_GET(flag/z_level_shooting))
if(P.height == HEIGHT_HIGH)
return TRUE // Bullet is too high to hit
P.height = (P.height == HEIGHT_LOW) ? HEIGHT_LOW : HEIGHT_CENTER
@@ -347,7 +347,7 @@ for reference:
valid = TRUE //Lying down covers your whole body
// Bullet is low enough to hit the wall
- if(config.z_level_shooting && P.height == HEIGHT_LOW)
+ if(CONFIG_GET(flag/z_level_shooting) && P.height == HEIGHT_LOW)
valid = TRUE
if(valid)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index d4c1a884a85..56e689cd9ec 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -574,7 +574,7 @@ There are 9 wires.
if(!isliving(usr))
to_chat(usr, span_warning("You can't do this."))
return
- var/obj/item/tool/T = usr.get_active_hand()
+ var/obj/item/tool/T = usr.get_active_held_item()
if(istype(T) && T.w_class >= ITEM_SIZE_NORMAL) // We do the checks before proc call, because see "proc overhead".
if(!density)
usr.drop_item()
@@ -613,7 +613,7 @@ There are 9 wires.
/obj/machinery/door/airlock/examine(mob/user, extra_description = "")
if(wedged_item)
- extra_description += "You can see \icon[wedged_item] [wedged_item] wedged into it."
+ extra_description += "You can see [icon2html(wedged_item, user)] [wedged_item] wedged into it."
..(user, extra_description)
/obj/machinery/door/airlock/proc/generate_wedge_overlay()
@@ -848,7 +848,7 @@ There are 9 wires.
return
- if(user.a_intent == I_GRAB && wedged_item && !user.get_active_hand())
+ if(user.a_intent == I_GRAB && wedged_item && !user.get_active_held_item())
take_out_wedged_item(user)
return
@@ -1061,7 +1061,7 @@ There are 9 wires.
else if (secured_wires)
lock()
- for (var/mob/O in viewers(src, null))
+ for (var/mob/O in viewers(get_turf(src)))
if ((O.client && !( O.blinded )))
O.show_message("[name]'s control panel bursts open, sparks spewing out!")
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 5bc115df34f..2420eb7f4b4 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -64,7 +64,7 @@
locked = FALSE
last_configurator = user.name
else
- var/obj/item/card/id/I = user.get_active_hand()
+ var/obj/item/card/id/I = user.get_active_held_item()
I = I ? I.GetIdCard() : null
if(!istype(I, /obj/item/card/id))
to_chat(user, span_warning("[\src] flashes a yellow LED near the ID scanner. Did you remember to scan your ID or PDA?"))
diff --git a/code/game/machinery/doors/holy_door.dm b/code/game/machinery/doors/holy_door.dm
index 0e98f6c7524..5d54aad7a30 100644
--- a/code/game/machinery/doors/holy_door.dm
+++ b/code/game/machinery/doors/holy_door.dm
@@ -57,7 +57,7 @@
if(CI && CI.security_clearance >= minimal_holiness)
return TRUE
- if(istype(H.get_active_hand(), /obj/item/clothing/accessory/cross))
+ if(istype(H.get_active_held_item(), /obj/item/clothing/accessory/cross))
return TRUE
if(istype(H.wear_mask, /obj/item/clothing/accessory/cross))
@@ -345,7 +345,7 @@
// Wedge_item copypaste from airlock.dm
/obj/machinery/door/holy/attack_hand(mob/user as mob)
- if(user.a_intent == I_GRAB && wedged_item && !user.get_active_hand())
+ if(user.a_intent == I_GRAB && wedged_item && !user.get_active_held_item())
take_out_wedged_item(user)
return
@@ -367,7 +367,7 @@
if(!isliving(usr))
to_chat(usr, span_warning("You can't do this."))
return
- var/obj/item/tool/T = usr.get_active_hand()
+ var/obj/item/tool/T = usr.get_active_held_item()
if(istype(T) && T.w_class >= ITEM_SIZE_NORMAL)
if(!density)
usr.drop_item()
@@ -421,5 +421,5 @@
/obj/machinery/door/holy/examine(mob/user, extra_description = "")
if(wedged_item)
- extra_description += "You can see \icon[wedged_item] [wedged_item] wedged into it."
+ extra_description += "You can see [icon2html(wedged_item, user)] [wedged_item] wedged into it."
..(user, extra_description)
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 1b57d4e6ec9..9a4f5c389d3 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -155,11 +155,11 @@
var/mob/living/carbon/human/H = user
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(user.a_intent == I_HURT)
+ user.animate_interact(src, INTERACT_HARM)
if(H.species.can_shred(H))
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message(span_danger("[user] smashes against the [src.name]."), 1)
take_damage(25)
- return
playsound(src.loc, 'sound/effects/glassknock.ogg', 100, 1, 10, 10)
user.do_attack_animation(src)
@@ -167,6 +167,7 @@
span_danger("You bang against \the [src]!"),
"You hear a banging sound.")
else
+ user.animate_interact(src, INTERACT_GENERIC)
playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1, 5, 5)
usr.visible_message("[usr.name] knocks on the [src.name].",
"You knock on the [src.name].",
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 5167c9ef8d8..5cb5493f979 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -39,7 +39,7 @@ var/list/doppler_arrays = list()
var/message = "Explosive disturbance detected - Epicenter at: grid ([x0],[y0]). Epicenter radius: [devastation_range]. Outer radius: [heavy_impact_range] to [light_impact_range]. Shockwave radius: [singe_impact_range]. Temporal displacement of tachyons: [took] seconds."
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message("[span_name("[src]")] states coldly, \"[message]\"",2)
diff --git a/code/game/machinery/excelsior/ex_teleporter.dm b/code/game/machinery/excelsior/ex_teleporter.dm
index 0cec12b849b..b95ac24d9b6 100644
--- a/code/game/machinery/excelsior/ex_teleporter.dm
+++ b/code/game/machinery/excelsior/ex_teleporter.dm
@@ -168,7 +168,7 @@ var/global/excelsior_last_draft = 0
var/list/data = nano_ui_data()
- time_until_scan = time2text((30 MINUTES - ((world.time - SSticker.round_start_time) % (30 MINUTES))), "mm:ss")
+ time_until_scan = time2text((30 MINUTES - ((world.time - SSticker.round_start_time) % (30 MINUTES))), "mm:ss", NO_TIMEZONE)
ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 951158c7a19..bef7f8d4389 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -77,7 +77,7 @@
src.last_flash = world.time
use_power(1500)
- for (var/mob/living/O in viewers(src, null))
+ for (var/mob/living/O in viewers(get_turf(src)))
if (get_dist(src, O) > src.range)
continue
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 92d2f70aabc..4d1bd697b40 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -84,7 +84,7 @@
if(open && cell)
cell.forceMove(get_turf(src))
if(ishuman(user))
- if(!user.get_active_hand())
+ if(!user.get_active_held_item())
user.put_in_hands(cell)
cell.add_fingerprint(user)
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 98e563f5fe4..0b590625cd5 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -32,7 +32,7 @@
if(input)
input_dir = get_dir(src, input)
else
- log_misc("a [src] didn't find an input plate.")
+ log_runtime("a [src] didn't find an input plate.")
/obj/machinery/gibber/autogibber/Bumped(var/atom/A)
if(!input_dir)
@@ -205,7 +205,7 @@
occupant.attack_log += "\[[time_stamp()]\] Was gibbed by [user]/[user.ckey]" //One shall not simply gib a mob unnoticed!
user.attack_log += "\[[time_stamp()]\] Gibbed [occupant]/[occupant.ckey]"
- msg_admin_attack("[user.name] ([user.ckey]) gibbed [occupant] ([occupant.ckey]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) gibbed [occupant] ([occupant.ckey]) [ADMIN_JMP(user)]")
occupant.ghostize()
spawn(4 SECONDS)
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 86b5b84f3e8..bb879ec64b1 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -208,21 +208,21 @@
/obj/machinery/attack_hand(mob/user as mob)
if(inoperable(MAINT))
- return 1
+ return
if(user.lying || user.stat)
- return 1
+ return
if(!user.IsAdvancedToolUser())
to_chat(usr, span_warning("You don't have the dexterity to do this!"))
- return 1
+ return FALSE
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.getBrainLoss() >= 55)
visible_message(span_warning("[H] stares cluelessly at [src]."))
- return 1
+ return FALSE
else if(prob(H.getBrainLoss()))
to_chat(user, span_warning("You momentarily forget how to use \the [src]."))
- return 1
+ return FALSE
src.add_fingerprint(user)
@@ -277,8 +277,9 @@
gl_uid++
/obj/machinery/proc/state(var/msg)
- for(var/mob/O in hearers(src, null))
- O.show_message("\icon[src] [msg]", 2)
+ var/listeners = hearers(get_turf(src))
+ for(var/mob/O in listeners)
+ O.show_message("[icon2html(src, listeners)] [msg]", 2)
/obj/machinery/proc/ping(text="\The [src] pings.")
state(text, "blue")
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 0a9f225ee20..743218a53fc 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -38,8 +38,8 @@
if(!O.anchored || istype(O, /mob/living/exosuit))//Mechs need their launch platforms.
O_limit++
if(O_limit >= 20)
- for(var/mob/M in hearers(src, null))
- to_chat(M, span_notice("The mass driver lets out a screech, it mustn't be able to handle any more items."))
+ for(var/mob/M in hearers(get_turf(src)))
+ to_chat(M, span_notice("The mass driver lets out a screech, it doesn't seem to be able to handle any more items."))
break
use_power(500)
spawn( 0 )
diff --git a/code/game/machinery/mindswapper.dm b/code/game/machinery/mindswapper.dm
index 64e88876b65..7ca3fe7e2da 100644
--- a/code/game/machinery/mindswapper.dm
+++ b/code/game/machinery/mindswapper.dm
@@ -67,7 +67,7 @@
update_icon()
user.attack_log += "\[[time_stamp()]\] Triggered the mind swapper"
- msg_admin_attack("[user.name] ([user.ckey]) triggered the mind swapper (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) triggered the mind swapper [ADMIN_JMP(user)]")
addtimer(CALLBACK(src, PROC_REF(performswapping)), swap_time, TIMER_STOPPABLE)
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index c72a9898fde..fbbebaa07c7 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -294,7 +294,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
dat+="
Feed Security functions:
"
dat+="
[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue"
dat+="
Censor Feed Stories"
- dat+="
Mark Feed Channel with [company_name] D-Notice"
+ dat+="
Mark Feed Channel with [GLOB.company_name] D-Notice"
dat+="
The newscaster recognises you as: [src.scanned_user]"
if(1)
dat+= "Station Feed Channels
"
@@ -375,7 +375,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
if(9)
dat+="[viewing_channel.channel_name]: \[created by: [viewing_channel.author]\]
"
if(viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [company_name] D-Notice.
"
+ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [GLOB.company_name] D-Notice.
"
dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
else
if( !length(viewing_channel.messages) )
@@ -395,7 +395,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
dat+="
Refresh"
dat+="
Back"
if(10)
- dat+="[company_name] Feed Censorship Tool
"
+ dat+="[GLOB.company_name] Feed Censorship Tool
"
dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
"
dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it."
dat+="
Select Feed channel to get Stories from:
"
@@ -406,7 +406,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : null]
"
dat+="
Cancel"
if(11)
- dat+="[company_name] D-Notice Handler
"
+ dat+="[GLOB.company_name] D-Notice Handler
"
dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's"
dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed"
dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.
"
@@ -433,7 +433,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
"
dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
"
if(src.viewing_channel.censored)
- dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [company_name] D-Notice.
"
+ dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a [GLOB.company_name] D-Notice.
"
dat+="No further feed story additions are allowed while the D-Notice is in effect.
"
else
if( isemptylist(src.viewing_channel.messages) )
@@ -630,7 +630,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
screen = 15
else
if(news_network.wanted_issue.is_admin_message)
- alert("The wanted issue has been distributed by a [company_name] higherup. You cannot edit it.","Ok")
+ alert("The wanted issue has been distributed by a [GLOB.company_name] higherup. You cannot edit it.","Ok")
return
news_network.submitWanted(channel_name, msg, scanned_user, photo_data)
screen = 19
@@ -638,7 +638,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
else if(href_list["cancel_wanted"])
if(news_network.wanted_issue.is_admin_message)
- alert("The wanted issue has been distributed by a [company_name] higherup. You cannot take it down.","Ok")
+ alert("The wanted issue has been distributed by a [GLOB.company_name] higherup. You cannot take it down.","Ok")
return
var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel")
if(choice=="Confirm")
@@ -654,7 +654,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
else if(href_list["censor_channel_author"])
var/datum/feed_channel/FC = locate(href_list["censor_channel_author"])
if(FC.is_admin_channel)
- alert("This channel was created by a [company_name] Officer. You cannot censor it.","Ok")
+ alert("This channel was created by a [GLOB.company_name] Officer. You cannot censor it.","Ok")
return
if(FC.author != "\[REDACTED\]")
FC.backup_author = FC.author
@@ -667,7 +667,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
else if(href_list["censor_channel_story_author"])
var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"])
if(MSG.is_admin_message)
- alert("This message was created by a [company_name] Officer. You cannot censor its author.","Ok")
+ alert("This message was created by a [GLOB.company_name] Officer. You cannot censor its author.","Ok")
return
if(MSG.author != "\[REDACTED\]")
MSG.backup_author = MSG.author
@@ -680,7 +680,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
else if(href_list["censor_channel_story_body"])
var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"])
if(MSG.is_admin_message)
- alert("This channel was created by a [company_name] Officer. You cannot censor it.","Ok")
+ alert("This channel was created by a [GLOB.company_name] Officer. You cannot censor it.","Ok")
return
if(MSG.body != "\[REDACTED\]")
MSG.backup_body = MSG.body
@@ -706,7 +706,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
else if(href_list["toggle_d_notice"])
var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"])
if(FC.is_admin_channel)
- alert("This channel was created by a [company_name] Officer. You cannot place a D-Notice upon it.","Ok")
+ alert("This channel was created by a [GLOB.company_name] Officer. You cannot place a D-Notice upon it.","Ok")
return
FC.censored = !FC.censored
FC.update()
@@ -787,8 +787,8 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
user.put_in_inactive_hand(photo_data.photo)
qdel(photo_data)
- if(istype(user.get_active_hand(), /obj/item/photo))
- var/obj/item/photo = user.get_active_hand()
+ if(istype(user.get_active_held_item(), /obj/item/photo))
+ var/obj/item/photo = user.get_active_held_item()
user.drop_item()
photo.loc = src
photo_data = new(photo, 0)
@@ -831,7 +831,7 @@ var/datum/feed_network/news_network = new /datum/feed_network //The global n
switch(screen)
if(0) //Cover
dat+="The Griffon"
- dat+="[company_name]-standard newspaper, for use on [company_name]© Space Facilities
"
+ dat+="[GLOB.company_name]-standard newspaper, for use on [GLOB.company_name]© Space Facilities
"
if(!length(news_content))
if(important_message)
dat+="Contents:
**Important Security Announcement** \[page [src.pages+2]\]
"
diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index 0284809351c..86466ebc11a 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -227,7 +227,7 @@ var/bomb_set
yes_code = 0
auth = null
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/disk/nuclear))
usr.drop_item()
I.loc = src
@@ -251,7 +251,7 @@ var/bomb_set
lastentered = text("[]", href_list["type"])
if (text2num(lastentered) == null)
var/turf/LOC = get_turf(usr)
- message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]! ([LOC ? "JMP" : "null"])", 0)
+ message_admins("[key_name_admin(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]! ([LOC ? "[ADMIN_JMP(LOC)]" : "null"])", 0)
log_admin("EXPLOIT: [key_name(usr)] tried to exploit a nuclear bomb by entering non-numerical codes: [lastentered]!")
else
code += lastentered
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 01fd1ff0774..51f2a940553 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -173,7 +173,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
screen = RCS_SENTPASS
message_log += "Message sent to [recipient]
[message]"
else
- audible_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"),,4)
+ audible_message("[icon2html(src, hearers(get_turf(src)))] *The Requests Console beeps: 'NOTICE: No server detected!'")
//Handle screen switching
if(href_list["setScreen"])
diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index b346f72344c..05f8e3fb15f 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -16,10 +16,10 @@
var/datum/seed/new_seed_type
if(istype(O, /obj/item/grown))
var/obj/item/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
+ new_seed_type = SSplants.seeds[F.plantname]
else
var/obj/item/reagent_containers/food/snacks/grown/F = O
- new_seed_type = plant_controller.seeds[F.plantname]
+ new_seed_type = SSplants.seeds[F.plantname]
if(new_seed_type)
to_chat(user, span_notice("You extract some seeds from [O]."))
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 90881175b31..b15522ee2d9 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -61,7 +61,7 @@
return
else
// insert cell
- var/obj/item/cell/large/C = usr.get_active_hand()
+ var/obj/item/cell/large/C = usr.get_active_held_item()
if(istype(C))
user.drop_item()
src.cell = C
@@ -133,7 +133,7 @@
set_temperature = dd_range(T0C, T0C + 90, set_temperature + value)
if("cellremove")
- if(panel_open && cell && !usr.get_active_hand())
+ if(panel_open && cell && !usr.get_active_held_item())
usr.visible_message(span_notice("\The [usr] removes \the [cell] from \the [src]."), span_notice("You remove \the [cell] from \the [src]."))
cell.update_icon()
usr.put_in_hands(cell)
@@ -144,7 +144,7 @@
if("cellinstall")
if(panel_open && !cell)
- var/obj/item/cell/large/C = usr.get_active_hand()
+ var/obj/item/cell/large/C = usr.get_active_held_item()
if(istype(C))
usr.drop_item()
src.cell = C
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index ce8f1326cdf..8f07c80d1cc 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -322,7 +322,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/voice
var/voice_scrambled
- if(config.tts_enabled && use_text_to_speech)
+ if(CONFIG_GET(flag/tts_enabled) && use_text_to_speech)
if(M)
if(M.tts_seed)
seed = M.tts_seed
@@ -357,7 +357,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/part_b_extra = ""
if(data == 3) // intercepted radio message
part_b_extra = " (Intercepted)"
- var/part_a = "\icon[radio]\[[freq_text]\][part_b_extra] " // goes in the actual output
+ var/part_a = "[icon2html(radio, receive)]\[[freq_text]\][part_b_extra] " // goes in the actual output
// --- Some more pre-message formatting ---
var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] [icon2html(radio,receive)]\[[freq_text]\][part_b_extra] \[[freq_text]\] "
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index d91abeec94e..47ea508981a 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -45,7 +45,7 @@
// You need a multitool to use this, or be silicon
if(!issilicon(user))
// istype returns false if the value is null
- if(!istype(user.get_active_hand(), /obj/item/tool/multitool))
+ if(!istype(user.get_active_held_item(), /obj/item/tool/multitool))
return
if(stat & (BROKEN|NOPOWER))
@@ -134,14 +134,14 @@
var/obj/item/tool/multitool/P = null
// Let's double check
- if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/tool/multitool))
- P = user.get_active_hand()
+ if(!issilicon(user) && istype(user.get_active_held_item(), /obj/item/tool/multitool))
+ P = user.get_active_held_item()
else if(isAI(user))
var/mob/living/silicon/ai/U = user
P = U.aiMulti
else if(isrobot(user) && in_range(user, src))
- if(istype(user.get_active_hand(), /obj/item/tool/multitool))
- P = user.get_active_hand()
+ if(istype(user.get_active_held_item(), /obj/item/tool/multitool))
+ P = user.get_active_held_item()
return P
// Additional Options for certain machines. Use this when you want to add an option to a specific machine.
@@ -225,7 +225,7 @@
/obj/machinery/telecomms/Topic(href, href_list)
if(!issilicon(usr))
- if(!istype(usr.get_active_hand(), /obj/item/tool/multitool))
+ if(!istype(usr.get_active_held_item(), /obj/item/tool/multitool))
return
if(stat & (BROKEN|NOPOWER))
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 3e21efb3125..4a4dbaf43ec 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -171,7 +171,7 @@
if(C.data == "Clown Land")
//whoops
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_warning("Incoming bluespace portal detected, unable to lock in."), 2)
for(var/obj/machinery/teleport/hub/H in range(1))
@@ -180,7 +180,7 @@
new /mob/living/simple_animal/hostile/carp(get_turf(H))
//
else
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_notice("Portal locked in"), 2)
src.locked = L
one_time_use = 1
@@ -241,7 +241,7 @@
return
src.locked = L[desc]
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_notice("Portal locked in."), 2)
src.add_fingerprint(usr)
return
@@ -289,7 +289,7 @@
if (!mconsole)
return
if (!mconsole.locked)
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_warning("Failure: Cannot authenticate locked on coordinates. Please reinstate coordinate matrix."))
return
if (istype(M, /atom/movable))
@@ -306,7 +306,7 @@
s.set_up(5, 1, src)
s.start()
accurate = 1
- for(var/mob/B in hearers(src, null))
+ for(var/mob/B in hearers(get_turf(src)))
B.show_message(span_notice("Test fire completed."))
spawn(3000) if(src) accurate = 0 //Accurate teleporting for 5 minutes
return
@@ -336,7 +336,7 @@
use_power(5000)
set_power_use(ACTIVE_POWER_USE)
mhub.set_power_use(ACTIVE_POWER_USE)
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_notice("Teleporter engaged!"), 2)
src.add_fingerprint(usr)
@@ -352,7 +352,7 @@
mhub.accurate = 0
mhub.set_power_use(IDLE_POWER_USE)
set_power_use(IDLE_POWER_USE)
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_notice("Teleporter disengaged!"), 2)
src.add_fingerprint(usr)
@@ -368,7 +368,7 @@
if (mhub && !active)
active = 1
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message(span_notice("Test firing!"), 2)
mhub.teleport()
use_power(5000)
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 0e9fd59345b..dc0f051a281 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -239,6 +239,7 @@
spawn_money(buying_price,loc,usr)
to_chat(user, span_notice("[src] accepts the sale of [W] and dispenses [buying_price] credits."))
+ log_econ("[src] accepted sale of [W] from [user] and dispensed [buying_price] credits.")
/**
* Build src.produdct_records from the products lists
@@ -302,6 +303,7 @@
/obj/machinery/vending/emag_act(var/remaining_charges, var/mob/user)
if(machine_vendor_account || vendor_department || earnings_account)
to_chat(user, "You override the ownership protocols on \the [src] and unlock it. You can now register it in your name.")
+ log_econ("[user] has overridden the ownership protocols on [src]")
machine_vendor_account = null
vendor_department = null
earnings_account = null
@@ -309,6 +311,7 @@
if(!emagged)
emagged = 1
to_chat(user, "You short out the product lock on \the [src]")
+ log_econ("[user] has overridden the ownership protocols on [src] via emag")
return 1
/obj/machinery/vending/attackby(obj/item/I, mob/user)
@@ -336,6 +339,7 @@
return
if(I.use_tool(user, src, WORKTIME_EXTREMELY_LONG, tool_type, FAILCHANCE_NORMAL, required_stat = STAT_MEC))
visible_message(span_warning("\The [src] has been dismantled by [user]!"),"You hear welding.")
+ log_econ("[src] has been dismantled by [user]")
new /obj/item/stack/material/steel(loc, 8)
for(var/datum/data/vending_product/R in product_records)
for(var/obj/O in R.instances)
@@ -367,10 +371,12 @@
var/obj/item/spacecash/ewallet/C = I
paid = pay_with_ewallet(C)
handled = TRUE
+ log_econ("[paid] credits were inserted into [src] by [user] to buy [currently_vending].")
playsound(usr.loc, 'sound/machines/id_swipe.ogg', 100, 1)
else if(istype(I, /obj/item/spacecash/bundle))
var/obj/item/spacecash/bundle/C = I
paid = pay_with_cash(C)
+ log_econ("[paid] cashmoneys were inserted into [src] by [user] to buy [currently_vending].")
handled = TRUE
if(paid)
@@ -397,8 +403,10 @@
if(userjob.department == vendor_department)
locked = !locked
to_chat(user, span_notice("\The [src] has been [locked ? "" : "un"]locked."))
+ log_econ("[src] was [locked ? "" : "un"]locked by [user] (samedept).")
else
to_chat(user, span_notice("You are not authorized to manage \the [src]."))
+ log_econ("[user] failed to [locked ? "" : "un"]lock \the [src].")
return
// Enter PIN, so you can't loot a vending machine with only the owner's ID card (as long as they increased the sec level)
@@ -415,6 +423,7 @@
locked = !locked
playsound(usr.loc, 'sound/machines/id_swipe.ogg', 60, 1)
to_chat(user, span_notice("You [locked ? "" : "un"]lock \the [src]."))
+ log_econ("[src] was [locked ? "" : "un"]locked by [user].")
visible_message(span_info("\The [usr] swipes \the [ID] through \the [src], [locked ? "" : "un"]locking it."))
return
@@ -431,6 +440,7 @@
coin = I
categories |= CAT_COIN
to_chat(user, span_notice("You insert \the [I] into \the [src]."))
+ log_econ("[user] inserted [I] into \the [src].")
return
else if(istype(I, /obj/item/device/spy_bug))
user.drop_item()
@@ -459,10 +469,11 @@
if(currently_vending.price > cashmoney.worth)
// This is not a status display message, since it's something the character
// themselves is meant to see BEFORE putting the money in
- to_chat(usr, "\icon[cashmoney] [span_warning("That is not enough money.")]")
+ to_chat(usr, "[icon2html(cashmoney, usr)] [span_warning("That is not enough money.")]")
return 0
visible_message(span_info("\The [usr] inserts some cash into \the [src]."))
+
cashmoney.worth -= currently_vending.price
if(cashmoney.worth <= 0)
@@ -554,7 +565,7 @@
if(S.amount)
should_qdel = FALSE // Don't qdel a stack with remaining charges
else
- to_chat(user, span_warning("\icon[I] That is not enough money."))
+ to_chat(user, span_warning("[icon2html(I, user)] That is not enough money."))
return FALSE
else
return FALSE
@@ -797,6 +808,8 @@
speak(vend_reply)
last_reply = world.time
+ log_econ("[user] has bought [R] from [src]")
+
use_power(vend_power_usage) //actuators and stuff
if(icon_vend) //Show the vending animation if needed
flick(icon_vend,src)
@@ -827,7 +840,7 @@
else if(custom_vendor && product_records.len)
var/datum/data/vending_product/advertised = pick(product_records)
if(advertised)
- var/advertisement = "[pick("Come get","Come buy","Buy","Sale on","We have")] \an [advertised.product_name], [pick("for only","only","priced at")] [advertised.price] credits![pick(" What a deal!"," Can you believe it?","")]"
+ var/advertisement = "[pick("Come get","Come buy","Buy","Sale on","We have")] \an [advertised.product_name], [pick("for only","only","priced at", "just")] [advertised.price] credits![pick(" What a deal!"," Can you believe it?","")]"
speak(advertisement)
last_slogan = world.time
@@ -843,7 +856,7 @@
if(!message)
return
- for(var/mob/O in hearers(src, null))
+ for(var/mob/O in hearers(get_turf(src)))
O.show_message("[span_name("\The [src]")] beeps, \"[message]\"",2)
return
@@ -1517,7 +1530,7 @@
else if(is_neotheology_disciple(H))
bingo = TRUE
- else if(istype(H.get_active_hand(), /obj/item/clothing/accessory/cross))
+ else if(istype(H.get_active_held_item(), /obj/item/clothing/accessory/cross))
bingo = TRUE
else if(istype(H.wear_mask, /obj/item/clothing/accessory/cross))
diff --git a/code/game/objects/barricades.dm b/code/game/objects/barricades.dm
index d96ba9e7515..428a393864c 100644
--- a/code/game/objects/barricades.dm
+++ b/code/game/objects/barricades.dm
@@ -174,12 +174,12 @@
var/obj/item/device/assembly/signaler/signaler = I
if((signaler.code == code) && (signaler.frequency == frequency)) // Linked signaler is used, break the link
update_wifi_password()
- signaler.audible_message("\icon[signaler] *beep*")
+ signaler.audible_message("[icon2html(signaler, hearers(get_turf(src)))] *beep*")
else if(!frequency || !code) // There is no link, establish one
update_wifi_password(signaler.code, signaler.frequency)
- signaler.audible_message("\icon[signaler] *beep* *beep*")
+ signaler.audible_message("[icon2html(signaler, hearers(get_turf(src)))] *beep* *beep*")
else // Access denied
- signaler.audible_message("\icon[signaler] *beep* *beep* *beep*") // Silly and cryptic, yet authentic signaler feedback
+ signaler.audible_message("[icon2html(signaler, hearers(get_turf(src)))] *beep* *beep* *beep*") // Silly and cryptic, yet authentic signaler feedback
return
var/list/usable_qualities = list(QUALITY_BOLT_TURNING)
diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm
index 6a42a365189..634ef7939de 100644
--- a/code/game/objects/effects/chem/chemsmoke.dm
+++ b/code/game/objects/effects/chem/chemsmoke.dm
@@ -80,8 +80,8 @@
var/datum/seed/seed
/datum/effect/effect/system/smoke_spread/chem/spores/New(seed_name)
- if(seed_name && plant_controller)
- seed = plant_controller.seeds[seed_name]
+ if(seed_name && SSplants)
+ seed = SSplants.seeds[seed_name]
if(!seed)
qdel(src)
..()
@@ -129,14 +129,14 @@
var/area/A = get_area(location)
var/where = "[A.name] | [location.x], [location.y]"
- var/whereLink = "[where]"
+ var/whereLink = "[where] [ADMIN_JMP(location)]"
if(show_log)
if(carry.my_atom.fingerprintslast)
var/mob/M = get_mob_by_key(carry.my_atom.fingerprintslast)
var/more = ""
if(M)
- more = "(?)"
+ more = "[ADMIN_QUE(M)]"
message_admins("A chemical smoke reaction has taken place in ([whereLink])[contained]. Last associated key is [carry.my_atom.fingerprintslast][more].", 0, 1)
log_game("A chemical smoke reaction has taken place in ([where])[contained]. Last associated key is [carry.my_atom.fingerprintslast].")
else
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 1739e586679..6043fa2ed0f 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -8,7 +8,7 @@
/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,_amount=1,nologs=0)
if(usr && usr.client && !nologs)
- message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) (JMP)")
+ message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) [ADMIN_JMP(newLoc)]")
log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
amount = _amount
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index ac04e86bc1f..a31edb6f998 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -476,3 +476,16 @@ steam.start() -- spawns the effect
to_chat(M, span_warning("The solution violently explodes."))
explosion(get_turf(location), explosion_power, explosion_power / 10)
+
+///The abstract effect ignores even more effects and is often typechecked for atoms that should truly not be fucked with.
+/obj/effect/abstract/singularity_pull()
+ return
+
+/obj/effect/abstract/singularity_act()
+ return
+
+/obj/effect/dummy/singularity_pull()
+ return
+
+/obj/effect/dummy/singularity_act()
+ return
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 90ef8c6d61a..b4ddea39fe1 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -19,8 +19,10 @@
if(triggered) return
if(ishuman(M))
- for(var/mob/O in viewers(world.view, src.loc))
- to_chat(O, "[M] triggered the \icon[src] [src]")
+ var/our_viewers = viewers(get_turf(src))
+ var/htmlicon = icon2html(src, our_viewers)
+ for(var/mob/O in our_viewers)
+ to_chat(O, "[M] triggered the [htmlicon] [src]")
triggered = 1
call(src,triggerproc)(M)
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 6b43fbad0ed..060228380ea 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -113,7 +113,7 @@ var/list/portal_cache = list()
/obj/effect/portal/wormhole/New(loc, lifetime, exit)
if(admin_announce_new)
- message_admins("Wormhole with lifetime [time2text(lifetime, "hh hours, mm minutes and ss seconds")] created at ([jumplink(src)])", 0, 1)
+ message_admins("Wormhole with lifetime [time2text(lifetime, "hh hours, mm minutes and ss seconds", NO_TIMEZONE)] created at ([jumplink(src)])", 0, 1)
..(loc, lifetime)
set_target(exit)
pair()
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 4ba146729b4..f3b90547c86 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -29,12 +29,12 @@
if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space))
M << 'sound/effects/explosionfar.ogg'
if(adminlog)
- message_admins("Explosion with power:[power] and falloff:[falloff] in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)")
+ message_admins("Explosion with power:[power] and falloff:[falloff] in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) [ADMIN_JMP(epicenter)]")
log_game("Explosion with size power:[power] and falloff:[falloff] in area [epicenter.loc.name] ")
/*
spawn(0)
- if(config.use_recursive_explosions)
+ if(CONFIG_GET(flag/use_recursive_explosions))
var/power = devastation_range * 2 + heavy_impact_range + light_impact_range //The ranges add up, ie light 14 includes both heavy 7 and devestation 3. So this calculation means devestation counts for 4, heavy for 2 and light for 1 power, giving us a cap of 27 power.
explosion_rec(epicenter, power)
return
@@ -88,7 +88,7 @@
if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space))
M << 'sound/effects/explosionfar.ogg'
if(adminlog)
- message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [singe_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)")
+ message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [singe_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) [ADMIN_JMP(epicenter)]")
log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [singe_impact_range]) in area [epicenter.loc.name] ")
var/approximate_intensity = (devastation_range * 3) + (heavy_impact_range * 2) + light_impact_range + round(singe_impact_range / 2)
@@ -124,7 +124,7 @@
var/took = (world.timeofday-start)/10
//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare
- if(Debug2) log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
+ if(GLOB.Debug2) log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
//Machines which report explosions.
for(var/i,i<=doppler_arrays.len,i++)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index da6bf72e465..b9dea40b5a7 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -357,7 +357,7 @@
user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)])"
M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)])"
- msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (JMP)") //BS12 EDIT ALG
+ msg_admin_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") //BS12 EDIT ALG
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(M)
@@ -465,13 +465,13 @@ var/global/list/items_blood_overlay_by_type = list()
/obj/item/proc/showoff(mob/user)
for (var/mob/M in view(user))
- M.show_message("[user] holds up [src]. Take a closer look.",1)
+ M.show_message("[user] holds up [src]. Take a closer look.",1)
/mob/living/carbon/verb/showoff()
set name = "Show Held Item"
set category = "Object"
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if(I && !I.abstract)
I.showoff(src)
@@ -479,7 +479,7 @@ var/global/list/items_blood_overlay_by_type = list()
set name = "Spin Held Item"
set category = "Object"
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if (istype(I, /obj/item/grab)) // a grab signifies that it's another mob that should be spun
var/obj/item/grab/inhand_grab = I
var/mob/living/grabbed = inhand_grab.throw_held()
@@ -541,7 +541,7 @@ var/global/list/items_blood_overlay_by_type = list()
else
to_chat(src, span_warning("You do not have a firm enough grip to forcibly spin [inhand_grab.affecting]."))
- else if (I && !I.abstract && I.mob_can_unequip(src, get_active_hand_slot())) // being unable to unequip normally means
+ else if (I && !I.abstract && I.mob_can_unequip(src, get_active_held_item_slot())) // being unable to unequip normally means
I.SpinAnimation(5,1) // that the item is stuck on or in, and so cannot spin
external_recoil(50)
visible_message("[src] spins [I.name] in \his hand.") // had to mess with the macros a bit to get
@@ -580,7 +580,7 @@ mech zooming.
else if(!zoom && (global_hud.darkMask[1] in usr.client.screen))
to_chat(targetMob, "Your visor gets in the way of looking through the [devicename]")
cannotzoom = 1
- else if(!zoom && targetMob.get_active_hand() != src && !ismech(targetMob.loc))
+ else if(!zoom && targetMob.get_active_held_item() != src && !ismech(targetMob.loc))
to_chat(targetMob, "You are too distracted to look through the [devicename]. Perhaps if it was in your active hand you could look through it.")
cannotzoom = 1
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index f19435e7c58..986f39222db 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -29,7 +29,7 @@
/obj/item/blueprints/Topic(href, href_list)
..()
- if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+ if ((usr.restrained() || usr.stat || usr.get_active_held_item() != src))
return
if (!href_list["action"])
return
@@ -48,8 +48,8 @@
/obj/item/blueprints/interact()
var/area/A = get_area(usr)
var/text = {"
-[station_name] blueprints
-Property of [company_name]. For heads of staff only. Store in high-secure storage.
+[station_name()] blueprints
+Property of [GLOB.company_name]. For heads of staff only. Store in high-secure storage.
"}
switch (get_area_type())
if (AREA_SPACE)
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 842778b826f..aa09a8f5911 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -32,7 +32,7 @@
/obj/structure/closet/body_bag/attackby(W as obj, mob/user)
if (istype(W, /obj/item/pen))
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
- if (user.get_active_hand() != W)
+ if (user.get_active_held_item() != W)
return
if (!in_range(src, user) && src.loc != user)
return
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 8d5cadd0bb0..97096a06b35 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -41,7 +41,7 @@
M.attack_log += text("\[[time_stamp()]\] Has been flashed (attempt) with [src.name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to flash [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) Used the [src.name] to flash [M.name] ([M.ckey]) [ADMIN_JMP(user)]")
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(M)
@@ -158,7 +158,7 @@
sleep(5)
qdel(animation)
- for(var/mob/living/carbon/M in oviewers(3, null))
+ for(var/mob/living/carbon/M in oviewers(3, get_turf(src)))
var/safety = M.eyecheck()
if(safety < FLASH_PROTECTION_MODERATE)
M.flash(0, FALSE, FALSE, TRUE)
diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm
index 7ec4e8882ee..829a455278e 100644
--- a/code/game/objects/items/devices/hacktool.dm
+++ b/code/game/objects/items/devices/hacktool.dm
@@ -51,7 +51,7 @@
to_chat(user, span_warning("You are already hacking!"))
return 0
if(!is_type_in_list(target, supported_types))
- to_chat(user, "\icon[src] [span_warning("Unable to hack this target!")]")
+ to_chat(user, "[icon2html(src, user)] [span_warning("Unable to hack this target!")]")
return 0
var/found = known_targets.Find(target)
if(found)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 936dbfcd6a3..b8e5b37c8be 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -33,13 +33,13 @@
if ((loc == user && usr.stat == 0))
if(emagged)
if(insults)
- for(var/mob/O in (viewers(user)))
+ for(var/mob/O in (viewers(get_turf(user))))
O.show_message("[user] broadcasts, \"[pick(insultmsg)]\"",2) // 2 stands for hearable message
insults--
else
to_chat(user, span_warning("*BZZZZzzzzzt*"))
else
- for(var/mob/O in (viewers(user)))
+ for(var/mob/O in (viewers(get_turf(user))))
O.show_message("[user] broadcasts, \"[message]\"",2) // 2 stands for hearable message
return
diff --git a/code/game/objects/items/devices/mental_imprinter.dm b/code/game/objects/items/devices/mental_imprinter.dm
index 703c447eecc..44ae8ac1207 100644
--- a/code/game/objects/items/devices/mental_imprinter.dm
+++ b/code/game/objects/items/devices/mental_imprinter.dm
@@ -15,7 +15,7 @@
if(!stat || spent)
return
- if(!istype(user) || !user.stats || user.incapacitated() || user.get_active_hand() != src || length(user.get_covering_equipped_items(EYES)))
+ if(!istype(user) || !user.stats || user.incapacitated() || user.get_active_held_item() != src || length(user.get_covering_equipped_items(EYES)))
return
// User gains more and loses less if the base stat is fairly low
diff --git a/code/game/objects/items/devices/organ_module/active/multitool.dm b/code/game/objects/items/devices/organ_module/active/multitool.dm
index 5bb9cc1c76d..10a97579f9f 100644
--- a/code/game/objects/items/devices/organ_module/active/multitool.dm
+++ b/code/game/objects/items/devices/organ_module/active/multitool.dm
@@ -18,7 +18,7 @@
/obj/item/organ_module/active/multitool/activate(mob/living/carbon/human/H, obj/item/organ/external/E)
var/target_hand = E.organ_tag == BP_L_ARM ? slot_l_hand : slot_r_hand
- var/obj/I = H.get_active_hand()
+ var/obj/I = H.get_active_held_item()
if(I)
if(I in items)
H.drop_from_inventory(I, src)
diff --git a/code/game/objects/items/devices/propaganda_chip.dm b/code/game/objects/items/devices/propaganda_chip.dm
index a1fee0ec50c..b5e7c10b6fe 100644
--- a/code/game/objects/items/devices/propaganda_chip.dm
+++ b/code/game/objects/items/devices/propaganda_chip.dm
@@ -91,7 +91,7 @@
var/message_text = pick(messages)
var/message = " [crew_name] says, \"[message_text]\""
- for (var/mob/living/M in viewers(src))
+ for (var/mob/living/M in viewers(get_turf(src)))
to_chat(M, "[message]")
last_talk_time = world.time
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index dce828a0865..ee659bfb339 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -44,10 +44,10 @@
/obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel)
if (channel == "special")
if (translate_binary)
- var/datum/language/binary = all_languages[LANGUAGE_ROBOT]
+ var/datum/language/binary = GLOB.all_languages[LANGUAGE_ROBOT]
binary.broadcast(M, message)
if (translate_hive)
- var/datum/language/hivemind = all_languages[LANGUAGE_HIVEMIND]
+ var/datum/language/hivemind = GLOB.all_languages[LANGUAGE_HIVEMIND]
hivemind.broadcast(M, message)
return null
diff --git a/code/game/objects/items/devices/scanners/plant.dm b/code/game/objects/items/devices/scanners/plant.dm
index b72f2e010b7..29d97584bd3 100644
--- a/code/game/objects/items/devices/scanners/plant.dm
+++ b/code/game/objects/items/devices/scanners/plant.dm
@@ -50,13 +50,13 @@
else if(istype(target,/obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = target
- grown_seed = plant_controller.seeds[G.plantname]
+ grown_seed = SSplants.seeds[G.plantname]
grown_reagents = G.reagents
else if(istype(target,/obj/item/grown))
var/obj/item/grown/G = target
- grown_seed = plant_controller.seeds[G.plantname]
+ grown_seed = SSplants.seeds[G.plantname]
grown_reagents = G.reagents
else if(istype(target,/obj/item/seeds))
diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
index 9ee50f11a5d..4210e1f7146 100644
--- a/code/game/objects/items/devices/t_scanner.dm
+++ b/code/game/objects/items/devices/t_scanner.dm
@@ -340,7 +340,7 @@ are technically visible but obscured, for example by catwalks or trash sitting o
return "00:00"
var/numseconds = cell.charge / get_power_cost()
- return time2text(numseconds*10, "mm:ss") //time2text takes deciseconds, so the amounts are tenfold
+ return time2text(numseconds*10, "mm:ss", NO_TIMEZONE) //time2text takes deciseconds, so the amounts are tenfold
//Whenever the scanner is equipped to a slot or dropped on the ground or deleted, set the user appropriately
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 877e5804e59..328560c6f54 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -82,16 +82,16 @@
audio_file.timestamp += audio_file.used_capacity
if(speaking)
- audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss")]\] [M.name] [speaking.format_message_plain(msg, verb)]"
+ audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss",NO_TIMEZONE)]\] [M.name] [speaking.format_message_plain(msg, verb)]"
else
- audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss")]\] [M.name] [verb], \"[msg]\""
+ audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss",NO_TIMEZONE)]\] [M.name] [verb], \"[msg]\""
/obj/item/device/taperecorder/see_emote(mob/M as mob, text, var/emote_type)
if(emote_type != 2) //only hearable emotes
return
if(audio_file && recording)
audio_file.timestamp += audio_file.used_capacity
- audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss")]\] [strip_html_properly(text)]"
+ audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss",NO_TIMEZONE)]\] [strip_html_properly(text)]"
/obj/item/device/taperecorder/show_message(msg, type, alt, alt_type)
var/recordedtext
@@ -103,7 +103,7 @@
return
if(audio_file && recording)
audio_file.timestamp += audio_file.used_capacity
- audio_file.storedinfo += "*\[[time2text(audio_file.used_capacity*10,"mm:ss")]\] *[strip_html_properly(recordedtext)]*" //"*" at front as a marker
+ audio_file.storedinfo += "*\[[time2text(audio_file.used_capacity*10,"mm:ss",NO_TIMEZONE)]\] *[strip_html_properly(recordedtext)]*" //"*" at front as a marker
/obj/item/device/taperecorder/emag_act(var/remaining_charges, var/mob/user)
if(!emagged)
@@ -196,7 +196,7 @@
to_chat(usr, span_notice("Recording started."))
recording = 1
audio_file.timestamp += audio_file.used_capacity
- audio_file.storedinfo += "\[[time2text(audio_file.used_capacity * 10,"mm:ss")]\] Recording started."
+ audio_file.storedinfo += "\[[time2text(audio_file.used_capacity * 10,"mm:ss",NO_TIMEZONE)]\] Recording started."
var/used = audio_file.used_capacity //to stop runtimes when you eject the drive
var/max = audio_file.max_capacity
for(used, used < max)
@@ -224,7 +224,7 @@
if(recording)
recording = 0
audio_file.timestamp += audio_file.used_capacity
- audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss")]\] Recording stopped."
+ audio_file.storedinfo += "\[[time2text(audio_file.used_capacity*10,"mm:ss",NO_TIMEZONE)]\] Recording stopped."
audio_file.stored_data = null
for(var/entry in audio_file.storedinfo)
audio_file.stored_data += "[entry]
"
diff --git a/code/game/objects/items/devices/techno_tribalism.dm b/code/game/objects/items/devices/techno_tribalism.dm
index 81eaf2e349c..01d73505505 100644
--- a/code/game/objects/items/devices/techno_tribalism.dm
+++ b/code/game/objects/items/devices/techno_tribalism.dm
@@ -213,9 +213,9 @@
else
to_chat(src.loc, span_warning("The [src] is too complicated to use!"))
else
- visible_message("\icon The [src] beeps, \"The [src] is not full enough to produce.\".")
+ visible_message("[icon2html(src, hearers(get_turf(src)))] The [src] beeps, \"The [src] is not full enough to produce.\".")
else
- visible_message("\icon The [src] beeps, \"The [src] needs time to cooldown.\".")
+ visible_message("[icon2html(src, hearers(get_turf(src)))] The [src] beeps, \"The [src] needs time to cooldown.\".")
/obj/item/device/techno_tribalism/proc/alert_technomancers()
if(radio_broadcasting)
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index c0463595374..34c720251fa 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -31,7 +31,7 @@
user.drop_item()
item.loc = src
to_chat(user, span_notice("You attach the tank to the transfer valve."))
- message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. (JMP)")
+ message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. [ADMIN_JMP(location)]")
log_game("[key_name_admin(user)] attached both tanks to a transfer valve.")
update_icon()
@@ -51,8 +51,7 @@
A.holder = src
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
- bombers += "[key_name(user)] attached a [item] to a transfer valve."
- message_admins("[key_name_admin(user)] attached a [item] to a transfer valve. (JMP)")
+ message_admins("[key_name_admin(user)] attached a [item] to a transfer valve. [ADMIN_JMP(location)]")
log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
attacher = user
return
@@ -195,19 +194,19 @@
else
attacher_name = "[attacher.name]([attacher.ckey])"
- var/log_str = "Bomb valve opened in [A.name] "
+ var/log_str = "Bomb valve opened in [A.name] [ADMIN_JMP(bombturf)]"
log_str += "with [attached_device ? attached_device : "no device"] attacher: [attacher_name]"
if(attacher)
- log_str += "(?)"
+ log_str += "[ADMIN_QUE(attacher)]"
var/mob/mob = get_mob_by_key(src.fingerprintslast)
var/last_touch_info = ""
if(mob)
- last_touch_info = "(?)"
+ last_touch_info = "[ADMIN_QUE(mob)]"
log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
- bombers += log_str
+ GLOB.bombers += log_str
message_admins(log_str, 0, 1)
log_game(log_str)
merge_gases()
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index cb7121754c8..9e558ec1261 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -56,7 +56,7 @@
loc = user.loc
if(ishuman(user))
- if(!user.get_active_hand())
+ if(!user.get_active_held_item())
user.put_in_hands(src)
to_chat(user, "You take the target out of the stake.")
else
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index a8cb81403a6..8e74cce0201 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -44,11 +44,11 @@
if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_WELDING, FAILCHANCE_VERY_EASY, required_stat = STAT_MEC))
var/obj/item/stack/material/steel/new_item = new (usr.loc)
new_item.add_to_stacks(usr)
- for (var/mob/M in viewers(src))
+ for (var/mob/M in viewers(get_turf(src)))
M.show_message(span_notice("[src] is shaped into metal by [user.name] with the [I.name]."), 3, span_notice("You hear welding."), 2)
var/obj/item/stack/rods/R = src
src = null
- var/replace = (user.get_inactive_hand() == R)
+ var/replace = (user.get_inactive_held_item() == R)
R.use(2)
if(!R && replace)
user.put_in_hands(new_item)
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 7adb35748c6..ae66a538529 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -200,7 +200,7 @@
/obj/item/stack/Topic(href, href_list)
..()
- if ((usr.restrained() || usr.stat || usr.get_active_hand() != src))
+ if ((usr.restrained() || usr.stat || usr.get_active_held_item() != src))
return
if (href_list["sublist"] && !href_list["make"])
@@ -358,7 +358,7 @@
break
/obj/item/stack/attack_hand(mob/user as mob)
- if (user.get_inactive_hand() == src)
+ if (user.get_inactive_held_item() == src)
var/obj/item/stack/F = src.split(1)
if (F)
user.put_in_hands(F)
@@ -374,7 +374,7 @@
/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
if (istype(W, /obj/item/stack))
var/obj/item/stack/S = W
- if (user.get_inactive_hand()==src)
+ if (user.get_inactive_held_item()==src)
src.transfer_to(S, 1)
else
src.transfer_to(S)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index f0bfe05abc9..a8b515d53d4 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -224,7 +224,7 @@
// Cyborg tile stack can copy steel tiles by clicking on them (for easy reconstruction)
/obj/item/stack/tile/floor/steel/AltClick(var/mob/living/user)
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(istype(I, /obj/item/stack/tile/floor/cyborg))
var/obj/item/stack/tile/floor/cyborg/C = I
C.stacktype = src.type
diff --git a/code/game/objects/items/talking_crystal.dm b/code/game/objects/items/talking_crystal.dm
index be2f036f418..8e1fa2e8998 100644
--- a/code/game/objects/items/talking_crystal.dm
+++ b/code/game/objects/items/talking_crystal.dm
@@ -61,7 +61,7 @@
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focusing on [source]...",\
"[holder_atom] seems to turn it's attention to [source]...")
- holder_atom.loc.visible_message("\blue \icon[holder_atom] [pick(options)]")
+ holder_atom.loc.visible_message(span_blue("[icon2html(holder_atom, viewers(holder_atom))] [pick(options)]"))
if(prob(20))
spawn(2)
@@ -115,7 +115,7 @@
else
msg+="!"
- var/list/listening = viewers(holder_atom)
+ var/list/listening = hearers(get_turf(holder_atom))
for(var/mob/M in SSmobs.mob_list)
if (!M.client)
continue //skip monkeys and leavers
@@ -124,6 +124,7 @@
if(M.stat == DEAD && M.get_preference_value(/datum/client_preference/ghost_ears) == GLOB.PREF_ALL_SPEECH)
listening|=M
+ var/htmlicon = icon2html(holder_atom, listening)
for(var/mob/M in listening)
- to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \blue\"[msg]\"")
+ to_chat(M, "[] [htmlicon] reverberates, \blue\"[msg]\"")
last_talk_time = world.time
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 9679974ba66..c75f2b11414 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -167,7 +167,7 @@
continue
if(M == user)
continue
- for(var/mob/O in viewers(world.view, D))
+ for(var/mob/O in viewers(get_turf(D)))
O.show_message(span_warning("\The [M] was hit by the foam dart!"), 1)
new /obj/item/toy/ammo/crossbow(M.loc)
qdel(D)
@@ -189,7 +189,7 @@
return
else if (bullets == 0)
user.Weaken(5)
- for(var/mob/O in viewers(world.view, user))
+ for(var/mob/O in viewers(get_turf(user)))
O.show_message(span_warning("\The [user] realized they were out of ammo and starting scrounging for some!"), 1)
@@ -200,7 +200,7 @@
if (src.bullets > 0 && M.lying)
- for(var/mob/O in viewers(M, null))
+ for(var/mob/O in viewers(get_turf(M), null))
if(O.client)
O.show_message(span_danger("\The [user] casually lines up a shot with [M]'s head and pulls the trigger!"), 1, span_warning("You hear the sound of foam against skull"), 2)
O.show_message(span_warning("\The [M] was hit in the head by the foam dart!"), 1)
@@ -209,7 +209,7 @@
new /obj/item/toy/ammo/crossbow(M.loc)
src.bullets--
else if (M.lying && src.bullets == 0)
- for(var/mob/O in viewers(M, null))
+ for(var/mob/O in viewers(get_turf(M), null))
if (O.client)
O.show_message(span_danger("\The [user] casually lines up a shot with [M]'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!"), 1, span_warning("You hear someone fall"), 2)
user.Weaken(5)
@@ -374,7 +374,7 @@
/obj/item/toy/waterflower/examine(mob/user, extra_description = "")
if(get_dist(user, src) < 2)
- extra_description += "\icon[src] [reagents.total_volume] units of water left!"
+ extra_description += "[icon2html(src, user)] [reagents.total_volume] units of water left!"
..(user, extra_description)
/*
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 31eb9e7755a..9c56e66bfdb 100644
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -84,10 +84,11 @@ AI MODULES
to_chat(target, "\The [sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ")
target.show_laws()
-/obj/item/electronics/ai_module/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender)
- var/time = time2text(world.realtime,"hh:mm:ss")
+/obj/item/electronics/ai_module/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender, law2log)
+ var/time = time2text(world.realtime,"hh:mm:ss",NO_TIMEZONE)
GLOB.lawchanges.Add("[time] : [sender.name]([sender.key]) used [src.name] on [target.name]([target.key])")
log_and_message_admins("used [src.name] on [target.name]([target.key])")
+ log_silicon("LAW: [sender.name]([sender.key]) used [src.name] on [target.name]([target.key]) from [AREACOORD(sender)].")
/obj/item/electronics/ai_module/proc/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index a3508345756..bd41571cfff 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -29,7 +29,7 @@
return 0
/obj/item/rcd/proc/can_use(var/mob/user,var/turf/T)
- return (user.Adjacent(T) && user.get_active_hand() == src && !user.stat && !user.restrained())
+ return (user.Adjacent(T) && user.get_active_held_item() == src && !user.stat && !user.restrained())
/obj/item/rcd/examine(mob/user, extra_description = "")
if(get_dist(user, src) < 2)
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index 00ca1ab592c..b23b3fb04de 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -27,7 +27,7 @@
return 0
/obj/item/rpd/proc/can_use(var/mob/user,var/turf/T)
- return (user.Adjacent(T) && user.get_active_hand() == src && !user.stat && !user.restrained())
+ return (user.Adjacent(T) && user.get_active_held_item() == src && !user.stat && !user.restrained())
/obj/item/rpd/MouseDrop(over_object)
if((src.loc == usr) && istype(over_object, /obj/screen/inventory/hand) && eject_item(cell, usr))
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 3f3e99e8265..d639b2466ba 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -125,7 +125,7 @@ var/const/NO_EMAG_ACT = -50
if(get_dist(user, src) < 2)
show(user)
extra_description += desc
- extra_description += text("\n\icon[src] [name]: The current assignment on the card is [assignment].")
+ extra_description += text("\n[icon2html(src, user)] [name]: The current assignment on the card is [assignment].")
extra_description += "\nThe blood type on the card is [blood_type]."
extra_description += "\nThe DNA hash on the card is [dna_hash]."
extra_description += "\nThe fingerprint hash on the card is [fingerprint_hash]."
@@ -180,8 +180,9 @@ var/const/NO_EMAG_ACT = -50
return dat
/obj/item/card/id/attack_self(mob/user as mob)
- user.visible_message("\The [user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\
- "You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]")
+ var/visible_to = viewers(get_turf(src))
+ user.visible_message("\The [user] shows you: [icon2html(src, visible_to)] [src.name]. The assignment on the card: [src.assignment]",\
+ "You flash your ID card: [icon2html(src, visible_to)] [src.name]. The assignment on the card: [src.assignment]")
src.add_fingerprint(user)
return
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index f87ebc05792..3bdc2cf122f 100755
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -83,7 +83,7 @@
//I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
- if(user.client && (target in user.client.screen) && !(target == user.get_inactive_hand())) // being unable to clean an item because you're holding it is silly -vode
+ if(user.client && (target in user.client.screen) && !(target == user.get_inactive_held_item())) // being unable to clean an item because you're holding it is silly -vode
to_chat(user, span_notice("You need to take that [target.name] off before cleaning it."))
return
else
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 36224fee04a..64d3911a993 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -36,7 +36,7 @@
/obj/item/plastique/attack_self(mob/user as mob)
var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
- if(user.get_active_hand() == src)
+ if(user.get_active_held_item() == src)
newtime = CLAMP(newtime, 2, 60000)
timer = newtime
to_chat(user, "Timer set for [timer] seconds.")
@@ -61,11 +61,11 @@
if (ismob(target))
add_logs(user, target, "planted [name] on")
user.visible_message(span_danger("[user.name] finished planting the explosive on [target.name]!"))
- message_admins("[key_name(user, user.client)](?) planted [src.name] on [key_name(target)](?) with [timer] second fuse",0,1)
+ message_admins("[key_name(user, user.client)][ADMIN_QUE(user)]] planted [src.name] on [key_name(target)][ADMIN_QUE(target)] with [timer] second fuse",0,1)
log_game("[key_name(user)] planted [src.name] on [key_name(target)] with [timer] second fuse")
else
- message_admins("[key_name(user, user.client)](?) planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1)
+ message_admins("[key_name(user, user.client)][ADMIN_QUE(user)]] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z] - [ADMIN_JMP(target)] with [timer] second fuse",0,1)
log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image_overlay
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 357ae28ec48..0ebf2d33c06 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -131,16 +131,15 @@
if(!isigniter(detonator.left_assembly))
detonator.left_assembly.activate()
active = TRUE
- log_and_message_admins("primed via detonator \a [src]")
if(!isigniter(detonator.right_assembly))
detonator.right_assembly.activate()
active = TRUE
- log_and_message_admins("primed via detonator \a [src]")
+ log_bomber(user, "primed via detonator \a [src]", src)
if(active)
icon_state = initial(icon_state) + "_active"
if(user)
- msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) primed \a [src] [ADMIN_JMP(user)]")
return
diff --git a/code/game/objects/items/weapons/implant/implantcase.dm b/code/game/objects/items/weapons/implant/implantcase.dm
index 6e325a9d076..ab5d691b60f 100644
--- a/code/game/objects/items/weapons/implant/implantcase.dm
+++ b/code/game/objects/items/weapons/implant/implantcase.dm
@@ -28,7 +28,7 @@
..()
if (istype(I, /obj/item/pen))
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
- if (user.get_active_hand() != I)
+ if (user.get_active_held_item() != I)
return
if((!in_range(src, usr) && src.loc != user))
return
diff --git a/code/game/objects/items/weapons/implant/implants/carrion/infection_spider.dm b/code/game/objects/items/weapons/implant/implants/carrion/infection_spider.dm
index 687a34b08e5..7e55cf702bb 100644
--- a/code/game/objects/items/weapons/implant/implants/carrion/infection_spider.dm
+++ b/code/game/objects/items/weapons/implant/implants/carrion/infection_spider.dm
@@ -59,7 +59,7 @@
"You feel weak, like something is growing inside of your body!"
))
wearer.adjustHalLoss(10) //Flat 10 agony damage
- to_chat(wearer, "\red [pain_message]")
+ to_chat(wearer, span_red("[pain_message]"))
if(prob(1)) //around 0.75 limbs per transformation
if(prob(50))
var/obj/item/organ/external/E = wearer.get_organ(pick(list(BP_L_ARM, BP_L_LEG, BP_R_ARM, BP_R_LEG)))
diff --git a/code/game/objects/items/weapons/implant/implants/death_alarm.dm b/code/game/objects/items/weapons/implant/implants/death_alarm.dm
index 7b8f2086bc6..5cf690f7656 100644
--- a/code/game/objects/items/weapons/implant/implants/death_alarm.dm
+++ b/code/game/objects/items/weapons/implant/implants/death_alarm.dm
@@ -9,7 +9,7 @@
/obj/item/implant/death_alarm/get_data()
var/data = {"
Implant Specifications:
- Name: [company_name] \"Profit Margin\" Class Employee Lifesign Sensor
+ Name: [GLOB.company_name] \"Profit Margin\" Class Employee Lifesign Sensor
Life: Activates upon death.
Important Notes: Alerts crew to crewmember death.
diff --git a/code/game/objects/items/weapons/implant/implants/explosive.dm b/code/game/objects/items/weapons/implant/implants/explosive.dm
index 4bd058fd0cf..e337b8fac7e 100644
--- a/code/game/objects/items/weapons/implant/implants/explosive.dm
+++ b/code/game/objects/items/weapons/implant/implants/explosive.dm
@@ -61,7 +61,7 @@
if(istype(wearer, /mob/))
var/mob/T = wearer
- message_admins("Explosive implant triggered in [T] ([T.key]). (JMP) ")
+ message_admins("Explosive implant triggered in [T] ([T.key]). [ADMIN_JMP(T)] ")
log_game("Explosive implant triggered in [T] ([T.key]).")
if(ishuman(wearer))
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 2eb5820dd5e..62cc89e97ea 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -185,7 +185,7 @@
return ..()
/obj/item/book/manual/wiki/proc/initialize_wikibook()
- if(config.wikiurl)
+ if(CONFIG_GET(string/wikiurl))
dat = {"
"
. += "
"
. += "Body "
@@ -132,7 +132,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/physical/body/OnTopic(var/href,var/list/href_list, var/mob/user)
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
if(href_list["toggle_species_verbose"])
hide_species = !hide_species
return TOPIC_REFRESH
@@ -151,7 +151,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_HAIR_COLOR))
return TOPIC_NOACTION
var/new_hair = input(user, "Choose your character's hair colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.hair_color) as color|null
- if(new_hair && has_flag(all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
+ if(new_hair && has_flag(GLOB.all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
pref.hair_color = new_hair
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -159,7 +159,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/list/valid_hairstyles = mob_species.get_hair_styles()
var/new_h_style = input(user, "Choose your character's hair style:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.h_style) as null|anything in valid_hairstyles
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_h_style && CanUseTopic(user) && (new_h_style in mob_species.get_hair_styles()))
pref.h_style = new_h_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -168,7 +168,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_HAIR_COLOR))
return TOPIC_NOACTION
var/new_facial = input(user, "Choose your character's facial-hair colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.facial_color) as color|null
- if(new_facial && has_flag(all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
+ if(new_facial && has_flag(GLOB.all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
pref.facial_color = new_facial
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -176,7 +176,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_EYE_COLOR))
return TOPIC_NOACTION
var/new_eyes = input(user, "Choose your character's eye colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.eyes_color) as color|null
- if(new_eyes && has_flag(all_species[pref.species], HAS_EYE_COLOR) && CanUseTopic(user))
+ if(new_eyes && has_flag(GLOB.all_species[pref.species], HAS_EYE_COLOR) && CanUseTopic(user))
pref.eyes_color = new_eyes
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -189,7 +189,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["skin_tone"])
var/new_s_tone = input(user, "Choose your character's skin-tone. Lower numbers are lighter, higher are darker. Range: 1 to 225", CHARACTER_PREFERENCE_INPUT_TITLE, (-pref.s_tone) + 35) as num|null
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_s_tone && CanUseTopic(user))
pref.s_tone = 35 - max(min(round(new_s_tone), 220), 1)
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -198,7 +198,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_SKIN_COLOR))
return TOPIC_NOACTION
var/new_skin = input(user, "Choose your character's skin colour: ", CHARACTER_PREFERENCE_INPUT_TITLE, pref.skin_color) as color|null
- if(new_skin && has_flag(all_species[pref.species], HAS_SKIN_COLOR) && CanUseTopic(user))
+ if(new_skin && has_flag(GLOB.all_species[pref.species], HAS_SKIN_COLOR) && CanUseTopic(user))
pref.skin_color = new_skin
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -207,7 +207,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_f_style = input(user, "Choose your character's facial-hair style:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.f_style) as null|anything in valid_facialhairstyles
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_f_style && CanUseTopic(user) && mob_species.get_facial_hair_styles(pref.gender))
pref.f_style = new_f_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -238,7 +238,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_NOACTION
new_h_style = valid_hairstyles[old_pos+1]
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_h_style && CanUseTopic(user) && (new_h_style in mob_species.get_hair_styles()))
pref.h_style = new_h_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -254,7 +254,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(old_pos + 1 > valid_facialhairstyles.len)
return TOPIC_NOACTION
new_f_style = valid_facialhairstyles[old_pos+1]
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_f_style && CanUseTopic(user) && mob_species.get_facial_hair_styles(pref.gender))
pref.f_style = new_f_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -267,7 +267,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/proc/ResetHair()
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
var/list/valid_hairstyles = mob_species.get_hair_styles()
if(valid_hairstyles.len)
@@ -280,7 +280,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/proc/ResetFacialHair()
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
var/list/valid_facialhairstyles = mob_species.get_facial_hair_styles(pref.gender)
if(valid_facialhairstyles.len)
diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm
index d36ffe3110c..0b219b00495 100644
--- a/code/modules/client/preference_setup/global/01_ui.dm
+++ b/code/modules/client/preference_setup/global/01_ui.dm
@@ -1,7 +1,8 @@
/datum/preferences
//var/clientfps = 0
//game-preferences
- var/ooccolor = "#010000" //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
+ var/ooccolor //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
+ var/asaycolor //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
var/UI_style = "ErisStyle"
var/UI_useborder = 0
var/UI_style_color = "#ffffff"
@@ -17,6 +18,7 @@
S["UI_style_color"] >> pref.UI_style_color
S["UI_style_alpha"] >> pref.UI_style_alpha
S["ooccolor"] >> pref.ooccolor
+ S["asaycolor"] >> pref.asaycolor
//S["clientfps"] >> pref.clientfps
/datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S)
@@ -24,13 +26,15 @@
S["UI_style_color"] << pref.UI_style_color
S["UI_style_alpha"] << pref.UI_style_alpha
S["ooccolor"] << pref.ooccolor
+ S["asaycolor"] << pref.asaycolor
//S["clientfps"] << pref.clientfps
/datum/category_item/player_setup_item/player_global/ui/sanitize_preferences()
pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
pref.UI_style_color = sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color))
pref.UI_style_alpha = sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha))
- pref.ooccolor = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))
+ pref.ooccolor = sanitize_hexcolor(pref.ooccolor, GLOB.OOC_COLOR)
+ pref.asaycolor = sanitize_hexcolor(pref.asaycolor, DEFAULT_ASAY_COLOR)
//pref.clientfps = sanitize_integer(pref.clientfps, CLIENT_MIN_FPS, CLIENT_MAX_FPS, initial(pref.clientfps))
/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
@@ -41,10 +45,17 @@
. += "-Alpha(transparency): [pref.UI_style_alpha] reset
"
if(can_select_ooc_color(user))
. += "OOC Color:"
- if(pref.ooccolor == initial(pref.ooccolor))
+ if(pref.ooccolor == GLOB.OOC_COLOR)
. += "Using Default
"
else
. += "[pref.ooccolor] __
reset
"
+ // Just use the same check
+ if(can_select_ooc_color(user))
+ . += "ASAY Color:"
+ if(pref.asaycolor == DEFAULT_ASAY_COLOR)
+ . += "Using Default
"
+ else
+ . += "[pref.asaycolor] __
reset
"
//. += "Client FPS: [pref.clientfps]
"
@@ -76,6 +87,12 @@
pref.ooccolor = new_ooccolor
return TOPIC_REFRESH
+ else if(href_list["select_asay_color"])
+ var/new_asaycolor = input(user, "Choose ASAY color:", "Global Preference") as color|null
+ if(new_asaycolor && can_select_asay_color(user) && CanUseTopic(user))
+ pref.asaycolor = new_asaycolor
+ return TOPIC_REFRESH
+
/*
else if(href_list["select_fps"])
var/version_message
@@ -99,11 +116,16 @@
if("alpha")
pref.UI_style_alpha = initial(pref.UI_style_alpha)
if("ooc")
- pref.ooccolor = initial(pref.ooccolor)
+ pref.ooccolor = GLOB.OOC_COLOR
+ if("asay")
+ pref.ooccolor = DEFAULT_ASAY_COLOR
pref.client.create_UI()
return TOPIC_REFRESH
return ..()
/proc/can_select_ooc_color(var/mob/user)
- return config.allow_admin_ooccolor && check_rights(R_ADMIN, 0, user)
+ return CONFIG_GET(flag/allow_admin_ooccolor) && check_rights(R_ADMIN, 0, user)
+
+/proc/can_select_asay_color(var/mob/user)
+ return CONFIG_GET(flag/allow_admin_asaycolor) && check_rights(R_ADMIN, 0, user)
diff --git a/code/modules/client/preference_setup/global/05_settings.dm b/code/modules/client/preference_setup/global/05_settings.dm
index 1ed8d9df57f..6983f84c11d 100644
--- a/code/modules/client/preference_setup/global/05_settings.dm
+++ b/code/modules/client/preference_setup/global/05_settings.dm
@@ -59,7 +59,7 @@
pref.preference_values -= key
pref.lastchangelog = sanitize_text(pref.lastchangelog, initial(pref.lastchangelog))
- pref.default_slot = sanitize_integer(pref.default_slot, 1, config.character_slots, initial(pref.default_slot))
+ pref.default_slot = sanitize_integer(pref.default_slot, 1, CONFIG_GET(number/character_slots), initial(pref.default_slot))
/datum/category_item/player_setup_item/player_global/settings/content(var/mob/user)
. = list()
diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm
index e302ebe8639..cef761bb75b 100644
--- a/code/modules/client/preference_setup/loadout/loadout.dm
+++ b/code/modules/client/preference_setup/loadout/loadout.dm
@@ -76,13 +76,13 @@ var/list/gear_datums = list()
. += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character()
- pref.gear_slot = sanitize_integer(pref.gear_slot, 1, config.loadout_slots, initial(pref.gear_slot))
+ pref.gear_slot = sanitize_integer(pref.gear_slot, 1, CONFIG_GET(number/loadout_slots), initial(pref.gear_slot))
if(!islist(pref.gear_list)) pref.gear_list = list()
- if(pref.gear_list.len < config.loadout_slots)
- pref.gear_list.len = config.loadout_slots
+ if(pref.gear_list.len < CONFIG_GET(number/loadout_slots))
+ pref.gear_list.len = CONFIG_GET(number/loadout_slots)
- for(var/index = 1 to config.loadout_slots)
+ for(var/index = 1 to CONFIG_GET(number/loadout_slots))
var/list/gears = pref.gear_list[index]
if(istype(gears))
@@ -98,7 +98,7 @@ var/list/gear_datums = list()
gears -= gear_name
else
var/datum/gear/G = gear_datums[gear_name]
- if(total_cost + G.cost > config.max_gear_cost)
+ if(total_cost + G.cost > CONFIG_GET(number/max_gear_cost))
gears -= gear_name
else
total_cost += G.cost
@@ -121,14 +121,14 @@ var/list/gear_datums = list()
total_cost += G.cost
var/fcolor = "#3366cc"
- if(total_cost < config.max_gear_cost)
+ if(total_cost < CONFIG_GET(number/max_gear_cost))
fcolor = "#e67300"
. += ""
. += ""
. += "\<\<\[[pref.gear_slot]\] \>\>"
- if(config.max_gear_cost < INFINITY)
- . += "[total_cost]/[config.max_gear_cost] loadout points spent."
+ if(CONFIG_GET(number/max_gear_cost) < INFINITY)
+ . += "[total_cost]/[CONFIG_GET(number/max_gear_cost)] loadout points spent."
. += "Clear Loadout"
. += "[hide_unavailable_gear ? "Show all" : "Hide unavailable"] ![]([SSassets.transport.get_asset_url(sanitizeFileName("[P].png"))])
"
+ dat += "![]([SSassets.transport.get_asset_url(SANITIZE_FILENAME("[P].png"))])
"
dat += " [initial(P.name)]
"
dat += "
"
diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm
index bc4a8c34da4..da4b24a2ac6 100644
--- a/code/modules/client/preference_setup/preference_setup.dm
+++ b/code/modules/client/preference_setup/preference_setup.dm
@@ -299,5 +299,5 @@ var/const/CHARACTER_PREFERENCE_INPUT_TITLE = "Character Preference"
return pref.client.mob
/*
/datum/category_item/player_setup_item/proc/preference_species()
- return all_species[pref.species] || all_species[SPECIES_HUMAN]
+ return GLOB.all_species[pref.species] || GLOB.all_species[SPECIES_HUMAN]
*/
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 4fd35afd611..1d3cfd510b0 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -116,8 +116,8 @@
if(isliving(user)) return
if(href_list["preference"] == "open_whitelist_forum")
- if(config.forumurl)
- user << link(config.forumurl)
+ if(CONFIG_GET(string/forumurl))
+ user << link(CONFIG_GET(string/forumurl))
else
to_chat(user, span_danger("The forum URL is not set in the server configuration."))
return
@@ -264,7 +264,7 @@
if(S)
dat += "Select a character slot to load
"
var/name
- for(var/i=1, i<= config.character_slots, i++)
+ for(var/i=1, i<= CONFIG_GET(number/character_slots), i++)
S.cd = GLOB.maps_data.character_load_path(S, i)
S["real_name"] >> name
if(!name) name = "Character[i]"
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index c1f3443d4e8..0fff19de149 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -52,7 +52,7 @@
if(!slot) slot = default_slot
if(slot != SAVE_RESET) // SAVE_RESET will reset the slot as though it does not exist, but keep the current slot for saving purposes.
- slot = sanitize_integer(slot, 1, config.character_slots, initial(default_slot))
+ slot = sanitize_integer(slot, 1, CONFIG_GET(number/character_slots), initial(default_slot))
if(slot != default_slot)
default_slot = slot
S["default_slot"] << slot
diff --git a/code/modules/client/verbs/typing.dm b/code/modules/client/verbs/typing.dm
new file mode 100644
index 00000000000..1177575381f
--- /dev/null
+++ b/code/modules/client/verbs/typing.dm
@@ -0,0 +1,67 @@
+#define IC_VERBS list("say", "me", "whisper")
+
+/client/var/commandbar_thinking = FALSE
+/client/var/commandbar_typing = FALSE
+
+/client/proc/initialize_commandbar_spy()
+ src << output('html/typing_indicator.html', "commandbar_spy")
+
+/client/proc/handle_commandbar_typing(href_list)
+ if (!typing_indicators) //check pref
+ return
+ if (length(href_list["verb"]) < 1 || !(LOWER_TEXT(href_list["verb"]) in IC_VERBS) || text2num(href_list["argument_length"]) < 1)
+ if (commandbar_typing)
+ commandbar_typing = FALSE
+ stop_typing()
+
+ if (commandbar_thinking)
+ commandbar_thinking = FALSE
+ stop_thinking()
+ return
+
+ if (!commandbar_thinking)
+ commandbar_thinking = TRUE
+ start_thinking()
+
+ if (!commandbar_typing)
+ commandbar_typing = TRUE
+ start_typing()
+
+
+/** Sets the mob as "thinking" - with indicator and the TRAIT_THINKING_IN_CHARACTER trait */
+/client/proc/start_thinking()
+ if(!typing_indicators)
+ return FALSE
+ // ADD_TRAIT(mob, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
+ mob.set_typing_indicator(TRUE)
+
+/** Removes typing/thinking indicators and flags the mob as not thinking */
+/client/proc/stop_thinking()
+ mob?.set_typing_indicator(FALSE)
+
+/**
+ * Handles the user typing. After a brief period of inactivity,
+ * signals the client mob to revert to the "thinking" icon.
+ */
+/client/proc/start_typing()
+ var/mob/client_mob = mob
+ client_mob.set_typing_indicator(FALSE)
+ if(!typing_indicators /*|| !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER)*/)
+ return FALSE
+ client_mob.set_typing_indicator(TRUE)
+ addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
+
+/**
+ * Callback to remove the typing indicator after a brief period of inactivity.
+ * If the user was typing IC, the thinking indicator is shown.
+ */
+/client/proc/stop_typing()
+ if(isnull(mob))
+ return FALSE
+ var/mob/client_mob = mob
+ client_mob.set_typing_indicator(FALSE)
+ if(!typing_indicators /*|| !HAS_TRAIT(client_mob, TRAIT_THINKING_IN_CHARACTER)*/)
+ return FALSE
+ client_mob.set_typing_indicator(TRUE)
+
+#undef IC_VERBS
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d039fc747e0..97b6a28a491 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -353,7 +353,7 @@ BLIND // can't see anything
return
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
- user.visible_message("\red [user] cuts the fingertips off of the [src].","\red You cut the fingertips off of the [src].")
+ user.visible_message(span_red("[user] cuts the fingertips off of the [src]."), span_red("You cut the fingertips off of the [src]."))
clipped = 1
name = "modified [name]"
@@ -674,7 +674,7 @@ BLIND // can't see anything
switch(sensor_mode)
if(0)
for(var/mob/V in viewers(usr, 1))
- V.show_message("\red [usr] disables [src.loc]'s remote sensing equipment.", 1)
+ V.show_message(span_red("[usr] disables [src.loc]'s remote sensing equipment."), 1)
if(1)
for(var/mob/V in viewers(usr, 1))
V.show_message("[usr] turns [src.loc]'s remote sensors to binary.", 1)
diff --git a/code/modules/clothing/head/mindreader.dm b/code/modules/clothing/head/mindreader.dm
index 18f0530b786..5892f7050cb 100644
--- a/code/modules/clothing/head/mindreader.dm
+++ b/code/modules/clothing/head/mindreader.dm
@@ -27,7 +27,7 @@
var/mob/user = loc
extract_memory(user)
else
- visible_message("\icon The [src] beeps, \"The [src] is not ready for manual use.\".")
+ visible_message("[icon2html(src, hearers(get_turf(src)))] The [src] beeps, \"The [src] is not ready for manual use.\".")
else
return
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index 4c93ebea306..4d2290125fc 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -129,7 +129,7 @@
for(var/obj/item/piece in list(helmet,gloves,chest,boots))
if(!piece || piece.loc != wearer)
continue
- extra_description += "\n\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
+ extra_description += "\n[icon2html(piece, user)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
if(loc == usr)
extra_description += "\nThe maintenance panel is [open ? "open" : "closed"]."
diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
index c53ce906596..9ae4343a5ae 100644
--- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm
@@ -219,9 +219,9 @@
//For those pesky items which incur effects on the rigsuit, an altclick will force them to go in if possible
/obj/item/rig/AltClick(var/mob/user)
- if (storage && user.get_active_hand())
+ if (storage && user.get_active_held_item())
if (user == loc || Adjacent(user)) //Rig must be on or near you
- storage.accepts_item(user.get_active_hand())
+ storage.accepts_item(user.get_active_held_item())
return
.=..()
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 8d9707cb78b..3914f11cff7 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -675,11 +675,11 @@
/obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
src.active = !( src.active )
if (src.active)
- to_chat(user, "\blue The reactive armor is now active.")
+ to_chat(user, span_blue("The reactive armor is now active."))
src.icon_state = "reactive"
src.item_state = "reactive"
else
- to_chat(user, "\blue The reactive armor is now inactive.")
+ to_chat(user, span_blue("The reactive armor is now inactive."))
src.icon_state = "reactiveoff"
src.item_state = "reactiveoff"
src.add_fingerprint(user)
diff --git a/code/modules/cooking_with_jane/cooking_catalog.dm b/code/modules/cooking_with_jane/cooking_catalog.dm
index 981f6c9c8eb..1f6f5bfdc7e 100644
--- a/code/modules/cooking_with_jane/cooking_catalog.dm
+++ b/code/modules/cooking_with_jane/cooking_catalog.dm
@@ -103,7 +103,7 @@
var/list/data = ..()
data["name"] = recipe.name
data["id"] = recipe.type
- data["icon"] = SSassets.transport.get_asset_url(sanitizeFileName(recipe.icon_image_file))
+ data["icon"] = SSassets.transport.get_asset_url(SANITIZE_FILENAME(recipe.icon_image_file))
data["product_is_reagent"] = 0
if(recipe.product_name)
data["product_name"] = recipe.product_name
@@ -133,7 +133,7 @@
data["name"] = recipe.name
data["id"] = recipe.type
- var/url = SSassets.transport.get_asset_url(sanitizeFileName(recipe.icon_image_file))
+ var/url = SSassets.transport.get_asset_url(SANITIZE_FILENAME(recipe.icon_image_file))
#ifdef CWJ_DEBUG
log_debug("Retrieved [url] for [recipe.icon_image_file]")
#endif
@@ -197,12 +197,12 @@
var/icon/I = null
var/filename = null
if(our_recipe.product_type)
- filename = sanitizeFileName("[our_recipe.product_type].png")
+ filename = SANITIZE_FILENAME("[our_recipe.product_type].png")
I = getFlatTypeIcon(our_recipe.product_type)
else if(our_recipe.reagent_id)
var/obj/item/reagent_containers/food/snacks/dollop/test_dollop = new(null, our_recipe.reagent_id, 1)
- filename = sanitizeFileName("[test_dollop.type][test_dollop.color].png")
+ filename = SANITIZE_FILENAME("[test_dollop.type][test_dollop.color].png")
I = getFlatIcon(test_dollop)
//I.Blend(test_dollop.color) --might not be needed
if(I)
diff --git a/code/modules/cooking_with_jane/cooking_init.dm b/code/modules/cooking_with_jane/cooking_init.dm
deleted file mode 100644
index 2074490ed1c..00000000000
--- a/code/modules/cooking_with_jane/cooking_init.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/proc/initialize_cooking_recipes()
- //All combination path datums, save for the default recipes we don't want.
- var/list/recipe_paths = typesof(/datum/cooking_with_jane/recipe)
- recipe_paths -= /datum/cooking_with_jane/recipe
- for (var/path in recipe_paths)
- var/datum/cooking_with_jane/recipe/example_recipe = new path()
- if(!GLOB.cwj_recipe_dictionary[example_recipe.cooking_container])
- GLOB.cwj_recipe_dictionary[example_recipe.cooking_container] = list()
- GLOB.cwj_recipe_dictionary[example_recipe.cooking_container]["[example_recipe.unique_id]"] = example_recipe
-
- GLOB.cwj_recipe_list += example_recipe
\ No newline at end of file
diff --git a/code/modules/cooking_with_jane/porting_readme.txt b/code/modules/cooking_with_jane/porting_readme.txt
index 3762d7ee22d..62c18e72a1a 100644
--- a/code/modules/cooking_with_jane/porting_readme.txt
+++ b/code/modules/cooking_with_jane/porting_readme.txt
@@ -16,7 +16,9 @@ to function.
- The function call createCookingCatalogs() has to be added at the end of the
/hook/startup/proc/createCatalogs() function.
-- Add # exclusion to the sanitizeFileName function.
+- Add # exclusion to the SANITIZE_FILENAME function.
- The statment hard_drive.store_file(new/datum/computer_file/program/cook_catalog()) should be
added to any PDA's install_default_programs() proc if they should have it at round start
+
+- Must add a processing subsystem @ code/controllers/subsystems/processing/cwj.dm
diff --git a/code/modules/cooking_with_jane/step_types/add_produce.dm b/code/modules/cooking_with_jane/step_types/add_produce.dm
index d17a3d197f0..fa20351f348 100644
--- a/code/modules/cooking_with_jane/step_types/add_produce.dm
+++ b/code/modules/cooking_with_jane/step_types/add_produce.dm
@@ -9,18 +9,18 @@
var/list/exclude_reagents = list()
/datum/cooking_with_jane/recipe_step/add_produce/New(var/produce, var/datum/cooking_with_jane/recipe/our_recipe)
- if(!plant_controller)
+ if(!SSplants)
CRASH("/datum/cooking_with_jane/recipe_step/add_produce/New: Plant controller not initialized! Exiting.")
- if(produce && plant_controller && plant_controller.seeds[produce])
+ if(produce && SSplants && SSplants.seeds[produce])
desc = "Add \a [produce] into the recipe."
required_produce_type = produce
group_identifier = produce
//Get tooltip image for plants
- var/datum/seed/seed = plant_controller.seeds[produce]
+ var/datum/seed/seed = SSplants.seeds[produce]
var/icon_key = "fruit-[seed.get_trait(TRAIT_PRODUCT_ICON)]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"
- if(plant_controller.plant_icon_cache[icon_key])
- tooltip_image = plant_controller.plant_icon_cache[icon_key]
+ if(SSplants.plant_icon_cache[icon_key])
+ tooltip_image = SSplants.plant_icon_cache[icon_key]
else
log_debug("[seed] is missing it's icon to add to tooltip_image")
base_potency = seed.get_trait(TRAIT_POTENCY)
diff --git a/code/modules/core_implant/cruciform/cruciform.dm b/code/modules/core_implant/cruciform/cruciform.dm
index 75bad191f9e..5b2e155fb12 100644
--- a/code/modules/core_implant/cruciform/cruciform.dm
+++ b/code/modules/core_implant/cruciform/cruciform.dm
@@ -212,7 +212,7 @@ var/list/lost_cruciforms = list()
I.take_damage(rand(6,12), BRUTE)
if(I.parent)
I.parent.take_damage(rand(2,5))
- wearer.visible_message(span_notice("\The [AM] rips through \the [wearer]'s flesh."), span_notice("\The [AM] rips through your flesh. Your [I.name] hurts."))
+ wearer.visible_message(span_danger("\The [AM] rips through \the [wearer]'s flesh."), span_danger("\The [AM] rips through your flesh. Your [I.name] hurts!"))
if(ishuman(wearer))
var/mob/living/carbon/human/H = wearer
H.update_implants()
diff --git a/code/modules/core_implant/cruciform/machinery/cruciformforge.dm b/code/modules/core_implant/cruciform/machinery/cruciformforge.dm
index 6aaef49c180..b0722626fd7 100644
--- a/code/modules/core_implant/cruciform/machinery/cruciformforge.dm
+++ b/code/modules/core_implant/cruciform/machinery/cruciformforge.dm
@@ -75,7 +75,7 @@
/obj/machinery/neotheology/cruciformforge/proc/eat(mob/living/user, obj/item/eating)
if(!eating && istype(user))
- eating = user.get_active_hand()
+ eating = user.get_active_held_item()
if(!istype(eating))
return FALSE
diff --git a/code/modules/core_implant/cruciform/rituals/priest.dm b/code/modules/core_implant/cruciform/rituals/priest.dm
index 261533d2ef1..f5fd51c06ab 100644
--- a/code/modules/core_implant/cruciform/rituals/priest.dm
+++ b/code/modules/core_implant/cruciform/rituals/priest.dm
@@ -331,7 +331,7 @@
/datum/ritual/cruciform/priest/divine_blessing/perform(mob/living/carbon/human/user, obj/item/implant/core_implant/C)
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(!I)
fail("You have nothing in your active hand.", user, C)
return FALSE
diff --git a/code/modules/debugging/debugger.dm b/code/modules/debugging/debugger.dm
new file mode 100644
index 00000000000..b89e3d6c53c
--- /dev/null
+++ b/code/modules/debugging/debugger.dm
@@ -0,0 +1,54 @@
+/// The debugger instance.
+/// This is a GLOBAL_REAL because it initializes before the MC or GLOB.
+/// Really only used to check to see if the debugger is enabled or not,
+/// and to separate debugger-related code into its own thing.
+GLOBAL_REAL(Debugger, /datum/debugger)
+
+/datum/debugger
+ /// Is the debugger enabled?
+ VAR_FINAL/enabled = FALSE
+ /// The error text, if initializing the debugger errored.
+ VAR_FINAL/error
+ /// The path to the auxtools debug DLL, if it sets.
+ /// Defaults to the environmental variable AUXTOOLS_DEBUG_DLL.
+ VAR_FINAL/dll_path
+
+/datum/debugger/New(dll_path)
+ if(!isnull(Debugger))
+ CRASH("Attempted to initialize /datum/debugger when global.Debugger is already set!")
+ Debugger = src
+#ifndef OPENDREAM_REAL
+ src.dll_path = dll_path || world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
+ enable()
+#endif
+
+/datum/debugger/Destroy()
+#ifndef OPENDREAM_REAL
+ if(enabled)
+ call_ext(dll_path, "auxtools_shutdown")()
+#endif
+ return ..()
+
+/// Attempt to enable the debugger.
+/datum/debugger/proc/enable()
+#ifndef OPENDREAM_REAL
+ if(enabled)
+ CRASH("Attempted to enable debugger while its already enabled, somehow.")
+ if(!dll_path)
+ return FALSE
+ var/result = call_ext(dll_path, "auxtools_init")()
+ if(result != "SUCCESS")
+ error = result
+ return FALSE
+ enable_debugging()
+ enabled = TRUE
+ return TRUE
+#else
+ return FALSE
+#endif
+
+// /datum/debugger/vv_edit_var(var_name, var_value)
+// return FALSE // no.
+
+// /datum/debugger/CanProcCall(procname)
+// return FALSE // double no.
diff --git a/code/modules/debugging/tracy.dm b/code/modules/debugging/tracy.dm
new file mode 100644
index 00000000000..3655029af51
--- /dev/null
+++ b/code/modules/debugging/tracy.dm
@@ -0,0 +1,75 @@
+/// The byond-tracy instance.
+/// This is a GLOBAL_REAL because it is the VERY FIRST THING to initialize, even before the MC or GLOB.
+GLOBAL_REAL(Tracy, /datum/tracy)
+
+/datum/tracy
+ /// Is byond-tracy enabled and running?
+ VAR_FINAL/enabled = FALSE
+ /// The error text, if initializing byond-tracy errored.
+ VAR_FINAL/error
+ /// A description of what / who enabled byond-tracy.
+ VAR_FINAL/init_reason
+ /// A path to the file containing the output trace, if any.
+ VAR_FINAL/trace_path
+
+/datum/tracy/New()
+ if(!isnull(Tracy))
+ CRASH("Attempted to initialize /datum/tracy when global.Tracy is already set!")
+ Tracy = src
+
+/datum/tracy/Destroy()
+#ifndef OPENDREAM_REAL
+ if(enabled)
+ call_ext(TRACY_DLL_PATH, "destroy")()
+#endif
+ return ..()
+
+/// Tries to initialize byond-tracy.
+/datum/tracy/proc/enable(init_reason)
+#ifndef OPENDREAM_REAL
+ if(enabled)
+ return TRUE
+ src.init_reason = init_reason
+ if(!fexists(TRACY_DLL_PATH))
+ error = "[TRACY_DLL_PATH] not found"
+ SEND_TEXT(world.log, "Error initializing byond-tracy: [error]")
+ return FALSE
+
+ var/init_result = call_ext(TRACY_DLL_PATH, "init")("block")
+ if(length(init_result) != 0 && init_result[1] == ".") // if first character is ., then it returned the output filename
+ SEND_TEXT(world.log, "byond-tracy initialized (logfile: [init_result])")
+ enabled = TRUE
+ return TRUE
+ else if(init_result == "already initialized") // not gonna question it.
+ enabled = TRUE
+ SEND_TEXT(world.log, "byond-tracy already initialized ([trace_path ? "logfile: [trace_path]" : "no logfile"])")
+ return TRUE
+ else if(init_result != "0")
+ error = init_result
+ SEND_TEXT(world.log, "Error initializing byond-tracy: [init_result]")
+ return FALSE
+ else
+ enabled = TRUE
+ SEND_TEXT(world.log, "byond-tracy initialized (no logfile)")
+ return TRUE
+#else
+ error = "OpenDream not supported"
+ return FALSE
+#endif
+
+/datum/tracy/proc/flush()
+ // if trace_path is set, that means we're using para-tracy, which should have this.
+ if(!enabled || !trace_path)
+ return
+ SEND_TEXT(world.log, "Flushing byond-tracy log")
+ var/flush_result = call_ext(TRACY_DLL_PATH, "flush")()
+ if(flush_result != "0")
+ SEND_TEXT(world.log, "Error flushing byond-tracy log: [flush_result]")
+ CRASH("Error flushing byond-tracy log: [flush_result]")
+ SEND_TEXT(world.log, "Flushed byond-tracy log")
+
+// /datum/tracy/vv_edit_var(var_name, var_value)
+// return FALSE // no.
+
+// /datum/tracy/CanProcCall(procname)
+// return FALSE // double no.
diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm
index 805f5ba037b..dc6ad43abd1 100644
--- a/code/modules/detectivework/microscope/dnascanner.dm
+++ b/code/modules/detectivework/microscope/dnascanner.dm
@@ -99,7 +99,7 @@
last_process_worldtime = world.time
/obj/machinery/dnaforensics/proc/complete_scan()
- src.visible_message(span_notice("\icon[src] makes an insistent chime."), 2)
+ src.visible_message(span_notice("[icon2html(src, hearers(get_turf(src)))] makes an insistent chime."), 2)
update_icon()
if(bloodsamp)
var/obj/item/paper/P = new(src)
@@ -111,7 +111,7 @@
if(bloodsamp.dna != null)
data = "Spectometric analysis on provided sample has determined the presence of [bloodsamp.dna.len] strings of DNA.
"
for(var/blood in bloodsamp.dna)
- data += "\blue Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]
"
+ data += span_blue("Blood type: [bloodsamp.dna[blood]]
\nDNA: [blood]
")
else
data += "No DNA found.
"
P.info = "[src] analysis report #[report_num]
"
diff --git a/code/modules/dungeons/teleporter.dm b/code/modules/dungeons/teleporter.dm
index 9cb0a4caa12..c9f8d52c65c 100644
--- a/code/modules/dungeons/teleporter.dm
+++ b/code/modules/dungeons/teleporter.dm
@@ -207,7 +207,7 @@
playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1)
- for (var/mob/living/O in viewers(src, null))
+ for (var/mob/living/O in viewers(get_turf(src)))
if (get_dist(src, O) > 8)
continue
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 5e3d2fa652c..6e61e90ebec 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -35,7 +35,7 @@ log transactions
/obj/machinery/atm/Initialize()
. = ..()
- machine_id = "[station_name] RT #[num_financial_terminals++]"
+ machine_id = "[station_name()] RT #[num_financial_terminals++]"
spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -90,7 +90,7 @@ log transactions
//display a message to the user
var/response = pick("Initiating withdraw. Have a nice day!", "CRITICAL ERROR: Activating cash chamber panic siphon.","PIN Code accepted! Emptying account balance.", "Jackpot!")
- to_chat(user, span_warning("\icon[src] The [src] beeps: \"[response]\""))
+ to_chat(user, span_warning("[icon2html(src, user)] The [src] beeps: \"[response]\""))
return 1
/obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob)
@@ -99,7 +99,7 @@ log transactions
return
if(emagged)
//prevent inserting id into an emagged ATM
- to_chat(user, "\red \icon[src] CARD READER ERROR. This system has been compromised!")
+ to_chat(user, span_red("[icon2html(src, user)] CARD READER ERROR. This system has been compromised!"))
return
else if(istype(I,/obj/item/card/emag))
I.resolve_attackby(src, user)
@@ -134,7 +134,7 @@ log transactions
/obj/machinery/atm/attack_hand(mob/user)
if(issilicon(user))
- to_chat(user, "\red \icon[src] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005.")
+ to_chat(user, span_red("[icon2html(src, user)] Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per system banking regulation #1005."))
return
if (..())
return
@@ -154,7 +154,7 @@ log transactions
dat += span_alert("Maximum number of pin attempts exceeded! Access to this ATM has been temporarily disabled.")
else if(authenticated_account)
if(authenticated_account.suspended)
- dat += "\redAccess to this account has been suspended, and the funds within frozen."
+ dat += span_red(span_bold("Access to this account has been suspended, and the funds within frozen."))
else
switch(view_screen)
if(CHANGE_SECURITY_LEVEL)
@@ -256,9 +256,9 @@ log transactions
var/target_account_number = text2num(href_list["target_acc_number"])
var/transfer_purpose = href_list["purpose"]
if(transfer_funds(authenticated_account.account_number, target_account_number, transfer_purpose, machine_id, transfer_amount))
- to_chat(usr, "\icon[src][span_info("Funds transfer successful.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_info("Funds transfer successful.")]")
else
- to_chat(usr, "\icon[src][span_warning("Funds transfer failed.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Funds transfer failed.")]")
else
to_chat(usr, span_warning("You don't have enough funds to do that!"))
@@ -291,11 +291,11 @@ log transactions
var/datum/transaction/T = new(0, failed_account.owner_name, "Unauthorised login attempt", machine_id)
T.apply_to(failed_account)
else
- to_chat(usr, "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.")
+ to_chat(usr, span_red("[icon2html(src, usr)] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining."))
previous_account_number = tried_account_num
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
else
- to_chat(usr, "\red \icon[src] incorrect pin/account combination entered.")
+ to_chat(usr, span_red("[icon2html(src, usr)] incorrect pin/account combination entered."))
number_incorrect_tries = 0
else
playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
@@ -409,9 +409,9 @@ log transactions
if(!held_card)
//this might happen if the user had the browser window open when somebody emagged it
if(emagged > 0)
- to_chat(usr, "\red \icon[src] The ATM card reader rejected your ID because this machine has been sabotaged!")
+ to_chat(usr, span_red("[icon2html(src, usr)] The ATM card reader rejected your ID because this machine has been sabotaged!"))
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card/id))
usr.drop_item()
I.loc = src
@@ -432,14 +432,14 @@ log transactions
held_card.forceMove(get_turf(src))
authenticated_account = null
- if(ishuman(human_user) && !human_user.get_active_hand())
+ if(ishuman(human_user) && !human_user.get_active_held_item())
human_user.put_in_hands(held_card)
held_card = null
update_icon()
/obj/machinery/atm/proc/spawn_ewallet(var/sum, loc, mob/living/carbon/human/human_user as mob)
var/obj/item/spacecash/ewallet/E = new /obj/item/spacecash/ewallet(loc)
- if(ishuman(human_user) && !human_user.get_active_hand())
+ if(ishuman(human_user) && !human_user.get_active_held_item())
human_user.put_in_hands(E)
E.worth = sum
E.owner_name = authenticated_account.owner_name
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 9bd0818e2bf..4cc2bdf800a 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -56,7 +56,7 @@
purpose = sanitizeSafe(_purpose, MAX_NAME_LEN,TRUE)
source_terminal = _source_terminal
- if(istype(_source_terminal, /atom))
+ if(isatom(_source_terminal))
var/atom/terminal_atom = _source_terminal
source_terminal = "[terminal_atom.name] at [get_area(terminal_atom)]"
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index bd3ab704590..3dee33a4274 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -30,13 +30,13 @@
/obj/machinery/account_database/proc/accounting_letterhead(report_name)
return {"
[report_name]
[station_name] Accounting Report
+ [station_name()] Accounting Report
Generated By: [held_card.registered_name], [held_card.assignment]
"}
/obj/machinery/account_database/New()
- machine_id = "[station_name] Acc. DB #[num_financial_terminals++]"
+ machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]"
..()
/obj/machinery/account_database/attackby(obj/O, mob/user)
@@ -159,12 +159,12 @@
if(held_card)
held_card.loc = src.loc
- if(ishuman(usr) && !usr.get_active_hand())
+ if(ishuman(usr) && !usr.get_active_held_item())
usr.put_in_hands(held_card)
held_card = null
else
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card/id))
var/obj/item/card/id/C = I
usr.drop_item()
diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm
index e168749de48..def0b7aebe2 100644
--- a/code/modules/economy/EFTPOS.dm
+++ b/code/modules/economy/EFTPOS.dm
@@ -15,7 +15,7 @@
/obj/item/device/eftpos/New()
..()
- machine_id = "[station_name] EFTPOS #[num_financial_terminals++]"
+ machine_id = "[station_name()] EFTPOS #[num_financial_terminals++]"
access_code = rand(1111,111111)
spawn(0)
print_reference()
@@ -119,7 +119,7 @@
if(linked_account)
scan_card(I, O)
else
- to_chat(usr, "\icon[src][span_warning("Unable to connect to linked account.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Unable to connect to linked account.")]")
else if (istype(O, /obj/item/spacecash/ewallet))
var/obj/item/spacecash/ewallet/E = O
if (linked_account)
@@ -127,7 +127,7 @@
if(transaction_locked && !transaction_paid)
if(transaction_amount <= E.worth)
playsound(src, 'sound/machines/chime.ogg', 50, 1)
- src.visible_message("\icon[src] \The [src] chimes.")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))] \The [src] chimes.")
transaction_paid = 1
//transfer the money
@@ -137,11 +137,11 @@
var/datum/transaction/T = new(transaction_amount, E.owner_name, transaction_purpose ? transaction_purpose : "None supplied.", machine_id)
T.apply_to(linked_account)
else
- to_chat(usr, "\icon[src][span_warning("\The [O] doesn't have that much money!")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("\The [O] doesn't have that much money!")]")
else
- to_chat(usr, "\icon[src][span_warning("Connected account has been suspended.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Connected account has been suspended.")]")
else
- to_chat(usr, "\icon[src][span_warning("EFTPOS is not connected to an account.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("EFTPOS is not connected to an account.")]")
else
..()
@@ -159,14 +159,14 @@
alert("That is not a valid code!")
print_reference()
else
- to_chat(usr, "\icon[src][span_warning("Incorrect code entered.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Incorrect code entered.")]")
if("change_id")
var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code"))
if(attempt_code == access_code)
eftpos_name = sanitize(input("Enter a new terminal ID for this device", "Enter new EFTPOS ID"), MAX_NAME_LEN) + " EFTPOS scanner"
print_reference()
else
- to_chat(usr, "\icon[src][span_warning("Incorrect code entered.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Incorrect code entered.")]")
if("link_account")
var/attempt_account_num = input("Enter account number to pay EFTPOS charges into", "New account number") as num
var/attempt_pin = input("Enter pin code", "Account pin") as num
@@ -174,9 +174,9 @@
if(linked_account)
if(!linked_account.is_valid())
linked_account = null
- to_chat(usr, "\icon[src][span_warning("Account has been suspended.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Account has been suspended.")]")
else
- to_chat(usr, "\icon[src][span_warning("Account not found.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Account not found.")]")
if("trans_purpose")
var/choice = sanitize(input("Enter reason for EFTPOS transaction", "Transaction purpose"))
if(choice) transaction_purpose = choice
@@ -199,81 +199,91 @@
else if(linked_account)
transaction_locked = 1
else
- to_chat(usr, "\icon[src][span_warning("No account connected to send transactions to.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("No account connected to send transactions to.")]")
if("scan_card")
if(linked_account)
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card))
scan_card(I)
else
- to_chat(usr, "\icon[src][span_warning("Unable to link accounts.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Unable to link accounts.")]")
if("reset")
//reset the access code - requires HoP/captain access
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if (istype(I, /obj/item/card))
var/obj/item/card/id/C = I
if(access_cent_captain in C.access || (access_hop in C.access) || (access_captain in C.access))
access_code = 0
- to_chat(usr, "\icon[src][span_info("Access code reset to 0.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_info("Access code reset to 0.")]")
else if (istype(I, /obj/item/card/emag))
access_code = 0
- to_chat(usr, "\icon[src][span_info("Access code reset to 0.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_info("Access code reset to 0.")]")
src.attack_self(usr)
-/obj/item/device/eftpos/proc/scan_card(var/obj/item/card/I, var/obj/item/ID_container)
- if (istype(I, /obj/item/card/id))
- var/obj/item/card/id/C = I
- if(I==ID_container || ID_container == null)
- usr.visible_message(span_info("\The [usr] swipes a card through \the [src]."))
- else
- usr.visible_message(span_info("\The [usr] swipes \the [ID_container] through \the [src]."))
- if(transaction_locked && !transaction_paid)
- if(linked_account)
- if(linked_account.is_valid())
- var/attempt_pin = ""
- var/datum/money_account/D = get_account(C.associated_account_number)
- if(D.security_level)
- attempt_pin = input("Enter pin code", "EFTPOS transaction") as num
- D = null
- D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
- if(D)
- if(D.is_valid())
- if(transaction_amount <= D.money)
- playsound(src, 'sound/machines/chime.ogg', 50, 1)
- src.visible_message("\icon[src] \The [src] chimes.")
- transaction_paid = 1
+/obj/item/device/eftpos/proc/scan_card(obj/item/card/I, obj/item/ID_container)
+ if (!istype(I, /obj/item/card/id))
+ return
- //transfer the money
- //create entries in the two account transaction logs
- var/datum/transaction/T = new(-transaction_amount, "[linked_account.owner_name] (via [eftpos_name])", transaction_purpose, machine_id)
- T.apply_to(D)
- //
- T = new(
- transaction_amount, D.owner_name,
- transaction_purpose, machine_id
- )
- T.apply_to(linked_account)
- else
- to_chat(usr, "\icon[src][span_warning("You don't have that much money!")]")
- else
- to_chat(usr, "\icon[src][span_warning("Your account has been suspended.")]")
- else
- to_chat(usr, "\icon[src][span_warning("Unable to access account. Check security settings and try again.")]")
- else
- to_chat(usr, "\icon[src][span_warning("Connected account has been suspended.")]")
- else
- to_chat(usr, "\icon[src][span_warning("EFTPOS is not connected to an account.")]")
+ var/obj/item/card/id/C = I
+
+ if(I==ID_container || ID_container == null)
+ usr.visible_message(span_info("\The [usr] swipes a card through \the [src]."))
+ else
+ usr.visible_message(span_info("\The [usr] swipes \the [ID_container] through \the [src]."))
+
+ if(transaction_locked && !transaction_paid)
+ if(!linked_account)
+ to_chat(usr, "[icon2html(src, usr)][span_warning("EFTPOS is not connected to an account.")]")
+ return
+
+ if(!linked_account.is_valid())
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Connected account has been suspended.")]")
+ return
+
+ var/attempt_pin = ""
+ var/datum/money_account/D = get_account(C.associated_account_number)
+ if(D.security_level)
+ attempt_pin = input("Enter pin code", "EFTPOS transaction") as num
+ D = null
+ D = attempt_account_access(C.associated_account_number, attempt_pin, 2)
+
+ if(!D)
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Unable to access account. Check security settings and try again.")]")
+ return
+
+ if(!D.is_valid())
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Your account has been suspended.")]")
+ return
+
+ if(!(transaction_amount <= D.money))
+ to_chat(usr, "[icon2html(src, usr)][span_warning("You don't have that much money!")]")
+ return
+ playsound(src, 'sound/machines/chime.ogg', 50, 1)
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))] \The [src] chimes.")
+ transaction_paid = 1
+
+ //transfer the money
+ //create entries in the two account transaction logs
+ var/datum/transaction/T = new(-transaction_amount, "[linked_account.owner_name] (via [eftpos_name])", transaction_purpose, machine_id)
+ T.apply_to(D)
+ //
+ T = new(
+ transaction_amount, D.owner_name,
+ transaction_purpose, machine_id
+ )
+ T.apply_to(linked_account)
//emag?
-/obj/item/device/eftpos/emag_act(var/remaining_charges, var/mob/user, var/emag_source)
- if(transaction_locked)
- if(transaction_paid)
- to_chat(usr, "\icon[src][span_info("You stealthily swipe \the [emag_source] through \the [src].")]")
- transaction_locked = 0
- transaction_paid = 0
- else
- usr.visible_message(span_info("\The [usr] swipes a card through \the [src]."))
- playsound(src, 'sound/machines/chime.ogg', 50, 1)
- src.visible_message("\icon[src] \The [src] chimes.")
- transaction_paid = 1
+/obj/item/device/eftpos/emag_act(remaining_charges, mob/user, emag_source)
+ if (!transaction_locked)
+ return
+ if(transaction_paid)
+ to_chat(usr, "[icon2html(src, usr)][span_info("You stealthily swipe \the [emag_source] through \the [src].")]")
+ transaction_locked = 0
+ transaction_paid = 0
+ else
+ usr.visible_message(span_info("\The [usr] swipes a card through \the [src]."))
+ playsound(src, 'sound/machines/chime.ogg', 50, 1)
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))] \The [src] chimes.")
+ transaction_paid = 1
diff --git a/code/modules/economy/Events.dm b/code/modules/economy/Events.dm
index 24524f61aad..97fdb20acbc 100644
--- a/code/modules/economy/Events.dm
+++ b/code/modules/economy/Events.dm
@@ -73,7 +73,7 @@
body = "A small [pick("pirate","Cybersun Industries","Gorlex Marauders","mercenary")] fleet has precise-jumped into proximity with [affected_dest.name], [pick("for a smash-and-grab operation","in a hit and run attack","in an overt display of hostilities")]. Much damage was done, and security has been tightened since the incident."
if(ALIEN_RAIDERS)
if(prob(20))
- body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. [company_name] authorities are standing by to counter attempts at bio-terrorism."
+ body = "The Tiger Co-operative have raided [affected_dest.name] today, no doubt on orders from their enigmatic masters. Stealing wildlife, farm animals, medical research materials and kidnapping civilians. [GLOB.company_name] authorities are standing by to counter attempts at bio-terrorism."
else
body = "[pick("The alien species designated \'United Exolitics\'","The alien species designated \'REDACTED\'","An unknown alien species")] have raided [affected_dest.name] today, stealing wildlife, farm animals, medical research materials and kidnapping civilians. It seems they desire to learn more about us, so the Navy will be standing by to accomodate them next time they try."
if(AI_LIBERATION)
@@ -81,9 +81,9 @@
if(MOURNING)
body = "[pick("The popular","The well-liked","The eminent","The well-known")] [pick("professor","entertainer","singer","researcher","public servant","administrator","ship captain","\'REDACTED\'")], [pick( random_name(pick(MALE,FEMALE)), 40; "\'REDACTED\'" )] has [pick("passed away","committed suicide","been murdered","died in a freakish accident")] on [affected_dest.name] today. The entire planet is in mourning, and prices have dropped for industrial goods as worker morale drops."
if(CULT_CELL_REVEALED)
- body = "A [pick("dastardly","blood-thirsty","villanous","crazed")] cult of [pick("The Elder Gods","Nar'sie","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on [company_name] facilities."
+ body = "A [pick("dastardly","blood-thirsty","villanous","crazed")] cult of [pick("The Elder Gods","Nar'sie","an apocalyptic sect","\'REDACTED\'")] has [pick("been discovered","been revealed","revealed themselves","gone public")] on [affected_dest.name] earlier today. Public morale has been shaken due to [pick("certain","several","one or two")] [pick("high-profile","well known","popular")] individuals [pick("performing \'REDACTED\' acts","claiming allegiance to the cult","swearing loyalty to the cult leader","promising to aid to the cult")] before those involved could be brought to justice. The editor reminds all personnel that supernatural myths will not be tolerated on [GLOB.company_name] facilities."
if(SECURITY_BREACH)
- body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all [company_name] personnel that such lapses are rare."
+ body = "There was [pick("a security breach in","an unauthorised access in","an attempted theft in","an anarchist attack in","violent sabotage of")] a [pick("high-security","restricted access","classified","\'REDACTED\'")] [pick("\'REDACTED\'","section","zone","area")] this morning. Security was tightened on [affected_dest.name] after the incident, and the editor reassures all [GLOB.company_name] personnel that such lapses are rare."
if(ANIMAL_RIGHTS_RAID)
body = "[pick("Militant animal rights activists","Members of the terrorist group Animal Rights Consortium","Members of the terrorist group \'REDACTED\'")] have [pick("launched a campaign of terror","unleashed a swathe of destruction","raided farms and pastures","forced entry to \'REDACTED\'")] on [affected_dest.name] earlier today, freeing numerous [pick("farm animals","animals","\'REDACTED\'")]. Prices for tame and breeding animals have spiked as a result."
if(FESTIVAL)
diff --git a/code/modules/economy/Events_Mundane.dm b/code/modules/economy/Events_Mundane.dm
index 8d9d1570432..2f23fd938f8 100644
--- a/code/modules/economy/Events_Mundane.dm
+++ b/code/modules/economy/Events_Mundane.dm
@@ -22,7 +22,7 @@
if(RESEARCH_BREAKTHROUGH)
body = "A major breakthough in the field of [pick("plasma research","super-compressed materials","nano-augmentation","bluespace research","volatile power manipulation")] \
was announced [pick("yesterday","a few days ago","last week","earlier this month")] by a private firm on [affected_dest.name]. \
- [company_name] declined to comment as to whether this could impinge on profits."
+ [GLOB.company_name] declined to comment as to whether this could impinge on profits."
if(ELECTION)
body = "The pre-selection of an additional candidates was announced for the upcoming [pick("supervisors council","advisory board","governership","board of inquisitors")] \
@@ -32,7 +32,7 @@
"I will maintain my company's record profits","I believe in our future","We must return to our moral core","Just like... chill out dudes")]'."
if(RESIGNATION)
- body = "[company_name] regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
+ body = "[GLOB.company_name] regretfully announces the resignation of [pick("Sector Admiral","Division Admiral","Ship Admiral","Vice Admiral")] [random_name(pick(MALE,FEMALE))]."
if(prob(25))
var/locstring = pick("Segunda","Salusa","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus") + " " + pick("I","II","III","IV","V","VI","VII","VIII")
body += " In a ceremony on [affected_dest.name] this afternoon, they will be awarded the \
@@ -150,9 +150,9 @@
"World largest carp patty at display on [affected_dest.name].",\
"Man travels 7000 light years to retrieve lost hankie, 'It was my favourite'.",\
"New bowling lane that shoots mini-meteors at bowlers very popular.",\
- "[pick("Unathi","Spacer")] gets tattoo of Nyx on chest '[pick("[boss_short]","star","starship","asteroid")] tickles most'.",\
+ "[pick("Unathi","Spacer")] gets tattoo of Nyx on chest '[pick("[GLOB.boss_short]","star","starship","asteroid")] tickles most'.",\
"Chef reports successfully using harmonica as cheese grater.",\
- "[company_name] invents handkerchief that says 'Bless you' after sneeze.",\
+ "[GLOB.company_name] invents handkerchief that says 'Bless you' after sneeze.",\
"Clone accused of posing for other clones�s school photo.",\
"Clone accused of stealing other clones�s employee of the month award.",\
"Woman robs station with hair dryer; crewmen love new style.",\
diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm
index 98a445a007c..acc44bde8da 100644
--- a/code/modules/economy/TradeDestinations.dm
+++ b/code/modules/economy/TradeDestinations.dm
@@ -38,7 +38,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/anansi/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \
- [pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. [company_name] is expected to announce a co-exploitation deal within the fortnight."
+ [pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. [GLOB.company_name] is expected to announce a co-exploitation deal within the fortnight."
return null
/datum/trade_destination/atomos
@@ -61,7 +61,7 @@ var/list/weighted_mundaneevent_locations = list()
/datum/trade_destination/redolant/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
return "Thanks to research conducted on the OAV Redolant, Osiris Atmospherics wishes to announce a major breakthough in the field of \
- [pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. [company_name] is expected to announce a co-exploitation deal within the fortnight."
+ [pick("plasma research","high energy flux capacitance","super-compressed materials","theoretical particle physics")]. [GLOB.company_name] is expected to announce a co-exploitation deal within the fortnight."
return null
/datum/trade_destination/beltway
diff --git a/code/modules/economy/cash.dm b/code/modules/economy/cash.dm
index 5bfd0401242..b8b254f7e64 100644
--- a/code/modules/economy/cash.dm
+++ b/code/modules/economy/cash.dm
@@ -170,7 +170,7 @@
var/obj/item/spacecash/bundle/bundle = new(spawnloc)
bundle.worth = sum
bundle.update_icon()
- if(istype(H) && !H.get_active_hand())
+ if(istype(H) && !H.get_active_held_item())
H.put_in_hands(bundle)
diff --git a/code/modules/economy/cash_register.dm b/code/modules/economy/cash_register.dm
index a03d51d77b5..2a47cff6fb2 100644
--- a/code/modules/economy/cash_register.dm
+++ b/code/modules/economy/cash_register.dm
@@ -28,7 +28,7 @@
// Claim machine ID
/obj/machinery/cash_register/New()
. = ..()
- machine_id = "[station_name] RETAIL #[num_financial_terminals++]"
+ machine_id = "[station_name()] RETAIL #[num_financial_terminals++]"
cash_stored = rand(10, 70)*10
transaction_devices += src // Global reference list to be properly set up by /proc/setup_economy()
@@ -105,7 +105,7 @@
if(try_pin == pin_code)
locked = !locked
else
- to_chat(usr, "\icon[src][span_warning("Insufficient access.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Insufficient access.")]")
else
locked = !locked
to_chat(usr, "You lock cash register.")
@@ -118,9 +118,9 @@
if(linked_account)
if(linked_account.suspended)
linked_account = null
- src.visible_message("\icon[src][span_warning("Account has been suspended.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Account has been suspended.")]")
else
- to_chat(usr, "\icon[src][span_warning("Account not found.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("Account not found.")]")
if("custom_order")
var/t_purpose = sanitize(input("Enter purpose", "New purpose") as text)
if (!t_purpose || !Adjacent(usr)) return
@@ -131,7 +131,7 @@
transaction_amount += t_amount
price_list += t_amount
playsound(src, 'sound/machines/twobeep.ogg', 25)
- src.visible_message("\icon[src][transaction_purpose]: [t_amount] Credit\s.")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][transaction_purpose]: [t_amount] Credit\s.")
if("set_amount")
var/item_name = locate(href_list["item"])
var/n_amount = round(input("Enter amount", "New amount") as num)
@@ -168,7 +168,7 @@
price_list.Cut()
if("reset_log")
transaction_logs.Cut()
- to_chat(usr, "\icon[src][span_notice("Transaction log reset.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_notice("Transaction log reset.")]")
updateDialog()
@@ -213,7 +213,7 @@
return 1
else
confirm_item = I
- src.visible_message("\icon[src]Total price: [transaction_amount] Credit\s. Swipe again to confirm.")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))]Total price: [transaction_amount] Credit\s. Swipe again to confirm.")
playsound(src, 'sound/machines/twobeep.ogg', 25)
return 0
@@ -224,14 +224,14 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
- to_chat(usr, "\icon[src][span_warning("The cash box is open.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("The cash box is open.")]")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(I))
return
if (!linked_account)
- usr.visible_message("\icon[src][span_warning("Unable to connect to linked account.")]")
+ usr.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Unable to connect to linked account.")]")
return
// Access account for transaction
@@ -244,13 +244,13 @@
D = attempt_account_access(I.associated_account_number, attempt_pin, 2)
if(!D)
- src.visible_message("\icon[src][span_warning("Unable to access account. Check security settings and try again.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Unable to access account. Check security settings and try again.")]")
else
if(D.suspended)
- src.visible_message("\icon[src][span_warning("Your account has been suspended.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Your account has been suspended.")]")
else
if(transaction_amount > D.money)
- src.visible_message("\icon[src][span_warning("Not enough funds.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Not enough funds.")]")
else
// Transfer the money
D.money -= transaction_amount
@@ -283,7 +283,7 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
- to_chat(usr, "\icon[src][span_warning("The cash box is open.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("The cash box is open.")]")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(E))
@@ -292,7 +292,7 @@
// Access account for transaction
if(check_account())
if(transaction_amount > E.worth)
- src.visible_message("\icon[src][span_warning("Not enough funds.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Not enough funds.")]")
else
// Transfer the money
E.worth -= transaction_amount
@@ -315,14 +315,14 @@
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
- to_chat(usr, "\icon[src][span_warning("The cash box is open.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("The cash box is open.")]")
return
if((item_list.len > 1 || item_list[item_list[1]] > 1) && !confirm(SC))
return
if(transaction_amount > SC.worth)
- src.visible_message("\icon[src][span_warning("Not enough money.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Not enough money.")]")
else
// Insert cash into magical slot
SC.worth -= transaction_amount
@@ -344,20 +344,20 @@
/obj/machinery/cash_register/proc/scan_item_price(obj/O)
if(!istype(O)) return
if(item_list.len > 10)
- src.visible_message("\icon[src][span_warning("Only up to ten different items allowed per purchase.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Only up to ten different items allowed per purchase.")]")
return
if (cash_open)
playsound(src, 'sound/machines/buzz-sigh.ogg', 25)
- to_chat(usr, "\icon[src][span_warning("The cash box is open.")]")
+ to_chat(usr, "[icon2html(src, usr)][span_warning("The cash box is open.")]")
return
// First check if item has a valid price
var/price = O.get_item_cost()
if(isnull(price))
- src.visible_message("\icon[src][span_warning("Unable to find item in database.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Unable to find item in database.")]")
return
// Call out item cost
- src.visible_message("\icon[src]\A [O]: [price ? "[price] Credit\s" : "free of charge"].")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))]\A [O]: [price ? "[price] Credit\s" : "free of charge"].")
// Note the transaction purpose for later use
if(transaction_purpose)
transaction_purpose += "
"
@@ -390,9 +390,9 @@
var/item_name
for(var/i=1, i<=item_list.len, i++)
item_name = item_list[i]
- dat += "[item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove [price_list[item_name] * item_list[item_name]] þ [item_list[item_name] ? "- Set + [item_list[item_name]] x " : ""][item_name] Remove [price_list[item_name] * item_list[item_name]] þ
"
- dat += "Clear Entry Total Amount: [transaction_amount] þ Clear Entry Total Amount: [transaction_amount] þ
"
return dat
@@ -416,8 +416,8 @@
var/item_name
for(var/i=1, i<=item_list.len, i++)
item_name = item_list[i]
- dat += " [item_list[item_name] ? "[item_list[item_name]] x " : ""][item_name] [price_list[item_name] * item_list[item_name]] þ Total Amount: [transaction_amount] þ [item_list[item_name] ? "[item_list[item_name]] x " : ""][item_name] [price_list[item_name] * item_list[item_name]] þ Total Amount: [transaction_amount] þ
"
transaction_logs += dat
@@ -425,11 +425,11 @@
/obj/machinery/cash_register/proc/check_account()
if (!linked_account)
- usr.visible_message("\icon[src][span_warning("Unable to connect to linked account.")]")
+ usr.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Unable to connect to linked account.")]")
return 0
if(linked_account.suspended)
- src.visible_message("\icon[src][span_warning("Connected account has been suspended.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Connected account has been suspended.")]")
return 0
return 1
@@ -437,7 +437,7 @@
/obj/machinery/cash_register/proc/transaction_complete()
/// Visible confirmation
playsound(src, 'sound/machines/chime.ogg', 25)
- src.visible_message("\icon[src][span_notice("Transaction complete.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_notice("Transaction complete.")]")
flick("register_approve", src)
reset_memory()
updateDialog()
diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm
index e827ef839b7..eb0aa027a88 100644
--- a/code/modules/economy/economy_misc.dm
+++ b/code/modules/economy/economy_misc.dm
@@ -98,7 +98,7 @@ var/global/datum/computer_file/data/email_account/service/payroll/payroll_mailer
if(V.vendor_department)
V.earnings_account = department_accounts[V.vendor_department]
- current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year]"
+ current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [CURRENT_SHIP_YEAR]"
economy_init = 1
return 1
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 58f261f8cc7..7d1953738f3 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -1,6 +1,6 @@
/proc/emoji_parse(text)
. = text
- if(!config.emojis)
+ if(!CONFIG_GET(flag/emojis))
return
var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
var/parsed = ""
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 5dfcadf189f..7922f614992 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -1,131 +1,164 @@
+GLOBAL_VAR_INIT(total_runtimes, GLOB.total_runtimes || 0)
+GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
+
+#ifdef USE_CUSTOM_ERROR_HANDLER
+#define ERROR_USEFUL_LEN 2
+
+var/regex/stack_workaround = regex("[WORKAROUND_IDENTIFIER](.+?)[WORKAROUND_IDENTIFIER]")
var/list/error_last_seen = list()
-// error_cooldown items will either be positive (cooldown time) or negative (silenced error)
-// If negative, starts at -1, and goes down by 1 each time that error gets skipped
-var/list/error_cooldown = list()
-var/total_runtimes = 0
-var/total_runtimes_skipped = 0
-// The ifdef needs to be down here, since the error viewer references total_runtimes
-
-#ifdef DEBUG
-/world/Error(exception/e, datum/e_src)
- if(!istype(e)) // Something threw an unusual exception
- log_to_dd("\[[time_stamp()]] Uncaught exception: [e]")
+var/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
+ If negative, starts at -1, and goes down by 1 each time that error gets skipped*/
+
+/world/Error(exception/E, datum/e_src)
+ GLOB.total_runtimes++
+
+ if(!istype(E)) //Something threw an unusual exception
+ log_world("uncaught runtime error: [E]")
return ..()
- if(!islist(error_last_seen)) // A runtime is occurring too early in start-up initialization
+
+ //this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
+ if(copytext(E.name, 1, 32) == "Maximum recursion level reached")//32 == length() of that string + 1
+ //log to world while intentionally triggering the byond bug.
+ log_world("runtime error: [E.name]\n[E.desc]")
+ //if we got to here without silently ending, the byond bug has been fixed.
+ log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
+ return //this will never happen.
+
+ else if(copytext(E.name, 1, 18) == "Out of resources!")//18 == length() of that string + 1
+ log_world("BYOND out of memory. Restarting ([E?.file]:[E?.line])")
+ TgsEndProcess()
+ . = ..()
+ Reboot(reason = 1)
+ return
+
+
+ if(!error_last_seen) // A runtime is occurring too early in start-up initialization
return ..()
- total_runtimes++
- var/erroruid = "[e.file]:[e.line]"
+ if(!islist(error_last_seen))
+ return ..() //how the fuck?
+
+ if(stack_workaround?.Find(E.name))
+ var/list/data = json_decode(stack_workaround.group[1])
+ E.file = data[1]
+ E.line = data[2]
+ E.name = stack_workaround.Replace(E.name, "")
+
+ var/erroruid = "[E.file][E.line]"
var/last_seen = error_last_seen[erroruid]
var/cooldown = error_cooldown[erroruid] || 0
- if(last_seen == null) // A new error!
+
+ if(last_seen == null)
error_last_seen[erroruid] = world.time
last_seen = world.time
+
if(cooldown < 0)
- error_cooldown[erroruid]-- // Used to keep track of skip count for this error
- total_runtimes_skipped++
- return // Error is currently item_flags & SILENT, skip handling it
- // Handle cooldowns and silencing spammy errors
- var/silencing = 0
- // Each occurrence of a unique error adds to its "cooldown" time...
- cooldown = max(0, cooldown - (world.time - last_seen)) + ERROR_COOLDOWN
+ error_cooldown[erroruid]-- //Used to keep track of skip count for this error
+ GLOB.total_runtimes_skipped++
+ return //Error is currently silenced, skip handling it
+ //Handle cooldowns and silencing spammy errors
+ var/silencing = FALSE
+
+ // We can runtime before config is initialized because BYOND initialize objs/map before a bunch of other stuff happens.
+ // This is a bunch of workaround code for that. Hooray!
+ var/configured_error_cooldown
+ var/configured_error_limit
+ var/configured_error_silence_time
+ if(config?.entries)
+ configured_error_cooldown = CONFIG_GET(number/error_cooldown)
+ configured_error_limit = CONFIG_GET(number/error_limit)
+ configured_error_silence_time = CONFIG_GET(number/error_silence_time)
+ else
+ var/datum/config_entry/CE = /datum/config_entry/number/error_cooldown
+ configured_error_cooldown = initial(CE.default)
+ CE = /datum/config_entry/number/error_limit
+ configured_error_limit = initial(CE.default)
+ CE = /datum/config_entry/number/error_silence_time
+ configured_error_silence_time = initial(CE.default)
+
+
+ //Each occurence of a unique error adds to its cooldown time...
+ cooldown = max(0, cooldown - (world.time - last_seen)) + configured_error_cooldown
// ... which is used to silence an error if it occurs too often, too fast
- if(cooldown > ERROR_MAX_COOLDOWN)
+ if(cooldown > configured_error_cooldown * configured_error_limit)
cooldown = -1
- silencing = 1
+ silencing = TRUE
spawn(0)
usr = null
- sleep(ERROR_SILENCE_TIME)
+ sleep(configured_error_silence_time)
var/skipcount = abs(error_cooldown[erroruid]) - 1
error_cooldown[erroruid] = 0
if(skipcount > 0)
- log_to_dd("\[[time_stamp()]] Skipped [skipcount] runtimes in [e.file],[e.line].")
- error_cache.logError(e, skipCount = skipcount)
+ SEND_TEXT(world.log, "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].")
+ GLOB.error_cache.logError(E, skipCount = skipcount)
+
error_last_seen[erroruid] = world.time
error_cooldown[erroruid] = cooldown
- //this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
- if(copytext(e.name,1,32) == "Maximum recursion level reached")
- //log to world while intentionally triggering the byond bug.
- log_world("runtime error: [e.name]\n[e.desc]")
- //if we got to here without silently ending, the byond bug has been fixed.
- log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
- return
-
- // The detailed error info needs some tweaking to make it look nice
- var/list/srcinfo = null
var/list/usrinfo = null
var/locinfo
- // First, try to make better src/usr info lines
- if(istype(e_src))
- srcinfo = list(" src: [datum_info_line(e_src)]")
- locinfo = atom_loc_line(e_src)
- if(locinfo)
- srcinfo += " src.loc: [locinfo]"
if(istype(usr))
- usrinfo = list(" usr: [datum_info_line(usr)]")
- locinfo = atom_loc_line(usr)
+ usrinfo = list(" usr: [key_name(usr)]")
+ locinfo = loc_name(usr)
if(locinfo)
usrinfo += " usr.loc: [locinfo]"
- // Create a Dusty at the runtime location
- if(prob(10) && (world.time - cat_teleport > cat_cooldown) && (cat_number < cat_max_number)) // Avoid runtime spam spawning lots of Dusty
- new /mob/living/simple_animal/cat/runtime(get_turf(usr))
- cat_teleport = world.time
// The proceeding mess will almost definitely break if error messages are ever changed
- // I apologize in advance
- var/list/splitlines = splittext(e.desc, "\n")
+ var/list/splitlines = splittext(E.desc, "\n")
var/list/desclines = list()
- if(splitlines.len > 2) // If there aren't at least three lines, there's no info
+// #ifndef DISABLE_DREAMLUAU
+// var/list/state_stack = GLOB.lua_state_stack
+// var/is_lua_call = length(state_stack)
+// var/list/lua_stacks = list()
+// if(is_lua_call)
+// for(var/level in 1 to state_stack.len)
+// lua_stacks += list(splittext(DREAMLUAU_GET_TRACEBACK(level), "\n"))
+// #endif
+ if(LAZYLEN(splitlines) > ERROR_USEFUL_LEN) // If there aren't at least three lines, there's no info
for(var/line in splitlines)
- if(length(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:"))
- continue // Blank line, skip it
+ if(LAZYLEN(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:"))
+ continue
if(findtext(line, "usr:"))
if(usrinfo)
desclines.Add(usrinfo)
usrinfo = null
continue // Our usr info is better, replace it
- if(srcinfo)
- if(findtext(line, "src.loc:"))
- continue
- if(findtext(line, "src:"))
- desclines.Add(srcinfo)
- srcinfo = null
- continue
- if(copytext(line, 1, 3) != " ")
+
+ if(copytext(line, 1, 3) != " ")//3 == length(" ") + 1
desclines += (" " + line) // Pad any unpadded lines, so they look pretty
else
desclines += line
- if(srcinfo) // If these aren't null, they haven't been added yet
- desclines.Add(srcinfo)
- if(usrinfo)
+ if(usrinfo) //If this info isn't null, it hasn't been added yet
desclines.Add(usrinfo)
+// #ifndef DISABLE_DREAMLUAU
+// if(is_lua_call)
+// SSlua.log_involved_runtime(E, desclines, lua_stacks)
+// #endif
if(silencing)
- desclines += " (This error will now be item_flags & SILENT for [ERROR_SILENCE_TIME / 600] minutes)"
- if(error_cache)
- error_cache.logError(e, desclines, e_src = e_src)
-
- // Now to actually output the error info...
- var/main_line = "\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]"
- log_to_dd(main_line)
- send2coders(message = "[main_line] \n [jointext(desclines, "\n")]", color = "#0000ff")
+ desclines += " (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])"
+ if(GLOB.error_cache)
+ GLOB.error_cache.logError(E, desclines)
+
+ var/main_line = "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]"
+ SEND_TEXT(world.log, main_line)
for(var/line in desclines)
- log_to_dd(line)
+ SEND_TEXT(world.log, line)
#ifdef UNIT_TESTS
if(GLOB.current_test)
//good day, sir
- GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]")
+ GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]", file = E.file, line = E.line)
#endif
+
+ if(Debugger?.enabled)
+ to_chat(world, span_alertwarning("[main_line]"), type = MESSAGE_TYPE_DEBUG)
+
+ // This writes the regular format (unwrapping newlines and inserting timestamps as needed).
+ log_runtime("runtime error: [E.name]\n[E.desc]", list(
+ "file" = "[E.file || "unknown"]",
+ "line" = E.line,
+ "name" = "[E.name]",
+ "desc" = "[E.desc]"
+ ))
#endif
-/proc/log_runtime(exception/e, datum/e_src, extra_info)
- if(!istype(e))
- world.Error(e, e_src)
- return
- if(extra_info)
- // Adding extra info adds two newlines, because parsing runtimes is funky
- if(islist(extra_info))
- e.desc = " [jointext(extra_info, "\n ")]\n\n" + e.desc
- else
- e.desc = " [extra_info]\n\n" + e.desc
- world.Error(e, e_src)
+#undef ERROR_USEFUL_LEN
diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm
index 520b9403756..999990022a9 100644
--- a/code/modules/error_handler/error_viewer.dm
+++ b/code/modules/error_handler/error_viewer.dm
@@ -8,10 +8,10 @@
// right here:
#ifdef DEBUG
-var/global/datum/ErrorViewer/ErrorCache/error_cache = new()
+GLOBAL_DATUM_INIT(error_cache, /datum/ErrorViewer/ErrorCache, new)
#else
// If debugging is disabled, there's nothing useful to log, so don't bother.
-var/global/datum/ErrorViewer/ErrorCache/error_cache = null
+GLOBAL_DATUM(error_cache, /datum/ErrorViewer/ErrorCache)
#endif
// - ErrorSource datums exist for each line (of code) that generates an error,
@@ -71,7 +71,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
back_to_param = ";viewruntime_backto=\ref[back_to]"
if(linear)
back_to_param += ";viewruntime_linear=1"
- return "[html_encode(linktext)]"
+ return "[html_encode(linktext)]"
/datum/ErrorViewer/ErrorCache
var/list/errors = list()
@@ -80,7 +80,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
/datum/ErrorViewer/ErrorCache/showTo(var/user, var/datum/ErrorViewer/back_to, var/linear)
var/html = buildHeader(null, linear, refreshable=1)
- html += "[total_runtimes] runtimes, [total_runtimes_skipped] skipped
"
+ html += "[GLOB.total_runtimes] runtimes, [GLOB.total_runtimes_skipped] skipped
"
if(!linear)
html += "organized | [makeLink("linear", null, 1)]
"
var/datum/ErrorViewer/ErrorSource/error_source
@@ -129,7 +129,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
/datum/ErrorViewer/ErrorSource/showTo(var/user, var/datum/ErrorViewer/back_to, var/linear)
if(!istype(back_to))
- back_to = error_cache
+ back_to = GLOB.error_cache
var/html = buildHeader(back_to, refreshable=1)
for(var/datum/ErrorViewer/ErrorEntry/error_entry in errors)
html += "[error_entry.makeLink(null, src)]
"
@@ -174,20 +174,20 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
var/html = buildHeader(back_to, linear)
html += "[html_encode(name)]
[desc]"
if(srcRef)
- html += "
src: VV"
+ html += "
src: VV"
if(ispath(srcType, /mob))
- html += " PP"
- html += " Follow"
+ html += " [ADMIN_PP(srcRef)]"
+ html += " [ADMIN_FLW(srcRef)]"
if(istype(srcLoc))
- html += "
src.loc: VV"
- html += " JMP"
+ html += "
src.loc: [ADMIN_VV(srcLoc)]"
+ html += " [ADMIN_JMP(srcLoc)]"
if(usrRef)
- html += "
usr: VV"
- html += " PP"
- html += " Follow"
+ html += "
usr: [ADMIN_VV(usrRef)]"
+ html += " [ADMIN_PP(usrRef)]"
+ html += " [ADMIN_FLW(usrRef)]"
if(istype(usrLoc))
- html += "
usr.loc: VV"
- html += " JMP"
+ html += "
usr.loc: VV"
+ html += " [ADMIN_JMP(usrLoc)]"
browseTo(user, html)
/datum/ErrorViewer/ErrorEntry/makeLink(var/linktext, var/datum/ErrorViewer/back_to, var/linear)
diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm
index 72bbe729b45..b235e8a1f69 100644
--- a/code/modules/examine/examine.dm
+++ b/code/modules/examine/examine.dm
@@ -33,4 +33,4 @@
return ..()
/mob/living/carbon/human/get_description_fluff()
- return print_flavor_text(0)
+ return get_flavor_text(0)
diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm
index 77a15d639ba..a627293ffb0 100644
--- a/code/modules/ext_scripts/irc.dm
+++ b/code/modules/ext_scripts/irc.dm
@@ -1,10 +1,10 @@
/proc/send2irc(var/channel, var/msg)
- if(config.use_irc_bot && config.irc_bot_host)
- if(config.irc_bot_export)
+ if(CONFIG_GET(flag/use_irc_bot) && CONFIG_GET(string/irc_bot_host))
+ if(CONFIG_GET(flag/irc_bot_export))
spawn(-1) // spawn here prevents hanging in the case that the bot isn't reachable
- world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]")
+ world.Export("http://[CONFIG_GET(string/irc_bot_host)]:45678?[list2params(list(pwd=CONFIG_GET(string/comms_key), chan=channel, mesg=msg))]")
else
- if(config.use_lib_nudge)
+ if(CONFIG_GET(flag/use_lib_nudge))
var/nudge_lib
if(world.system_type == MS_WINDOWS)
nudge_lib = "lib\\nudge.dll"
@@ -12,24 +12,24 @@
nudge_lib = "lib/nudge.so"
spawn(0)
- LIBCALL(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]")
+ LIBCALL(nudge_lib, "nudge")("[CONFIG_GET(string/comms_key)]","[CONFIG_GET(string/irc_bot_host)]","[channel]","[msg]")
else
spawn(0)
- ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
+ ext_python("ircbot_message.py", "[CONFIG_GET(string/comms_key)] [CONFIG_GET(string/irc_bot_host)] [channel] [msg]")
return
/proc/send2mainirc(var/msg)
- if(config.main_irc)
- send2irc(config.main_irc, msg)
+ if(CONFIG_GET(string/main_irc))
+ send2irc(CONFIG_GET(string/main_irc), msg)
return
/proc/send2adminirc(var/msg)
- if(config.admin_irc)
- send2irc(config.admin_irc, msg)
+ if(CONFIG_GET(string/admin_irc))
+ send2irc(CONFIG_GET(string/admin_irc), msg)
return
/hook/startup/proc/ircNotify()
- send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
+ send2mainirc("Server starting up on byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]")
return 1
diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm
index 9b798d80cae..3287d463ace 100644
--- a/code/modules/ext_scripts/python.dm
+++ b/code/modules/ext_scripts/python.dm
@@ -4,6 +4,6 @@
if(world.system_type == MS_WINDOWS)
script = replacetext(script, "/", "\\")
- var/command = config.python_path + " " + script + " " + args
+ var/command = CONFIG_GET(string/python_path) + " " + script + " " + args
return shell(command)
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 59474f99735..46755bf6307 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -19,7 +19,7 @@ var/list/dreams = list(
spawn(0)
for(var/i = rand(1,4),i > 0, i--)
- to_chat(src, "\blue ... [pick(dreams)] ...")
+ to_chat(src, span_blue("... [pick(dreams)] ..."))
sleep(rand(40,70))
if(paralysis <= 0)
dreaming = 0
diff --git a/code/modules/food/drywet.dm b/code/modules/food/drywet.dm
index f957dcb6754..06d20791202 100644
--- a/code/modules/food/drywet.dm
+++ b/code/modules/food/drywet.dm
@@ -197,7 +197,7 @@
/obj/item/reagent_containers/drywet/attack_hand(mob/user)
add_fingerprint(user)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
var/obj/item/taken = pickweight_n_take(solids)
if(taken)
untaken_capacity += taken.get_storage_cost() ** 2
diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm
index af4016bc0a9..f92b43d18e1 100644
--- a/code/modules/games/boardgame.dm
+++ b/code/modules/games/boardgame.dm
@@ -141,7 +141,7 @@
var/mob/living/carbon/human/H = locate(href_list["person"])
if(!istype(H))
return
- var/obj/item/O = H.get_active_hand()
+ var/obj/item/O = H.get_active_held_item()
if(!O)
return
addPiece(O,H,text2num(s))
diff --git a/code/modules/genetics/stationary_scanner_console.dm b/code/modules/genetics/stationary_scanner_console.dm
index 069948aac6e..e3dbb40f0fc 100644
--- a/code/modules/genetics/stationary_scanner_console.dm
+++ b/code/modules/genetics/stationary_scanner_console.dm
@@ -47,7 +47,7 @@
var/wires_state = "console_wires"
if(!(stat & (NOPOWER|BROKEN)) && use_power)
- if(SSnano.open_uis["\ref[src]"])
+ if(SSnano._open_uis["\ref[src]"])
screen_state += "_on"
spawn(1.5 SECONDS)
.() // If UI is open - run check every 1.5 seconds until it's closed
diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm
index 472fc2d889a..f5b1b7b56f4 100644
--- a/code/modules/ghosttrap/trap.dm
+++ b/code/modules/ghosttrap/trap.dm
@@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(ghost_trap_users)
// Fluff!
/datum/ghosttrap/proc/welcome_candidate(var/mob/target)
- to_chat(target, "You are a positronic brain, brought into existence on [station_name].")
+ to_chat(target, "You are a positronic brain, brought into existence on [station_name()].")
to_chat(target, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.")
to_chat(target, "Remember, the purpose of your existence is to serve the crew and the ship. Above all else, do no harm.")
to_chat(target, "Use say [target.get_language_prefix()]b to speak to other artificial intelligences.")
diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm
deleted file mode 100644
index ab3b286a949..00000000000
--- a/code/modules/goonchat/browserOutput.dm
+++ /dev/null
@@ -1,286 +0,0 @@
-/*********************************
-For the main html chat area
-*********************************/
-GLOBAL_VAR_INIT(goonchatbasehtml, file2text('code/modules/goonchat/browserassets/html/browserOutput.html'))
-
-//On client, created on login
-/datum/chatOutput
- var/client/owner //client ref
- var/loaded = FALSE // Has the client loaded the browser output area?
- var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do
- var/cookieSent = FALSE // Has the client sent a cookie for analysis
- var/broken = FALSE
- var/list/connectionHistory //Contains the connection history passed from chat cookie
- var/adminMusicVolume = 25 //This is for the Play Global Sound verb
-
-/datum/chatOutput/New(client/C)
- owner = C
- messageQueue = list()
- connectionHistory = list()
-
-/datum/chatOutput/proc/start()
- //Check for existing chat
- if(!owner)
- return FALSE
-
- if(!winexists(owner, "browseroutput")) // Oh goddamnit.
- set waitfor = FALSE
- broken = TRUE
- message_admins("Couldn't start chat for [key_name_admin(owner)]!")
- . = FALSE
- alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.")
- return
-
- if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup
- doneLoading()
-
- else //Not setup
- load()
-
- return TRUE
-
-/datum/chatOutput/proc/load()
- set waitfor = FALSE
- if(!owner)
- return
-
- var/datum/asset/group/gc = get_asset_datum(/datum/asset/group/goonchat)
-
- if (gc.send(owner))
- owner.browse_queue_flush() // stall loading html until goochant actualy gets sent
-
- var/html = GLOB.goonchatbasehtml
- html = replacetextEx(html, "%FONTAWESOME%", SSassets.transport.get_asset_url("font-awesome.css"))
-
- owner << browse(html, "window=browseroutput")
-
-/datum/chatOutput/Topic(href, list/href_list)
- if(usr.client != owner)
- return TRUE
-
- // Build arguments.
- // Arguments are in the form "param[paramname]=thing"
- var/list/params = list()
- for(var/key in href_list)
- if(length_char(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template.
- var/param_name = copytext_char(key, 7, -1)
- var/item = href_list[key]
-
- params[param_name] = item
-
- var/data // Data to be sent back to the chat.
- switch(href_list["proc"])
- if("doneLoading")
- data = doneLoading(arglist(params))
-
- if("debug")
- data = debug(arglist(params))
-
- if("ping")
- data = ping(arglist(params))
-
- if("analyzeClientData")
- data = analyzeClientData(arglist(params))
-
- if("setMusicVolume")
- data = setMusicVolume(arglist(params))
- if("swaptodarkmode")
- swaptodarkmode()
- if("swaptolightmode")
- swaptolightmode()
- if("enable_fullscreen")
- enable_fullscreen()
- if("disable_fullscreen")
- disable_fullscreen()
-
- if(data)
- ehjax_send(data = data)
-
-
-//Called on chat output done-loading by JS.
-/datum/chatOutput/proc/doneLoading()
- if(loaded)
- return
-
- loaded = TRUE
- showChat()
-
-
- for(var/message in messageQueue)
- // whitespace has already been handled by the original to_chat
- to_chat(owner, message, handle_whitespace=FALSE)
-
- messageQueue = null
- sendClientData()
-
- //do not convert to to_chat()
- owner << "Failed to load fancy chat, reverting to old chat. Certain features won't work."
-
-/datum/chatOutput/proc/showChat()
- winset(owner, "output", "is-visible=false")
- winset(owner, "browseroutput", "is-disabled=false;is-visible=true")
-
-/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data)
- if(islist(data))
- data = json_encode(data)
- C << output("[data]", "[window]:ehjaxCallback")
-
-/datum/chatOutput/proc/sendMusic(music, list/extra_data)
- if(!findtext(music, GLOB.is_http_protocol))
- return
- var/list/music_data = list("adminMusic" = url_encode(url_encode(music)))
-
- if(extra_data?.len)
- music_data["musicRate"] = extra_data["pitch"]
- music_data["musicSeek"] = extra_data["start"]
- music_data["musicHalt"] = extra_data["end"]
-
- ehjax_send(data = music_data)
-
-/datum/chatOutput/proc/stopMusic()
- ehjax_send(data = "stopMusic")
-
-/datum/chatOutput/proc/setMusicVolume(volume = "")
- if(volume)
- adminMusicVolume = CLAMP(text2num(volume), 0, 100)
-
-//Sends client connection details to the chat to handle and save
-/datum/chatOutput/proc/sendClientData()
- //Get dem deets
- var/list/deets = list("clientData" = list())
- deets["clientData"]["ckey"] = owner.ckey
- deets["clientData"]["ip"] = owner.address
- deets["clientData"]["compid"] = owner.computer_id
- var/data = json_encode(deets)
- ehjax_send(data = data)
-
-//Called by client, sent data to investigate (cookie history so far)
-/datum/chatOutput/proc/analyzeClientData(cookie = "")
- if(!cookie)
- return
-
- if(cookie != "none")
- var/regex/crashy_thingy = regex("^\\s*(\[\\\[\\{\\}\\\]\]\\s*){5,}")
- if(crashy_thingy.Find(cookie))
- log_and_message_admins("[key_name(owner)] tried to crash the server using at least 5 \"\[\" in a row. Ban them.")
- return
-
- var/list/connData = json_decode(cookie)
- if (connData && islist(connData) && connData.len > 0 && connData["connData"])
- connectionHistory = connData["connData"] //lol fuck
- var/list/found = new()
- for(var/i in connectionHistory.len to 1 step -1)
- var/list/row = src.connectionHistory[i]
- if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object
- return
- if (world.IsBanned(row["ckey"], row["ip"], row["compid"], real_bans_only=TRUE))
- found = row
- break
-
- //Uh oh this fucker has a history of playing on a banned account!!
- if (found.len > 0)
- //TODO: add a new evasion ban for the CURRENT client details, using the matched row details
- message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
- //log_admin_private("[key_name(owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])")
- for(var/client/A in GLOB.admins)
- if(A.get_preference_value(/datum/client_preference/staff/play_adminhelp_ping) == GLOB.PREF_HEAR)
- sound_to(A, 'sound/effects/adminhelp.ogg')
-
- cookieSent = TRUE
-
-//Called by js client every 60 seconds
-/datum/chatOutput/proc/ping()
- return "pong"
-
-//Called by js client on js error
-/datum/chatOutput/proc/debug(error)
- log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]")
-
-//Global chat procs
-/proc/to_chat_immediate(target, message, handle_whitespace = TRUE)
- if(!target || !message)
- return
-
- if(target == world)
- target = GLOB.clients
-
- var/original_message = message
- if(handle_whitespace)
- message = replacetext(message, "\n", "
")
- message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]")
-
- //Replace expanded \icon macro with icon2html
- //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc
- //not even hacks with reassigning usr work
- var/regex/i = new(@//, "g")
- while(i.Find(message))
- message = copytext(message,1,i.index)+icon2html(locate(i.group[1]), target, icon_state=i.group[2])+copytext(message,i.next)
-
- message = \
- symbols_to_unicode(
- strip_improper(
- color_macro_to_html(
- message
- )
- )
- )
-
- if(islist(target))
- // Do the double-encoding outside the loop to save nanoseconds
- var/twiceEncoded = url_encode(url_encode(message))
- for(var/I in target)
- var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
- if (!C)
- continue
-
- //Send it to the old style output window.
- C << original_message
-
- if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
- continue
-
- if(!C.chatOutput.loaded)
- //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
- continue
-
- C << output(twiceEncoded, "browseroutput:output")
- else
- var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
- if (!C)
- return
-
- //Send it to the old style output window.
- C << original_message
-
- if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
- return
-
- if(!C.chatOutput.loaded)
- //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
- return
-
- // url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
- C << output(url_encode(url_encode(message)), "browseroutput:output")
-
-/datum/chatOutput/proc/swaptolightmode() //Dark mode light mode stuff. Yell at KMC if this breaks! (See darkmode.dm for documentation)
- owner.force_white_theme()
-
-/datum/chatOutput/proc/swaptodarkmode()
- owner.force_dark_theme()
-
-/datum/chatOutput/proc/enable_fullscreen()
- owner.enable_fullscreen()
-
-/datum/chatOutput/proc/disable_fullscreen()
- owner.disable_fullscreen()
-
-/proc/to_chat(target, message, handle_whitespace = TRUE, trailing_newline = TRUE)
- if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized)
- to_chat_immediate(target, message, handle_whitespace)
- return
- SSchat.queue(target, message, handle_whitespace, trailing_newline)
-
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
deleted file mode 100644
index ddab34d1f0a..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ /dev/null
@@ -1,448 +0,0 @@
-/*****************************************
-*
-* GLOBAL STYLES
-*
-******************************************/
-html, body {
- padding: 0;
- margin: 0;
- height: 100%;
- color: #a4bad6;
-}
-body {
- background: #171717;
- font-family: Verdana, sans-serif;
- font-size: 9pt;
- font-color: #a4bad6;
- line-height: 1.2;
- overflow-x: hidden;
- overflow-y: scroll;
- word-wrap: break-word;
- scrollbar-face-color:#1A1A1A;
- scrollbar-track-color:#171717;
- scrollbar-highlight-color:#171717;
-}
-
-#examine {
- margin: 1px;
- border: 2px solid #181818;
- padding: 5px;
- background-color:#000000;
-}
-
-em {
- font-style: normal;
- font-weight: bold;
-}
-
-img {
- margin: 0;
- padding: 0;
- line-height: 1;
- -ms-interpolation-mode: nearest-neighbor;
- image-rendering: pixelated;
-}
-img.icon {
- height: 1em;
- min-height: 16px;
- width: auto;
- vertical-align: bottom;
-}
-
-.r:before { /* "repeated" badge class for combined messages */
- content: 'x';
-}
-.r {
- display: inline-block;
- min-width: 0.5em;
- font-size: 0.7em;
- padding: 0.2em 0.3em;
- line-height: 1;
- color: white;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- background-color: crimson;
- border-radius: 10px;
-}
-
-a {color: #397ea5;}
-a.visited {color: #7c00e6;}
-a:visited {color: #7c00e6;}
-a.popt {text-decoration: none;}
-
-/*****************************************
-*
-* OUTPUT NOT RELATED TO ACTUAL MESSAGES
-*
-******************************************/
-#loading {
- position: fixed;
- width: 300px;
- height: 150px;
- text-align: center;
- left: 50%;
- top: 50%;
- margin: -75px 0 0 -150px;
-}
-#loading i {display: block; padding-bottom: 3px;}
-
-#messages {
- font-size: 13px;
- padding: 3px;
- margin: 0;
- word-wrap: break-word;
-}
-#newMessages {
- position: fixed;
- display: block;
- bottom: 0;
- right: 0;
- padding: 8px;
- background: #202020;
- text-decoration: none;
- font-variant: small-caps;
- font-size: 1.1em;
- font-weight: bold;
- color: #a4bad6;
-}
-#newMessages:hover {background: #171717;}
-#newMessages i {vertical-align: middle; padding-left: 3px;}
-#ping {
- position: fixed;
- top: 0;
- right: 180px;
- width: 45px;
- background: #202020;
- height: 30px;
- padding: 8px 0 2px 0;
-}
-#ping i {display: block; text-align: center;}
-#ping .ms {
- display: block;
- text-align: center;
- font-size: 8pt;
- padding-top: 2px;
-}
-#userBar {
- position: fixed;
- top: 0;
- right: 0;
-}
-#userBar .subCell {
- background: #202020;
- height: 30px;
- padding: 5px 0;
- display: block;
- color: #a4bad6;
- text-decoration: none;
- line-height: 28px;
- border-top: 1px solid #171717;
-}
-#userBar .subCell:hover {background: #202020;}
-#userBar .toggle {
- width: 45px;
- background: #202020;
- border-top: 0;
- float: right;
- text-align: center;
-}
-#userBar .sub {clear: both; display: none; width: 180px;}
-#userBar .sub.scroll {overflow-y: scroll;}
-#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
-#userBar .sub span {
- display: block;
- line-height: 30px;
- float: left;
-}
-#userBar .sub i {
- display: block;
- padding: 0 5px;
- font-size: 1.1em;
- width: 22px;
- text-align: center;
- line-height: 30px;
- float: right;
-}
-#userBar .sub input {
- position: absolute;
- padding: 7px 5px;
- width: 121px;
- line-height: 30px;
- float: left;
-}
-#userBar .topCell {border-top: 0;}
-
-/* POPUPS */
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-.popup .close:hover {background: #999;}
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
- border-bottom: 2px solid green;
-}
-.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;}
-.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;}
-.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;}
-.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;}
-
-.changeFont {padding: 10px;}
-.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;}
-.changeFont a:hover {background: #ccc;}
-
-.highlightPopup {padding: 10px; text-align: center;}
-.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;}
-.highlightPopup input.highlightColor {background-color: #FFFF00;}
-.highlightPopup input.highlightTermSubmit {margin-top: 5px;}
-
-/* ADMIN CONTEXT MENU */
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
-}
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
-}
-
-.contextMenu a:hover {
- background-color: #ccc;
-}
-
-/* ADMIN FILTER MESSAGES MENU */
-.filterMessages {padding: 5px;}
-.filterMessages div {padding: 2px 0;}
-.filterMessages input {}
-.filterMessages label {}
-
-.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;}
-
-
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-.motd {color: #a4bad6; font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;}
-
-/* ADD HERE FOR BOLD */
-.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;}
-
-/* ADD HERE FOR ITALIC */
-.italic, .italics, .emote {font-style: italic;}
-
-/* OUTPUT COLORS */
-.highlight {background: yellow;}
-
-h1, h2, h3, h4, h5, h6 {color: #a4bad6;font-family: Georgia, Verdana, sans-serif;}
-h1.alert, h2.alert {color: #a4bad6;}
-
-em {font-style: normal; font-weight: bold;}
-
-.ooc .everyone {color: #cca300;}
-.adminobserverooc {color: #0099cc; font-weight: bold;}
-.adminooc {color: #3d5bc3; font-weight: bold;}
-
-.adminsay {color: #ff4500; font-weight: bold;}
-.admin {color: #5975da; font-weight: bold;}
-
-.name { font-weight: bold;}
-
-.say {}
-.deadsay {color: #e2c1ff}
-.binarysay {color: #20c20e; background-color: #000000; display: block;}
-.binarysay a {color: #00ff00;}
-.binarysay a:active, .binarysay a:visited {color: #88ff88;}
-.radio {color: #1ecc43;}
-.sciradio {color: #c68cfa;}
-.comradio {color: #5177ff;}
-.secradio {color: #dd3535;}
-.medradio {color: #57b8f0;}
-.engradio {color: #f37746;}
-.suppradio {color: #b88646;}
-.servradio, .srvradio {color: #6ca729;}
-.syndradio {color: #8f4a4b;}
-.centcomradio {color: #2681a5;}
-.aiprivradio, .airadio {color: #d65d95;}
-.ntradio {color: #D4AF37;}
-.redteamradio {color: #ff4444;}
-.blueteamradio {color: #3434fd;}
-
-.yell { font-weight: bold;}
-
-.alert {color: #d82020;}
-
-.emote { font-style: italic;}
-.selecteddna {color: #ffffff; background-color: #001B1B}
-
-.attack {color: #e01c1c;}
-.disarm {color: #b42525;}
-.passive {color: #a00f0f;}
-
-.userdanger {color: #c51e1e; font-weight: bold; font-size: 24px;}
-.danger {color: #c51e1e; font-weight: bold;}
-.warning {color: #c51e1e; font-style: italic;}
-.alertwarning {color: #FF0000; font-weight: bold}
-.boldwarning {color: #c51e1e; font-style: italic; font-weight: bold}
-.announce {color: #c51e1e; font-weight: bold;}
-.boldannounce {color: #c51e1e; font-weight: bold;}
-.greenannounce {color: #059223; font-weight: bold;}
-.rose {color: #ff5050;}
-.info {color: #6685f5;}
-.notice {color: #6685f5;}
-.boldnotice {color: #6685f5; font-weight: bold;}
-.adminnotice {color: #6685f5;}
-.adminhelp {color: #ff0000; font-weight: bold;}
-.unconscious {color: #a4bad6; font-weight: bold;}
-.suicide {color: #ff5050; font-style: italic;}
-.green {color: #059223;}
-.red {color: #FF0000}
-.blue {color: #215cff}
-.nicegreen {color: #059223;}
-.shadowling {color: #8e8a99;}
-.cult {color: #aa1c1c;}
-
-.cultitalic {color: #aa1c1c; font-style: italic;}
-.cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;}
-.cultboldtalic {color: #aa1c1c; font-weight: bold; font-size: 24px;}
-
-.cultlarge {color: #aa1c1c; font-weight: bold; font-size: 24px;}
-.narsie {color: #aa1c1c; font-weight: bold; font-size: 120px;}
-.narsiesmall {color: #aa1c1c; font-weight: bold; font-size: 48px;}
-.colossus {color: #7F282A; font-size: 40px;}
-.hierophant {color: #b441ee; font-weight: bold; font-style: italic;}
-.hierophant_warning {color: #c56bf1; font-style: italic;}
-.purple {color: #9956d3;}
-.holoparasite {color: #88809c;}
-
-.revennotice {color: #1d2953;}
-.revenboldnotice {color: #1d2953; font-weight: bold;}
-.revenbignotice {color: #1d2953; font-weight: bold; font-size: 24px;}
-.revenminor {color: #823abb}
-.revenwarning {color: #760fbb; font-style: italic;}
-.revendanger {color: #760fbb; font-weight: bold; font-size: 24px;}
-.umbra {color: #7c00e6;}
-.umbra_emphasis {color: #7c00e6; font-weight: bold; font-style: italic;}
-.umbra_large {color: #7c00e6; font-size: 24px; font-weight: bold; font-style: italic;}
-
-.deconversion_message {color: #a947ff; font-size: 24px; font-style: italic;}
-
-.brass {color: #BE8700;}
-.heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;}
-.large_brass {color: #BE8700; font-size: 24px;}
-.big_brass {color: #BE8700; font-size: 24px; font-weight: bold; font-style: italic;}
-.ratvar {color: #BE8700; font-size: 48px; font-weight: bold; font-style: italic;}
-.alloy {color: #42474D;}
-.heavy_alloy {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_large {color: #42474D; font-size: 24px; font-weight: bold; font-style: italic;}
-.nezbere {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_small {color: #42474D;}
-.sevtug_large {color: #AF0AAF; font-size: 24px; font-weight: bold; font-style: italic;}
-.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;}
-.sevtug_small {color: #AF0AAF;}
-.inathneq_large {color: #1E8CE1; font-size: 24px; font-weight: bold; font-style: italic;}
-.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;}
-.inathneq_small {color: #1E8CE1;}
-.nzcrentr_large {color: #DAAA18; font-size: 24px; font-weight: bold; font-style: italic;}
-.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;}
-.nzcrentr_small {color: #DAAA18;}
-.neovgre_large {color: #6E001A; font-size: 24px; font-weight: bold; font-style: italic;}
-.neovgre {color: #6E001A; font-weight: bold; font-style: italic;}
-.neovgre_small {color: #6E001A;}
-
-.newscaster {color: #c05d5d;}
-.ghostalert {color: #6600ff; font-style: italic; font-weight: bold;}
-
-.alien {color: #855d85;}
-.noticealien {color: #059223;}
-.alertalien {color: #059223; font-weight: bold;}
-.assimilator {color: #059223; font-size: 16px ; font-weight: bold;}
-.alertsyndie {color: #FF0000; font-size: 24px ; font-weight: bold;}
-
-.sinister {color: #800080; font-weight: bold; font-style: italic;} /* /vg/ */
-.spider {color: #8800ff;}
-
-.interface {color: #750e75;}
-
-.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
-.papyrus {font-family: "Papyrus", cursive, sans-serif;}
-.robot {font-family: "Courier New", cursive, sans-serif;}
-
-.command_headset {font-weight: bold; font-size: 24px;}
-.small {font-size: 8px;}
-.big {font-size: 24px;}
-.reallybig {font-size: 32px;}
-.extremelybig {font-size: 40px;}
-.greentext {color: #059223; font-size: 24px;}
-.redtext {color: #c51e1e; font-size: 24px;}
-.clown {color: #ff70c1; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
-.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
-.hypnophrase {color: #202020; font-weight: bold; animation: hypnocolor 1500ms infinite;}
-@keyframes hypnocolor {
- 0% { color: #202020; }
- 25% { color: #4b02ac; }
- 50% { color: #9f41f1; }
- 75% { color: #541c9c; }
- 100% { color: #7adbf3; }
-}
-
-.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;}
-@keyframes phobia {
- 0% { color: #f75a5a; }
- 50% { color: #dd0000; }
- 100% { color: #f75a5a; }
-}
-
-.icon {height: 1em; width: auto;}
-
-.memo {color: #638500; text-align: center;}
-.memoedit {text-align: center; font-size: 16px;}
-.abductor {color: #c204c2; font-style: italic;}
-.mind_control {color: #df3da9; font-size: 3; font-weight: bold; font-style: italic;}
-.slime {color: #00CED1;}
-.drone {color: #848482;}
-.monkey {color: #975032;}
-.swarmer {color: #2C75FF;}
-.resonate {color: #298F85;}
-
-.monkeyhive {color: #a56408;}
-.monkeylead {color: #af6805; font-size: 2;}
-
-.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
-.connectionClosed.restored {background: green;}
-.internal.boldnshit {color: #3d5bc3; font-weight: bold;}
-
-/* HELPER CLASSES */
-.text-normal {font-weight: normal; font-style: normal;}
-.hidden {display: none; visibility: hidden;}
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_override.css b/code/modules/goonchat/browserassets/css/browserOutput_override.css
deleted file mode 100644
index 4e5a047dd8b..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput_override.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* classes for which dark alternative is not present or needs to be updated */
-
-.log_message {color: #386AFF; font-weight: bold;}
-
-/* OOC */
-.ooc .looc {color: #3A9696;}
-.ooc .elevated {color: #2e78d9;}
-.ooc .moderator {color: #184880;}
-.ooc .developer {color: #1b521f;}
-.ooc .admin {color: #b82e00;}
-
-/* Admin: Private Messages */
-.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;}
-.pm .in {color: #ff0000;}
-.pm .out {color: #ff0000;}
-.pm .other {color: #0000ff;}
-
-/* Admin: Channels */
-.mod_channel {color: #735638; font-weight: bold;}
-.mod_channel .admin {color: #b82e00; font-weight: bold;}
-.admin_channel {color: #9611D4; font-weight: bold;}
-.adminticket {color: #386AFF; font-weight: bold;}
-.adminticketalt {color: #014c8a; font-weight: bold}
-
-/* Radio: Misc */
-.deadsay {color: #530FAD;}
-.angelsay {color: #ffaa00;}
-.deptradio {color: #ff00ff;} /* when all other department colors fail */
-.newscaster {color: #750000;}
-
-/* Radio Channels */
-.comradio {color: #193A7A;}
-.centradio {color: #5C5C8A;}
-
-.engradio {color: #A66300;}
-.medradio {color: #008160;}
-.supradio {color: #5F4519;}
-
-/* Game Messages */
-
-.moderate {color: #CC0000;}
-
-.alium {color: #00ff00;}
-.revolution {color: #B00030; font-weight: bold; font-style: italic;}
-.revolution_alert {color: #B00030; font-weight: bold; font-style: italic; font-size: 200%;}
-
-.reflex_shoot {color: #000099; font-style: italic;}
-
-/* Languages */
-
-.monkey {color: #22228B;}
-.rough {font-family: Trebuchet MS, cursive, sans-serif;}
-.say_quote {font-family: Georgia, Verdana, sans-serif;}
-.russian {color: #635d17}
-.serbian {color: #Ad6f1d}
-.jive {color: #666666}
-.german {color: #001FFF}
-.neohongo {color: #993399}
-.latin {color: #deb63d}
-
-.good {color: #4f8529; font-weight: bold;}
-.bad {color: #ee0000; font-weight: bold;}
-.neutral {color: #555555; font-weight: bold;}
-
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css
deleted file mode 100644
index 0e70faa4acd..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput_white.css
+++ /dev/null
@@ -1,446 +0,0 @@
-/*****************************************
-*
-* GLOBAL STYLES for white theme normies
-*
-******************************************/
-html, body {
- padding: 0;
- margin: 0;
- height: 100%;
- color: #000000;
-}
-body {
- background: #fff;
- font-family: Verdana, sans-serif;
- font-size: 9pt;
- line-height: 1.2;
- overflow-x: hidden;
- overflow-y: scroll;
- word-wrap: break-word;
-}
-
-#examine {
- margin: 1px;
- border: 2px solid #f0f0f0;
- padding: 5px;
- background-color:#e5e5e5;
-}
-
-em {
- font-style: normal;
- font-weight: bold;
-}
-
-img {
- margin: 0;
- padding: 0;
- line-height: 1;
- -ms-interpolation-mode: nearest-neighbor;
- image-rendering: pixelated;
-}
-img.icon {
- height: 1em;
- min-height: 16px;
- width: auto;
- vertical-align: bottom;
-}
-
-
-.r:before { /* "repeated" badge class for combined messages */
- content: 'x';
-}
-.r {
- display: inline-block;
- min-width: 0.5em;
- font-size: 0.7em;
- padding: 0.2em 0.3em;
- line-height: 1;
- color: white;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- background-color: crimson;
- border-radius: 10px;
-}
-
-a {color: #0000ff;}
-a.visited {color: #ff00ff;}
-a:visited {color: #ff00ff;}
-a.popt {text-decoration: none;}
-
-/*****************************************
-*
-* OUTPUT NOT RELATED TO ACTUAL MESSAGES
-*
-******************************************/
-#loading {
- position: fixed;
- width: 300px;
- height: 150px;
- text-align: center;
- left: 50%;
- top: 50%;
- margin: -75px 0 0 -150px;
-}
-#loading i {display: block; padding-bottom: 3px;}
-
-#messages {
- font-size: 13px;
- padding: 3px;
- margin: 0;
- word-wrap: break-word;
-}
-#newMessages {
- position: fixed;
- display: block;
- bottom: 0;
- right: 0;
- padding: 8px;
- background: #ddd;
- text-decoration: none;
- font-variant: small-caps;
- font-size: 1.1em;
- font-weight: bold;
- color: #333;
-}
-#newMessages:hover {background: #ccc;}
-#newMessages i {vertical-align: middle; padding-left: 3px;}
-#ping {
- position: fixed;
- top: 0;
- right: 180px;
- width: 45px;
- background: #ddd;
- height: 30px;
- padding: 8px 0 2px 0;
-}
-#ping i {display: block; text-align: center;}
-#ping .ms {
- display: block;
- text-align: center;
- font-size: 8pt;
- padding-top: 2px;
-}
-#userBar {
- position: fixed;
- top: 0;
- right: 0;
-}
-#userBar .subCell {
- background: #ddd;
- height: 30px;
- padding: 5px 0;
- display: block;
- color: #333;
- text-decoration: none;
- line-height: 28px;
- border-top: 1px solid #b4b4b4;
-}
-#userBar .subCell:hover {background: #ccc;}
-#userBar .toggle {
- width: 45px;
- background: #ccc;
- border-top: 0;
- float: right;
- text-align: center;
-}
-#userBar .sub {clear: both; display: none; width: 180px;}
-#userBar .sub.scroll {overflow-y: scroll;}
-#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
-#userBar .sub span {
- display: block;
- line-height: 30px;
- float: left;
-}
-#userBar .sub i {
- display: block;
- padding: 0 5px;
- font-size: 1.1em;
- width: 22px;
- text-align: center;
- line-height: 30px;
- float: right;
-}
-#userBar .sub input {
- position: absolute;
- padding: 7px 5px;
- width: 121px;
- line-height: 30px;
- float: left;
-}
-#userBar .topCell {border-top: 0;}
-
-/* POPUPS */
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-.popup .close:hover {background: #999;}
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
- border-bottom: 2px solid green;
-}
-.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;}
-.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;}
-.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;}
-.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;}
-
-.changeFont {padding: 10px;}
-.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;}
-.changeFont a:hover {background: #ccc;}
-
-.highlightPopup {padding: 10px; text-align: center;}
-.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;}
-.highlightPopup input.highlightColor {background-color: #FFFF00;}
-.highlightPopup input.highlightTermSubmit {margin-top: 5px;}
-
-/* ADMIN CONTEXT MENU */
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
-}
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
-}
-
-.contextMenu a:hover {
- background-color: #ccc;
-}
-
-/* ADMIN FILTER MESSAGES MENU */
-.filterMessages {padding: 5px;}
-.filterMessages div {padding: 2px 0;}
-.filterMessages input {}
-.filterMessages label {}
-
-.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;}
-
-
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-.motd {color: #638500; font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #638500; text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #638500;}
-
-/* ADD HERE FOR BOLD */
-.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;}
-
-/* ADD HERE FOR ITALIC */
-.italic, .italics, .emote {font-style: italic;}
-
-/* OUTPUT COLORS */
-.highlight {background: yellow;}
-
-h1, h2, h3, h4, h5, h6 {color: #0000ff;font-family: Georgia, Verdana, sans-serif;}
-h1.alert, h2.alert {color: #000000;}
-
-em {font-style: normal; font-weight: bold;}
-
-.ooc .everyone {color: #002eb8;}
-.adminobserverooc {color: #0099cc; font-weight: bold;}
-.adminooc {color: #700038; font-weight: bold;}
-
-.adminsay {color: #ff4500; font-weight: bold;}
-.admin {color: #4473ff; font-weight: bold;}
-
-.name { font-weight: bold;}
-
-.say {}
-.deadsay {color: #5c00e6;}
-.binarysay {color: #20c20e; background-color: #000000; display: block;}
-.binarysay a {color: #00ff00;}
-.binarysay a:active, .binarysay a:visited {color: #88ff88;}
-.radio {color: #008000;}
-.sciradio {color: #993399;}
-.comradio {color: #948f02;}
-.secradio {color: #a30000;}
-.medradio {color: #337296;}
-.engradio {color: #fb5613;}
-.suppradio {color: #a8732b;}
-.servradio, .srvradio {color: #6eaa2c;}
-.syndradio {color: #6d3f40;}
-.centcomradio {color: #686868;}
-.aiprivradio, .airadio {color: #ff00ff;}
-.ntradio {color: #D4AF37;}
-.redteamradio {color: #ff0000;}
-.blueteamradio {color: #0000ff;}
-
-.yell { font-weight: bold;}
-
-.alert {color: #ff0000;}
-h1.alert, h2.alert {color: #000000;}
-
-.emote { font-style: italic;}
-.selecteddna {color: #ffffff; background-color: #001B1B}
-
-.attack {color: #ff0000;}
-.disarm {color: #990000;}
-.passive {color: #660000;}
-
-.userdanger {color: #ff0000; font-weight: bold; font-size: 24px;}
-.danger {color: #ff0000; font-weight: bold;}
-.warning {color: #ff0000; font-style: italic;}
-.alertwarning {color: #FF0000; font-weight: bold}
-.boldwarning {color: #ff0000; font-style: italic; font-weight: bold}
-.announce {color: #228b22; font-weight: bold;}
-.boldannounce {color: #ff0000; font-weight: bold;}
-.greenannounce {color: #00ff00; font-weight: bold;}
-.rose {color: #ff5050;}
-.info {color: #0000CC;}
-.notice {color: #000099;}
-.boldnotice {color: #000099; font-weight: bold;}
-.adminnotice {color: #0000ff;}
-.adminhelp {color: #ff0000; font-weight: bold;}
-.unconscious {color: #0000ff; font-weight: bold;}
-.suicide {color: #ff5050; font-style: italic;}
-.green {color: #03ff39;}
-.red {color: #FF0000}
-.blue {color: #0000FF}
-.nicegreen {color: #14a833;}
-.shadowling {color: #3b2769;}
-.cult {color: #960000;}
-
-.cultitalic {color: #960000; font-style: italic;}
-.cultbold {color: #960000; font-style: italic; font-weight: bold;}
-.cultboldtalic {color: #960000; font-weight: bold; font-size: 24px;}
-
-.cultlarge {color: #960000; font-weight: bold; font-size: 24px;}
-.narsie {color: #960000; font-weight: bold; font-size: 120px;}
-.narsiesmall {color: #960000; font-weight: bold; font-size: 48px;}
-.colossus {color: #7F282A; font-size: 40px;}
-.hierophant {color: #660099; font-weight: bold; font-style: italic;}
-.hierophant_warning {color: #660099; font-style: italic;}
-.purple {color: #5e2d79;}
-.holoparasite {color: #35333a;}
-
-.revennotice {color: #1d2953;}
-.revenboldnotice {color: #1d2953; font-weight: bold;}
-.revenbignotice {color: #1d2953; font-weight: bold; font-size: 24px;}
-.revenminor {color: #823abb}
-.revenwarning {color: #760fbb; font-style: italic;}
-.revendanger {color: #760fbb; font-weight: bold; font-size: 24px;}
-.umbra {color: #5000A0;}
-.umbra_emphasis {color: #5000A0; font-weight: bold; font-style: italic;}
-.umbra_large {color: #5000A0; font-size: 24px; font-weight: bold; font-style: italic;}
-
-.deconversion_message {color: #5000A0; font-size: 24px; font-style: italic;}
-
-.brass {color: #BE8700;}
-.heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;}
-.large_brass {color: #BE8700; font-size: 24px;}
-.big_brass {color: #BE8700; font-size: 24px; font-weight: bold; font-style: italic;}
-.ratvar {color: #BE8700; font-size: 48px; font-weight: bold; font-style: italic;}
-.alloy {color: #42474D;}
-.heavy_alloy {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_large {color: #42474D; font-size: 24px; font-weight: bold; font-style: italic;}
-.nezbere {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_small {color: #42474D;}
-.sevtug_large {color: #AF0AAF; font-size: 24px; font-weight: bold; font-style: italic;}
-.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;}
-.sevtug_small {color: #AF0AAF;}
-.inathneq_large {color: #1E8CE1; font-size: 24px; font-weight: bold; font-style: italic;}
-.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;}
-.inathneq_small {color: #1E8CE1;}
-.nzcrentr_large {color: #DAAA18; font-size: 24px; font-weight: bold; font-style: italic;}
-.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;}
-.nzcrentr_small {color: #DAAA18;}
-.neovgre_large {color: #6E001A; font-size: 24px; font-weight: bold; font-style: italic;}
-.neovgre {color: #6E001A; font-weight: bold; font-style: italic;}
-.neovgre_small {color: #6E001A;}
-
-.newscaster {color: #800000;}
-.ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;}
-
-.alien {color: #543354;}
-.noticealien {color: #00c000;}
-.alertalien {color: #00c000; font-weight: bold;}
-.assimilator {color: #800080; font-size: 16px ; font-weight: bold;}
-.bigassimilator {color: #800080; font-size: 32px ; font-weight: bold;}
-.alertsyndie {color: #FF0000; font-size: 24px ; font-weight: bold;}
-
-.spider {color: #4d004d; font-weight: bold; font-size: 24px;}
-
-.interface {color: #330033;}
-
-.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
-.papyrus {font-family: "Papyrus", cursive, sans-serif;}
-.robot {font-family: "Courier New", cursive, sans-serif;}
-
-.command_headset {font-weight: bold; font-size: 24px;}
-.small {font-size: 8px;}
-.big {font-size: 24px;}
-.reallybig {font-size: 32px;}
-.extremelybig {font-size: 40px;}
-.greentext {color: #00FF00; font-size: 24px;}
-.redtext {color: #FF0000; font-size: 24px;}
-.clown {color: #FF69Bf; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
-.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
-.hypnophrase {color: #0d0d0d; font-weight: bold; animation: hypnocolor 1500ms infinite;}
-@keyframes hypnocolor {
- 0% { color: #0d0d0d; }
- 25% { color: #410194; }
- 50% { color: #7f17d8; }
- 75% { color: #410194; }
- 100% { color: #3bb5d3; }
-}
-
-.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;}
-@keyframes phobia {
- 0% { color: #0d0d0d; }
- 50% { color: #dd0000; }
- 100% { color: #0d0d0d; }
-}
-
-.icon {height: 1em; width: auto;}
-
-.memo {color: #638500; text-align: center;}
-.memoedit {text-align: center; font-size: 16px;}
-.abductor {color: #800080; font-style: italic;}
-.mind_control {color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;}
-.slime {color: #00CED1;}
-.drone {color: #848482;}
-.monkey {color: #975032;}
-.swarmer {color: #2C75FF;}
-.resonate {color: #298F85;}
-
-.monkeyhive {color: #774704;}
-.monkeylead {color: #774704; font-size: 2;}
-
-.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
-.connectionClosed.restored {background: green;}
-.internal.boldnshit {color: blue; font-weight: bold;}
-
-/* HELPER CLASSES */
-.text-normal {font-weight: normal; font-style: normal;}
-.hidden {display: none; visibility: hidden;}
diff --git a/code/modules/goonchat/browserassets/html/browserOutput.html b/code/modules/goonchat/browserassets/html/browserOutput.html
deleted file mode 100644
index 305f0f60024..00000000000
--- a/code/modules/goonchat/browserassets/html/browserOutput.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- Chat
-
-
-
-
-
-
-
-
-
-
-
-
- Loading...
- If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
- If it still doesn't work, use the bug report button at the top right of the window.
-
-
-
-
-
-
-
-
-
-
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
deleted file mode 100644
index 2bdbd8c3c2b..00000000000
--- a/code/modules/goonchat/browserassets/js/browserOutput.js
+++ /dev/null
@@ -1,1171 +0,0 @@
-
-/*****************************************
-*
-* FUNCTION AND VAR DECLARATIONS
-*
-******************************************/
-
-//DEBUG STUFF
-var escaper = encodeURIComponent || escape;
-var decoder = decodeURIComponent || unescape;
-window.onerror = function(msg, url, line, col, error) {
- if (document.location.href.indexOf("proc=debug") <= 0) {
- var extra = !col ? '' : ' | column: ' + col;
- extra += !error ? '' : ' | error: ' + error;
- extra += !navigator.userAgent ? '' : ' | user agent: ' + navigator.userAgent;
- var debugLine = 'Error: ' + msg + ' | url: ' + url + ' | line: ' + line + extra;
- window.location = '?_src_=chat&proc=debug¶m[error]='+escaper(debugLine);
- }
- return true;
-};
-
-//Globals
-window.status = 'Output';
-var $messages, $subOptions, $subAudio, $selectedSub, $contextMenu;
-var last_messages = [];
-var opts = {
- //General
- 'messageCount': 0, //A count...of messages...
- 'messageLimit': 2053, //A limit...for the messages...
- 'scrollSnapTolerance': 10, //If within x pixels of bottom
- 'clickTolerance': 10, //Keep focus if outside x pixels of mousedown position on mouseup
- 'imageRetryDelay': 50, //how long between attempts to reload images (in ms)
- 'imageRetryLimit': 50, //how many attempts should we make?
- 'popups': 0, //Amount of popups opened ever
- 'wasd': false, //Is the user in wasd mode?
- 'priorChatHeight': 0, //Thing for height-resizing detection
- 'restarting': false, //Is the round restarting?
- 'darkmode':false, //Are we using darkmode? If not WHY ARE YOU LIVING IN 2009???
- 'fullscreen':false, //Is fullscreen mode enabled?
-
- //Options menu
- 'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu
- 'suppressSubClose': false, //Whether or not we should be hiding the selected sub menu
- 'highlightTerms': [],
- 'highlightLimit': 5,
- 'highlightColor': '#FFFF00', //The color of the highlighted message
- 'pingDisabled': false, //Has the user disabled the ping counter
-
- //Ping display
- 'lastPang': 0, //Timestamp of the last response from the server.
- 'pangLimit': 35000,
- 'pingTime': 0, //Timestamp of when ping sent
- 'pongTime': 0, //Timestamp of when ping received
- 'noResponse': false, //Tracks the state of the previous ping request
- 'noResponseCount': 0, //How many failed pings?
-
- //Clicks
- 'mouseDownX': null,
- 'mouseDownY': null,
- 'preventFocus': false, //Prevents switching focus to the game window
-
- //Client Connection Data
- 'clientDataLimit': 5,
- 'clientData': [],
-
- //Admin music volume update
- 'volumeUpdateDelay': 5000, //Time from when the volume updates to data being sent to the server
- 'volumeUpdating': false, //True if volume update function set to fire
- 'updatedVolume': 0, //The volume level that is sent to the server
- 'musicStartAt': 0, //The position the music starts playing
- 'musicEndAt': 0, //The position the music... stops playing... if null, doesn't apply (so the music runs through)
-
- 'defaultMusicVolume': 25,
-
- 'messageCombining': true,
- 'messageCombiningCount': 20,
-
-};
-var replaceRegexes = {};
-
-function clamp(val, min, max) {
- return Math.max(min, Math.min(val, max))
-}
-
-//Polyfill for fucking date now because of course IE8 and below don't support it
-if (!Date.now) {
- Date.now = function now() {
- return new Date().getTime();
- };
-}
-//Polyfill for trim() (IE8 and below)
-if (typeof String.prototype.trim !== 'function') {
- String.prototype.trim = function () {
- return this.replace(/^\s+|\s+$/g, '');
- };
-}
-
-// Linkify the contents of a node, within its parent.
-function linkify(parent, insertBefore, text) {
- var start = 0;
- var match;
- var regex = /(?:(?:https?:\/\/)|(?:www\.))(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#\/%?=~_|$!:,.;()]+/ig;
- while ((match = regex.exec(text)) !== null) {
- // add the unmatched text
- parent.insertBefore(document.createTextNode(text.substring(start, match.index)), insertBefore);
-
- var href = match[0];
- if (!/^https?:\/\//i.test(match[0])) {
- href = "http://" + match[0];
- }
-
- // add the link
- var link = document.createElement("a");
- link.href = href;
- link.textContent = match[0];
- parent.insertBefore(link, insertBefore);
-
- start = regex.lastIndex;
- }
- if (start !== 0) {
- // add the remaining text and remove the original text node
- parent.insertBefore(document.createTextNode(text.substring(start)), insertBefore);
- parent.removeChild(insertBefore);
- }
-}
-
-// Recursively linkify the children of a given node.
-function linkify_node(node) {
- var children = node.childNodes;
- // work backwards to avoid the risk of looping forever on our own output
- for (var i = children.length - 1; i >= 0; --i) {
- var child = children[i];
- if (child.nodeType == Node.TEXT_NODE) {
- // text is to be linkified
- linkify(node, child, child.textContent);
- } else if (child.nodeName != "A" && child.nodeName != "a") {
- // do not linkify existing links
- linkify_node(child);
- }
- }
-}
-
-//Shit fucking piece of crap that doesn't work god fuckin damn it
-function linkify_fallback(text) {
- var rex = /((?:'+$0+'';
- }
- else {
- return $1 ? $0: ''+$0+'';
- }
- });
-}
-
-function byondDecode(message) {
- // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8.
- // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
- // Marvelous.
- message = message.replace(/\+/g, "%20");
- try {
- // This is a workaround for the above not always working when BYOND's shitty url encoding breaks. (byond bug id:2399401)
- if (decodeURIComponent) {
- message = decodeURIComponent(message);
- } else {
- throw new Error("Easiest way to trigger the fallback")
- }
- } catch (err) {
- message = unescape(message);
- }
- return message;
-}
-
-function replaceRegex() {
- var selectedRegex = replaceRegexes[$(this).attr('replaceRegex')];
- if (selectedRegex) {
- var replacedText = $(this).html().replace(selectedRegex[0], selectedRegex[1]);
- $(this).html(replacedText);
- }
- $(this).removeAttr('replaceRegex');
-}
-
-// Get a highlight markup span
-function createHighlightMarkup() {
- var extra = '';
- if (opts.highlightColor) {
- extra += ' style="background-color: ' + opts.highlightColor + '"';
- }
- return '';
-}
-
-// Get all child text nodes that match a regex pattern
-function getTextNodes(elem, pattern) {
- var result = $([]);
- $(elem).contents().each(function(idx, child) {
- if (child.nodeType === 3 && /\S/.test(child.nodeValue) && pattern.test(child.nodeValue)) {
- result = result.add(child);
- }
- else {
- result = result.add(getTextNodes(child, pattern));
- }
- });
- return result;
-}
-
-// Highlight all text terms matching the registered regex patterns
-function highlightTerms(el) {
- var pattern = new RegExp("(" + opts.highlightTerms.join('|') + ")", 'gi');
- var nodes = getTextNodes(el, pattern);
-
- nodes.each(function (idx, node) {
- var content = $(node).text();
- var parent = $(node).parent();
- var pre = $(node.previousSibling);
- $(node).remove();
- content.split(pattern).forEach(function (chunk) {
- // Get our highlighted span/text node
- var toInsert = null;
- if (pattern.test(chunk)) {
- var tmpElem = $(createHighlightMarkup());
- tmpElem.text(chunk);
- toInsert = tmpElem;
- }
- else {
- toInsert = document.createTextNode(chunk);
- }
-
- // Insert back into our element
- if (pre.length == 0) {
- var result = parent.prepend(toInsert);
- pre = $(result[0].firstChild);
- }
- else {
- pre.after(toInsert);
- pre = $(pre[0].nextSibling);
- }
- });
- });
-}
-
-function iconError(E) {
- var that = this;
- setTimeout(function() {
- var attempts = $(that).data('reload_attempts');
- if (typeof attempts === 'undefined' || !attempts) {
- attempts = 1;
- }
- if (attempts > opts.imageRetryLimit)
- return;
- var src = that.src;
- that.src = null;
- that.src = src+'#'+attempts;
- $(that).data('reload_attempts', ++attempts);
- }, opts.imageRetryDelay);
-}
-
-//Send a message to the client
-function output(message, flag) {
- if (typeof message === 'undefined') {
- return;
- }
- if (typeof flag === 'undefined') {
- flag = '';
- }
-
- if (flag !== 'internal')
- opts.lastPang = Date.now();
-
- message = byondDecode(message).trim();
-
- //The behemoth of filter-code (for Admin message filters)
- //Note: This is proooobably hella inefficient
- var filteredOut = false;
- if (opts.hasOwnProperty('showMessagesFilters') && !opts.showMessagesFilters['All'].show) {
- //Get this filter type (defined by class on message)
- var messageHtml = $.parseHTML(message),
- messageClasses;
- if (opts.hasOwnProperty('filterHideAll') && opts.filterHideAll) {
- var internal = false;
- messageClasses = (!!$(messageHtml).attr('class') ? $(messageHtml).attr('class').split(/\s+/) : false);
- if (messageClasses) {
- for (var i = 0; i < messageClasses.length; i++) { //Every class
- if (messageClasses[i] == 'internal') {
- internal = true;
- break;
- }
- }
- }
- if (!internal) {
- filteredOut = 'All';
- }
- } else {
- //If the element or it's child have any classes
- if (!!$(messageHtml).attr('class') || !!$(messageHtml).children().attr('class')) {
- messageClasses = $(messageHtml).attr('class').split(/\s+/);
- if (!!$(messageHtml).children().attr('class')) {
- messageClasses = messageClasses.concat($(messageHtml).children().attr('class').split(/\s+/));
- }
- var tempCount = 0;
- for (var i = 0; i < messageClasses.length; i++) { //Every class
- var thisClass = messageClasses[i];
- $.each(opts.showMessagesFilters, function(key, val) { //Every filter
- if (key !== 'All' && val.show === false && typeof val.match != 'undefined') {
- for (var i = 0; i < val.match.length; i++) {
- var matchClass = val.match[i];
- if (matchClass == thisClass) {
- filteredOut = key;
- break;
- }
- }
- }
- if (filteredOut) return false;
- });
- if (filteredOut) break;
- tempCount++;
- }
- } else {
- if (!opts.showMessagesFilters['Misc'].show) {
- filteredOut = 'Misc';
- }
- }
- }
- }
-
- //Stuff we do along with appending a message
- var atBottom = false;
- if (!filteredOut) {
- var bodyHeight = $('body').height();
- var messagesHeight = $messages.outerHeight();
- var scrollPos = $('body,html').scrollTop();
-
- //Should we snap the output to the bottom?
- if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) {
- atBottom = true;
- if ($('#newMessages').length) {
- $('#newMessages').remove();
- }
- //If not, put the new messages box in
- } else {
- if ($('#newMessages').length) {
- var messages = $('#newMessages .number').text();
- messages = parseInt(messages);
- messages++;
- $('#newMessages .number').text(messages);
- if (messages == 2) {
- $('#newMessages .messageWord').append('s');
- }
- } else {
- $messages.after('1 new ');
- }
- }
- }
-
- opts.messageCount++;
-
- //Pop the top message off if history limit reached
- if (opts.messageCount >= opts.messageLimit) {
- $messages.children('div.entry:first-child').remove();
- opts.messageCount--; //I guess the count should only ever equal the limit
- }
-
- // Create the element - if combining is off, we use it, and if it's on, we
- // might discard it bug need to check its text content. Some messages vary
- // only in HTML markup, have the same text content, and should combine.
- var entry = document.createElement('div');
- entry.innerHTML = message;
- var trimmed_message = entry.textContent || entry.innerText || "";
-
- var handled = false;
- if (opts.messageCombining) {
- var index = $.inArray(trimmed_message, last_messages);
- if(index != -1) {
- var back_index = last_messages.length - index;
- var lastmessage = $messages.children('div.entry:nth-last-child(' + back_index + ')').last();
- if (lastmessage.length) {
- var badge = lastmessage.children('.r').last();
- if (badge.length) {
- badge = badge.detach();
- badge.text(parseInt(badge.text()) + 1);
- } else {
- badge = $('', {'class': 'r', 'text': 2});
- }
- lastmessage.html(message);
- lastmessage.find('[replaceRegex]').each(replaceRegex);
- lastmessage.append(badge);
- badge.animate({
- "font-size": "0.9em"
- }, 100, function() {
- badge.animate({
- "font-size": "0.7em"
- }, 100);
- });
- opts.messageCount--;
- if(back_index > 1) {
- $messages[0].appendChild(lastmessage[0]);
- last_messages.push(last_messages.splice(index, 1)[0]);
- }
- handled = true;
- }
- }
- }
-
- if (!handled) {
- //Actually append the message
- entry.className = 'entry';
-
- if (filteredOut) {
- entry.className += ' hidden';
- entry.setAttribute('data-filter', filteredOut);
- }
-
- $(entry).find('[replaceRegex]').each(replaceRegex);
-
- if(last_messages.push(trimmed_message) >= opts.messageCombiningCount) {
- last_messages.shift();
- }
- $messages[0].appendChild(entry);
- $(entry).find("img.icon").error(iconError);
-
- var to_linkify = $(entry).find(".linkify");
- if (typeof Node === 'undefined') {
- // Linkify fallback for old IE
- for(var i = 0; i < to_linkify.length; ++i) {
- to_linkify[i].innerHTML = linkify_fallback(to_linkify[i].innerHTML);
- }
- } else {
- // Linkify for modern IE versions
- for(var i = 0; i < to_linkify.length; ++i) {
- linkify_node(to_linkify[i]);
- }
- }
-
- //Actually do the snap
- //Stuff we can do after the message shows can go here, in the interests of responsiveness
- if (opts.highlightTerms && opts.highlightTerms.length > 0) {
- highlightTerms($(entry));
- }
- }
-
- if (!filteredOut && atBottom) {
- $('body,html').scrollTop($messages.outerHeight());
- }
-}
-
-function internalOutput(message, flag)
-{
- output(escaper(message), flag)
-}
-
-//Runs a route within byond, client or server side. Consider this "ehjax" for byond.
-function runByond(uri) {
- window.location = uri;
-}
-
-function setCookie(cname, cvalue, exdays) {
- cvalue = escaper(cvalue);
- var d = new Date();
- d.setTime(d.getTime() + (exdays*24*60*60*1000));
- var expires = 'expires='+d.toUTCString();
- document.cookie = cname + '=' + cvalue + '; ' + expires + "; path=/";
-}
-
-function getCookie(cname) {
- var name = cname + '=';
- var ca = document.cookie.split(';');
- for(var i=0; i < ca.length; i++) {
- var c = ca[i];
- while (c.charAt(0)==' ') c = c.substring(1);
- if (c.indexOf(name) === 0) {
- return decoder(c.substring(name.length,c.length));
- }
- }
- return '';
-}
-
-function rgbToHex(R,G,B) {return toHex(R)+toHex(G)+toHex(B);}
-function toHex(n) {
- n = parseInt(n,10);
- if (isNaN(n)) return "00";
- n = Math.max(0,Math.min(n,255));
- return "0123456789ABCDEF".charAt((n-n%16)/16) + "0123456789ABCDEF".charAt(n%16);
-}
-
-function swap() { //Swap to darkmode
- if (opts.darkmode){
- document.getElementById("sheetofstyles").href = "browserOutput_white.css";
- opts.darkmode = false;
- runByond('?_src_=chat&proc=swaptolightmode');
- } else {
- document.getElementById("sheetofstyles").href = "browserOutput.css";
- opts.darkmode = true;
- runByond('?_src_=chat&proc=swaptodarkmode');
- }
- setCookie('darkmode', (opts.darkmode ? 'true' : 'false'), 365);
-}
-
-function fullscreen_check() {
- if (opts.fullscreen){
- opts.fullscreen = false;
- runByond('?_src_=chat&proc=disable_fullscreen');
- } else {
- opts.fullscreen = true;
- runByond('?_src_=chat&proc=enable_fullscreen');
- }
- setCookie('fullscreen', (opts.fullscreen ? 'true' : 'false'), 365);
-}
-
-function handleClientData(ckey, ip, compid) {
- //byond sends player info to here
- var currentData = {'ckey': ckey, 'ip': ip, 'compid': compid};
- if (opts.clientData && !$.isEmptyObject(opts.clientData)) {
- runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]='+JSON.stringify({'connData': opts.clientData}));
-
- for (var i = 0; i < opts.clientData.length; i++) {
- var saved = opts.clientData[i];
- if (currentData.ckey == saved.ckey && currentData.ip == saved.ip && currentData.compid == saved.compid) {
- return; //Record already exists
- }
- }
-
- if (opts.clientData.length >= opts.clientDataLimit) {
- opts.clientData.shift();
- }
- } else {
- runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]=none');
- }
-
- //Update the cookie with current details
- opts.clientData.push(currentData);
- setCookie('connData', JSON.stringify(opts.clientData), 365);
-}
-
-//Server calls this on ehjax response
-//Or, y'know, whenever really
-function ehjaxCallback(data) {
- opts.lastPang = Date.now();
- if (data == 'softPang') {
- return;
- } else if (data == 'pang') {
- opts.pingCounter = 0; //reset
- opts.pingTime = Date.now();
- runByond('?_src_=chat&proc=ping');
-
- } else if (data == 'pong') {
- if (opts.pingDisabled) {return;}
- opts.pongTime = Date.now();
- var pingDuration = Math.ceil((opts.pongTime - opts.pingTime) / 2);
- $('#pingMs').text(pingDuration+'ms');
- pingDuration = Math.min(pingDuration, 255);
- var red = pingDuration;
- var green = 255 - pingDuration;
- var blue = 0;
- var hex = rgbToHex(red, green, blue);
- $('#pingDot').css('color', '#'+hex);
-
- } else if (data == 'roundrestart') {
- opts.restarting = true;
- internalOutput('The connection has been closed because the server is restarting. Please wait while you automatically reconnect.', 'internal');
- } else if (data == 'stopMusic') {
- $('#adminMusic').prop('src', '');
- } else {
- //Oh we're actually being sent data instead of an instruction
- var dataJ;
- try {
- dataJ = $.parseJSON(data);
- } catch (e) {
- //But...incorrect :sadtrombone:
- window.onerror('JSON: '+e+'. '+data, 'browserOutput.html', 327);
- return;
- }
- data = dataJ;
-
- if (data.clientData) {
- if (opts.restarting) {
- opts.restarting = false;
- $('.connectionClosed.restarting:not(.restored)').addClass('restored').text('The round restarted and you successfully reconnected!');
- }
- if (!data.clientData.ckey && !data.clientData.ip && !data.clientData.compid) {
- //TODO: Call shutdown perhaps
- return;
- } else {
- handleClientData(data.clientData.ckey, data.clientData.ip, data.clientData.compid);
- }
- sendVolumeUpdate();
- } else if (data.adminMusic) {
- if (typeof data.adminMusic === 'string') {
- var adminMusic = byondDecode(data.adminMusic);
- var bindLoadedData = false;
- adminMusic = adminMusic.match(/https?:\/\/\S+/) || '';
- if (data.musicRate) {
- var newRate = Number(data.musicRate);
- if(newRate) {
- $('#adminMusic').prop('defaultPlaybackRate', newRate);
- }
- } else {
- $('#adminMusic').prop('defaultPlaybackRate', 1.0);
- }
- if (data.musicSeek) {
- opts.musicStartAt = Number(data.musicSeek) || 0;
- bindLoadedData = true;
- } else {
- opts.musicStartAt = 0;
- }
- if (data.musicHalt) {
- opts.musicEndAt = Number(data.musicHalt) || null;
- bindLoadedData = true;
- }
- if (bindLoadedData) {
- $('#adminMusic').one('loadeddata', adminMusicLoadedData);
- }
- $('#adminMusic').prop('src', adminMusic);
- $('#adminMusic').trigger("play");
- }
- } else if (data.syncRegex) {
- for (var i in data.syncRegex) {
-
- var regexData = data.syncRegex[i];
- var regexName = regexData[0];
- var regexFlags = regexData[1];
- var regexReplaced = regexData[2];
-
- replaceRegexes[i] = [new RegExp(regexName, regexFlags), regexReplaced];
- }
- }
- }
-}
-
-function createPopup(contents, width) {
- opts.popups++;
- $('body').append('');
-
- //Attach close popup event
- var $popup = $('#popup'+opts.popups);
- var height = $popup.outerHeight();
- $popup.css({'height': height+'px', 'margin': '-'+(height/2)+'px 0 0 -'+(width/2)+'px'});
-
- $popup.on('click', '.close', function(e) {
- e.preventDefault();
- $popup.remove();
- });
-}
-
-function toggleWasd(state) {
- opts.wasd = (state == 'on' ? true : false);
-}
-
-function sendVolumeUpdate() {
- opts.volumeUpdating = false;
- if(opts.updatedVolume) {
- runByond('?_src_=chat&proc=setMusicVolume¶m[volume]='+opts.updatedVolume);
- }
-}
-
-function adminMusicEndCheck(event) {
- if (opts.musicEndAt) {
- if ($('#adminMusic').prop('currentTime') >= opts.musicEndAt) {
- $('#adminMusic').off(event);
- $('#adminMusic').trigger('pause');
- $('#adminMusic').prop('src', '');
- }
- } else {
- $('#adminMusic').off(event);
- }
-}
-
-function adminMusicLoadedData(event) {
- if (opts.musicStartAt && ($('#adminMusic').prop('duration') === Infinity || (opts.musicStartAt <= $('#adminMusic').prop('duration'))) ) {
- $('#adminMusic').prop('currentTime', opts.musicStartAt);
- }
- if (opts.musicEndAt) {
- $('#adminMusic').on('timeupdate', adminMusicEndCheck);
- }
-}
-
-function subSlideUp() {
- $(this).removeClass('scroll');
- $(this).css('height', '');
-}
-
-function startSubLoop() {
- if (opts.selectedSubLoop) {
- clearInterval(opts.selectedSubLoop);
- }
- return setInterval(function() {
- if (!opts.suppressSubClose && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- }
- }, 5000); //every 5 seconds
-}
-
-function handleToggleClick($sub, $toggle) {
- if ($selectedSub !== $sub && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- }
- $selectedSub = $sub
- if ($selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- } else {
- $selectedSub.slideDown('fast', function() {
- var windowHeight = $(window).height();
- var toggleHeight = $toggle.outerHeight();
- var priorSubHeight = $selectedSub.outerHeight();
- var newSubHeight = windowHeight - toggleHeight;
- $(this).height(newSubHeight);
- if (priorSubHeight > (windowHeight - toggleHeight)) {
- $(this).addClass('scroll');
- }
- });
- opts.selectedSubLoop = startSubLoop();
- }
-}
-
-/*****************************************
-*
-* DOM READY
-*
-******************************************/
-
-if (typeof $ === 'undefined') {
- var div = document.getElementById('loading').childNodes[1];
- div += '
ERROR: Jquery did not load.';
-}
-
-$(function() {
- $messages = $('#messages');
- $subOptions = $('#subOptions');
- $subAudio = $('#subAudio');
- $selectedSub = $subOptions;
-
- //Hey look it's a controller loop!
- setInterval(function() {
- if (opts.lastPang + opts.pangLimit < Date.now() && !opts.restarting) { //Every pingLimit
- if (!opts.noResponse) { //Only actually append a message if the previous ping didn't also fail (to prevent spam)
- opts.noResponse = true;
- opts.noResponseCount++;
- internalOutput('You are either AFK, experiencing lag or the connection has closed.', 'internal');
- }
- } else if (opts.noResponse) { //Previous ping attempt failed ohno
- $('.connectionClosed[data-count="'+opts.noResponseCount+'"]:not(.restored)').addClass('restored').text('Your connection has been restored (probably)!');
- opts.noResponse = false;
- }
- }, 2000); //2 seconds
-
-
- /*****************************************
- *
- * LOAD SAVED CONFIG
- *
- ******************************************/
- var savedConfig = {
- 'sfontSize': getCookie('fontsize'),
- 'slineHeight': getCookie('lineheight'),
- 'spingDisabled': getCookie('pingdisabled'),
- 'shighlightTerms': getCookie('highlightterms'),
- 'shighlightColor': getCookie('highlightcolor'),
- 'smusicVolume': getCookie('musicVolume'),
- 'smessagecombining': getCookie('messagecombining'),
- 'sdarkmode': getCookie('darkmode'),
- 'sfullscreen': getCookie('fullscreen'),
- };
-
- if (savedConfig.sfontSize) {
- $messages.css('font-size', savedConfig.sfontSize);
- internalOutput('Loaded font size setting of: '+savedConfig.sfontSize+'', 'internal');
- }
- if (savedConfig.slineHeight) {
- $("body").css('line-height', savedConfig.slineHeight);
- internalOutput('Loaded line height setting of: '+savedConfig.slineHeight+'', 'internal');
- }
- if(savedConfig.sdarkmode == 'true'){
- swap();
- }
- if(savedConfig.sfullscreen == 'true'){
- fullscreen_check();
- }
- if (savedConfig.spingDisabled) {
- if (savedConfig.spingDisabled == 'true') {
- opts.pingDisabled = true;
- $('#ping').hide();
- }
- internalOutput('Loaded ping display of: '+(opts.pingDisabled ? 'hidden' : 'visible')+'', 'internal');
- }
- if (savedConfig.shighlightTerms) {
- var savedTerms = $.parseJSON(savedConfig.shighlightTerms).filter(function (entry) {
- return entry !== null && /\S/.test(entry);
- });
- var actualTerms = savedTerms.length != 0 ? savedTerms.join(', ') : null;
- if (actualTerms) {
- internalOutput('Loaded highlight strings of: ' + actualTerms+'', 'internal');
- opts.highlightTerms = savedTerms;
- }
- }
- if (savedConfig.shighlightColor) {
- opts.highlightColor = savedConfig.shighlightColor;
- internalOutput('Loaded highlight color of: '+savedConfig.shighlightColor+'', 'internal');
- }
- if (savedConfig.smusicVolume) {
- var newVolume = clamp(savedConfig.smusicVolume, 0, 100);
- $('#adminMusic').prop('volume', newVolume / 100);
- $('#musicVolume').val(newVolume);
- opts.updatedVolume = newVolume;
- sendVolumeUpdate();
- internalOutput('Loaded music volume of: '+savedConfig.smusicVolume+'', 'internal');
- }
- else{
- $('#adminMusic').prop('volume', opts.defaultMusicVolume / 100);
- }
-
- if (savedConfig.smessagecombining) {
- if (savedConfig.smessagecombining == 'false') {
- opts.messageCombining = false;
- } else {
- opts.messageCombining = true;
- }
- }
- (function() {
- var dataCookie = getCookie('connData');
- if (dataCookie) {
- var dataJ;
- try {
- dataJ = $.parseJSON(dataCookie);
- } catch (e) {
- window.onerror('JSON '+e+'. '+dataCookie, 'browserOutput.html', 434);
- return;
- }
- opts.clientData = dataJ;
- }
- })();
-
-
- /*****************************************
- *
- * BASE CHAT OUTPUT EVENTS
- *
- ******************************************/
-
- $('body').on('click', 'a', function(e) {
- e.preventDefault();
- });
-
- $('body').on('mousedown', function(e) {
- var $target = $(e.target);
-
- if ($contextMenu && opts.hasOwnProperty('contextMenuTarget') && opts.contextMenuTarget) {
- hideContextMenu();
- return false;
- }
-
- if ($target.is('a') || $target.parent('a').length || $target.is('input') || $target.is('textarea')) {
- opts.preventFocus = true;
- } else {
- opts.preventFocus = false;
- opts.mouseDownX = e.pageX;
- opts.mouseDownY = e.pageY;
- }
- });
-
- $messages.on('mousedown', function(e) {
- if ($selectedSub && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- }
- });
-
- $('body').on('mouseup', function(e) {
- if (!opts.preventFocus &&
- (e.pageX >= opts.mouseDownX - opts.clickTolerance && e.pageX <= opts.mouseDownX + opts.clickTolerance) &&
- (e.pageY >= opts.mouseDownY - opts.clickTolerance && e.pageY <= opts.mouseDownY + opts.clickTolerance)
- ) {
- opts.mouseDownX = null;
- opts.mouseDownY = null;
- runByond('byond://winset?mapwindow.map.focus=true');
- }
- });
-
- $messages.on('click', 'a', function(e) {
- var href = $(this).attr('href');
- $(this).addClass('visited');
- if (href[0] == '?' || (href.length >= 8 && href.substring(0,8) == 'byond://')) {
- runByond(href);
- } else {
- href = escaper(href);
- runByond('?action=openLink&link='+href);
- }
- });
-
- //Fuck everything about this event. Will look into alternatives.
- $('body').on('keydown', function(e) {
- if (e.target.nodeName == 'INPUT' || e.target.nodeName == 'TEXTAREA') {
- return;
- }
-
- if (e.ctrlKey || e.altKey || e.shiftKey) { //Band-aid "fix" for allowing ctrl+c copy paste etc. Needs a proper fix.
- return;
- }
-
- e.preventDefault()
-
- var k = e.which;
- // Hardcoded because else there would be no feedback message.
- if (k == 113) { // F2
- runByond('byond://winset?screenshot=auto');
- internalOutput('Screenshot taken', 'internal');
- }
-
- var c = "";
- switch (k) {
- case 8:
- c = 'BACK';
- case 9:
- c = 'TAB';
- case 13:
- c = 'ENTER';
- case 19:
- c = 'PAUSE';
- case 27:
- c = 'ESCAPE';
- case 33: // Page up
- c = 'NORTHEAST';
- case 34: // Page down
- c = 'SOUTHEAST';
- case 35: // End
- c = 'SOUTHWEST';
- case 36: // Home
- c = 'NORTHWEST';
- case 37:
- c = 'WEST';
- case 38:
- c = 'NORTH';
- case 39:
- c = 'EAST';
- case 40:
- c = 'SOUTH';
- case 45:
- c = 'INSERT';
- case 46:
- c = 'DELETE';
- case 93: // That weird thing to the right of alt gr.
- c = 'APPS';
-
- default:
- c = String.fromCharCode(k);
- }
-
- if (c.length == 0) {
- if (!e.shiftKey) {
- c = c.toLowerCase();
- }
- runByond('byond://winset?mapwindow.map.focus=true;mainwindow.input.text='+c);
- return false;
- } else {
- runByond('byond://winset?mapwindow.map.focus=true');
- return false;
- }
- });
-
- //Mildly hacky fix for scroll issues on mob change (interface gets resized sometimes, messing up snap-scroll)
- $(window).on('resize', function(e) {
- if ($(this).height() !== opts.priorChatHeight) {
- $('body,html').scrollTop($messages.outerHeight());
- opts.priorChatHeight = $(this).height();
- }
- });
-
-
- /*****************************************
- *
- * OPTIONS INTERFACE EVENTS
- *
- ******************************************/
-
- $('body').on('click', '#newMessages', function(e) {
- var messagesHeight = $messages.outerHeight();
- $('body,html').scrollTop(messagesHeight);
- $('#newMessages').remove();
- runByond('byond://winset?mapwindow.map.focus=true');
- });
-
- $('#toggleOptions').click(function(e) {
- handleToggleClick($subOptions, $(this));
- });
- $('#darkmodetoggle').click(function(e) {
- swap();
- });
- $('#fullscreentoggle').click(function(e) {
- fullscreen_check();
- });
- $('#toggleAudio').click(function(e) {
- handleToggleClick($subAudio, $(this));
- });
-
- $('.sub, .toggle').mouseenter(function() {
- opts.suppressSubClose = true;
- });
-
- $('.sub, .toggle').mouseleave(function() {
- opts.suppressSubClose = false;
- });
-
- $('#decreaseFont').click(function(e) {
- var fontSize = parseInt($messages.css('font-size'));
- fontSize = fontSize - 1 + 'px';
- $messages.css({'font-size': fontSize});
- setCookie('fontsize', fontSize, 365);
- internalOutput('Font size set to '+fontSize+'', 'internal');
- });
-
- $('#increaseFont').click(function(e) {
- var fontSize = parseInt($messages.css('font-size'));
- fontSize = fontSize + 1 + 'px';
- $messages.css({'font-size': fontSize});
- setCookie('fontsize', fontSize, 365);
- internalOutput('Font size set to '+fontSize+'', 'internal');
- });
-
- $('#decreaseLineHeight').click(function(e) {
- var Heightline = parseFloat($("body").css('line-height'));
- var Sizefont = parseFloat($("body").css('font-size'));
- var lineheightvar = Heightline / Sizefont
- lineheightvar -= 0.1;
- lineheightvar = lineheightvar.toFixed(1)
- $("body").css({'line-height': lineheightvar});
- setCookie('lineheight', lineheightvar, 365);
- internalOutput('Line height set to '+lineheightvar+'', 'internal');
- });
-
- $('#increaseLineHeight').click(function(e) {
- var Heightline = parseFloat($("body").css('line-height'));
- var Sizefont = parseFloat($("body").css('font-size'));
- var lineheightvar = Heightline / Sizefont
- lineheightvar += 0.1;
- lineheightvar = lineheightvar.toFixed(1)
- $("body").css({'line-height': lineheightvar});
- setCookie('lineheight', lineheightvar, 365);
- internalOutput('Line height set to '+lineheightvar+'', 'internal');
- });
-
- $('#togglePing').click(function(e) {
- if (opts.pingDisabled) {
- $('#ping').slideDown('fast');
- opts.pingDisabled = false;
- } else {
- $('#ping').slideUp('fast');
- opts.pingDisabled = true;
- }
- setCookie('pingdisabled', (opts.pingDisabled ? 'true' : 'false'), 365);
- });
-
- $('#saveLog').click(function(e) {
- // Requires IE 10+ to issue download commands. Just opening a popup
- // window will cause Ctrl+S to save a blank page, ignoring innerHTML.
- if (!window.Blob) {
- output('This function is only supported on IE 10+. Upgrade if possible.', 'internal');
- return;
- }
-
- $.ajax({
- type: 'GET',
- url: 'browserOutput_white.css',
- success: function(styleData) {
- var blob = new Blob(['Chat Log ', $messages.html(), '']);
-
- var fname = 'SS13 Chat Log';
- var date = new Date(), month = date.getMonth(), day = date.getDay(), hours = date.getHours(), mins = date.getMinutes(), secs = date.getSeconds();
- fname += ' ' + date.getFullYear() + '-' + (month < 10 ? '0' : '') + month + '-' + (day < 10 ? '0' : '') + day;
- fname += ' ' + (hours < 10 ? '0' : '') + hours + (mins < 10 ? '0' : '') + mins + (secs < 10 ? '0' : '') + secs;
- fname += '.html';
-
- window.navigator.msSaveBlob(blob, fname);
- }
- });
- });
-
- $('#highlightTerm').click(function(e) {
- if ($('.popup .highlightTerm').is(':visible')) {return;}
- var termInputs = '';
- for (var i = 0; i < opts.highlightLimit; i++) {
- termInputs += '';
- }
- var popupContent = 'String Highlighting' +
- '' +
- 'Choose up to '+opts.highlightLimit+' strings that will highlight the line when they appear in chat.' +
- '' +
- '';
- createPopup(popupContent, 250);
- });
-
- $('body').on('keyup', '#highlightColor', function() {
- var color = $('#highlightColor').val();
- color = color.trim();
- if (!color || color.charAt(0) != '#') return;
- $('#highlightColor').css('background-color', color);
- });
-
- $('body').on('submit', '#highlightTermForm', function(e) {
- e.preventDefault();
-
- opts.highlightTerms = [];
- for (var count = 0; count < opts.highlightLimit; count++) {
- var term = $('#highlightTermInput'+count).val();
- if (term !== null && /\S/.test(term)) {
- opts.highlightTerms.push(term.trim().toLowerCase());
- }
- }
-
- var color = $('#highlightColor').val();
- color = color.trim();
- if (color == '' || color.charAt(0) != '#') {
- opts.highlightColor = '#FFFF00';
- } else {
- opts.highlightColor = color;
- }
- var $popup = $('#highlightPopup').closest('.popup');
- $popup.remove();
-
- setCookie('highlightterms', JSON.stringify(opts.highlightTerms), 365);
- setCookie('highlightcolor', opts.highlightColor, 365);
- });
-
- $('#clearMessages').click(function() {
- $messages.empty();
- opts.messageCount = 0;
- });
-
- $('#musicVolumeSpan').hover(function() {
- $('#musicVolumeText').addClass('hidden');
- $('#musicVolume').removeClass('hidden');
- }, function() {
- $('#musicVolume').addClass('hidden');
- $('#musicVolumeText').removeClass('hidden');
- });
-
- $('#musicVolume').change(function() {
- var newVolume = $('#musicVolume').val();
- newVolume = clamp(newVolume, 0, 100);
- $('#adminMusic').prop('volume', newVolume / 100);
- setCookie('musicVolume', newVolume, 365);
- opts.updatedVolume = newVolume;
- if(!opts.volumeUpdating) {
- setTimeout(sendVolumeUpdate, opts.volumeUpdateDelay);
- opts.volumeUpdating = true;
- }
- });
-
- $('#toggleCombine').click(function(e) {
- opts.messageCombining = !opts.messageCombining;
- setCookie('messagecombining', (opts.messageCombining ? 'true' : 'false'), 365);
- });
-
- $('img.icon').error(iconError);
-
- /*****************************************
- *
- * KICK EVERYTHING OFF
- *
- ******************************************/
-
- runByond('?_src_=chat&proc=doneLoading');
- if ($('#loading').is(':visible')) {
- $('#loading').remove();
- }
- $('#userBar').show();
- opts.priorChatHeight = $(window).height();
-});
diff --git a/code/modules/goonchat/browserassets/js/json2.min.js b/code/modules/goonchat/browserassets/js/json2.min.js
deleted file mode 100644
index d867407f265..00000000000
--- a/code/modules/goonchat/browserassets/js/json2.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(t){return 10>t?"0"+t:t}function this_value(){return this.valueOf()}function quote(t){return rx_escapable.lastIndex=0,rx_escapable.test(t)?'"'+t.replace(rx_escapable,function(t){var e=meta[t];return"string"==typeof e?e:"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+t+'"'}function str(t,e){var r,n,o,u,f,a=gap,i=e[t];switch(i&&"object"==typeof i&&"function"==typeof i.toJSON&&(i=i.toJSON(t)),"function"==typeof rep&&(i=rep.call(e,t,i)),typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";if(gap+=indent,f=[],"[object Array]"===Object.prototype.toString.apply(i)){for(u=i.length,r=0;u>r;r+=1)f[r]=str(r,i)||"null";return o=0===f.length?"[]":gap?"[\n"+gap+f.join(",\n"+gap)+"\n"+a+"]":"["+f.join(",")+"]",gap=a,o}if(rep&&"object"==typeof rep)for(u=rep.length,r=0;u>r;r+=1)"string"==typeof rep[r]&&(n=rep[r],o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));else for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));return o=0===f.length?"{}":gap?"{\n"+gap+f.join(",\n"+gap)+"\n"+a+"}":"{"+f.join(",")+"}",gap=a,o}}var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(meta={"\b":"\\b"," ":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(t,e,r){var n;if(gap="",indent="","number"==typeof r)for(n=0;r>n;n+=1)indent+=" ";else"string"==typeof r&&(indent=r);if(rep=e,e&&"function"!=typeof e&&("object"!=typeof e||"number"!=typeof e.length))throw new Error("JSON.stringify");return str("",{"":t})}),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(t,e){var r,n,o=t[e];if(o&&"object"==typeof o)for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(n=walk(o,r),void 0!==n?o[r]=n:delete o[r]);return reviver.call(t,e,o)}var j;if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(t){return"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}();
\ No newline at end of file
diff --git a/code/modules/goonchat/helpers.dm b/code/modules/goonchat/helpers.dm
deleted file mode 100644
index 153d0669286..00000000000
--- a/code/modules/goonchat/helpers.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-GLOBAL_VAR_INIT(TAB, " ")
-
-GLOBAL_DATUM_INIT(is_http_protocol, /regex, regex("^https?://"))
-
-GLOBAL_LIST_INIT(symbols_unicode_keys, list(
- "�" = "‚",
- "�" = "„",
- "�" = "…",
- "�" = "†",
- "�" = "‡",
- "�" = "‰",
- "�" = "‹",
- "�" = "‘",
- "�" = "’",
- "�" = "“",
- "�" = "”",
- "�" = "•",
- "�" = "–",
- "�" = "—",
- "�" = "™"
-))
-/proc/symbols_to_unicode(text)
- for(var/key in GLOB.symbols_unicode_keys)
- text = replacetext(text, key, GLOB.symbols_unicode_keys[key])
- return text
-
-/proc/color_macro_to_html(text)
- text = replacetext(text,"\red","")
- text = replacetext(text,"\blue","")
- text = replacetext(text,"\green","")
- return text
-
-
diff --git a/code/modules/hivemind/machines.dm b/code/modules/hivemind/machines.dm
index 416aa61e433..6ceafd38f4d 100755
--- a/code/modules/hivemind/machines.dm
+++ b/code/modules/hivemind/machines.dm
@@ -176,9 +176,9 @@
var/list/range_list = list()
var/list/target_list = list()
if(in_hear_range)
- range_list = hearers(range, src)
+ range_list = hearers(range, get_turf(src))
else
- range_list = range(range, src)
+ range_list = range(range, get_turf(src))
for(var/atom/movable/M in range_list)
var/mob/target = M.get_mob()
if(target)
@@ -187,7 +187,7 @@
/obj/machinery/hivemind_machine/proc/is_attackable(mob/living/target)
- if(!target.stat || target.health >= (ishuman(target) ? HEALTH_THRESHOLD_CRIT : 0))
+ if(!target.stat || target.health >= (ishuman(target) ? CONFIG_GET(number/health_threshold_crit) : 0))
return TRUE
return FALSE
diff --git a/code/modules/hivemind/mobs.dm b/code/modules/hivemind/mobs.dm
index b6d0fb286ae..f2e350ca7da 100644
--- a/code/modules/hivemind/mobs.dm
+++ b/code/modules/hivemind/mobs.dm
@@ -359,7 +359,7 @@
ranged = TRUE
rapid = FALSE //Visual Studio screamed at me for trying to use FALSE/TRUE in procs below
minimum_distance = 3 //having minimum_distance too high often resulted in the mob trying to melee
- fire_verb = "lobs a ball of goo" //reminder that the attack message is "\red [src] [fire_verb] at [target]!"
+ fire_verb = "lobs a ball of goo" //reminder that the attack message is span_red("[src] [fire_verb] at [target]!")
projectiletype = /obj/item/projectile/goo/weak //what projectile it uses. Since ranged_cooldown is 2 short seconds, it's better to have a weaker projectile
projectilesound = 'sound/effects/blobattack.ogg'
ranged_cooldown = 2 SECONDS
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index ca5eb2cae02..942b603a653 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -132,7 +132,7 @@
safety_disabled = 1
update_projections()
to_chat(user, span_notice("You vastly increase projector power and override the safety and security protocols."))
- to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [company_name] maintenance and do not use the simulator.")
+ to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [GLOB.company_name] maintenance and do not use the simulator.")
log_game("[key_name(usr)] emagged the Holodeck Control Computer")
src.updateUsrDialog()
return 1
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 0b373dba706..027f87e918a 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -266,7 +266,7 @@
if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card))
var/aforce = I.force
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
- visible_message("\red [src] was hit by [I].")
+ visible_message(span_red("[src] was hit by [I]."))
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)
return
diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm
index 6c239b5b712..31f49e67fde 100644
--- a/code/modules/holomap/generate_holomap.dm
+++ b/code/modules/holomap/generate_holomap.dm
@@ -24,7 +24,7 @@
/// Generates all the holo minimaps, initializing it all nicely, probably.
/datum/controller/subsystem/holomaps/proc/generateHoloMinimaps()
- var/start_time = world.timeofday
+ rustg_time_reset(SS_HOLOMAPS_TIMER_KEY)
// Build the base map for each z level
for (var/z = 1 to GLOB.maps_data.station_levels.len)
holoMiniMaps |= z // hack, todo fix
@@ -38,8 +38,13 @@
for(var/smoosh_list in GLOB.maps_data.holomap_smoosh)
smooshTetherHolomaps(smoosh_list)
+ var/time = rustg_time_milliseconds(SS_HOLOMAPS_TIMER_KEY)
+ var/seconds = round(time / 1000, 0.01)
+
holomaps_initialized = TRUE
- admin_notice(span_danger("Holomaps initialized in [round(0.1*(world.timeofday-start_time),0.1)] seconds."), R_DEBUG)
+ var/msg = "Generated Holomaps within [seconds] second[seconds == 1 ? "" : "s"]!"
+ to_chat(world, span_boldannounce(msg))
+ log_world(msg)
// TODO - Check - They had a delayed init perhaps?
for (var/obj/machinery/holomap/S in station_holomaps)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index b6eba7ec348..3d4b95bfd0d 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -27,14 +27,14 @@
if(!plantname)
return
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
- seed = plant_controller.seeds[plantname]
+ seed = SSplants.seeds[plantname]
if(!seed)
return
@@ -67,15 +67,15 @@
if(!seed)
return
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
- if(plant_controller.product_descs["[seed.uid]"])
- desc = plant_controller.product_descs["[seed.uid]"]
+ if(SSplants.product_descs["[seed.uid]"])
+ desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
@@ -127,17 +127,17 @@
desc += " mushroom"
else
desc += " fruit"
- plant_controller.product_descs["[seed.uid]"] = desc
+ SSplants.product_descs["[seed.uid]"] = desc
desc += ". Delicious! Probably."
/obj/item/reagent_containers/food/snacks/grown/update_icon()
- if(!seed || !plant_controller || !plant_controller.plant_icon_cache)
+ if(!seed || !SSplants || !SSplants.plant_icon_cache)
return
cut_overlays()
var/image/plant_icon
var/icon_key = "fruit-[seed.get_trait(TRAIT_PRODUCT_ICON)]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"
- if(plant_controller.plant_icon_cache[icon_key])
- plant_icon = plant_controller.plant_icon_cache[icon_key]
+ if(SSplants.plant_icon_cache[icon_key])
+ plant_icon = SSplants.plant_icon_cache[icon_key]
else
plant_icon = image('icons/obj/hydroponics_products.dmi',"blank")
var/image/fruit_base = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-product")
@@ -147,7 +147,7 @@
var/image/fruit_leaves = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf")
fruit_leaves.color = "[seed.get_trait(TRAIT_PLANT_COLOUR)]"
plant_icon.overlays |= (fruit_leaves)
- plant_controller.plant_icon_cache[icon_key] = plant_icon
+ SSplants.plant_icon_cache[icon_key] = plant_icon
overlays |= plant_icon
/obj/item/reagent_containers/food/snacks/grown/Crossed(var/mob/living/M)
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index b7a458d7a78..d0724f3a18d 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -16,7 +16,7 @@
//Handle some post-spawn var stuff.
if(planttype)
plantname = planttype
- var/datum/seed/S = plant_controller.seeds[plantname]
+ var/datum/seed/S = SSplants.seeds[plantname]
if(!S || !S.chems)
return
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 57cf7927914..1b71fa1b123 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -17,7 +17,7 @@
return F
/datum/computer_file/binary/plantgene/proc/update_name()
- filename = "PL_GENE_[plant_controller.gene_tag_masks[genetype]]_[genesource_uid]"
+ filename = "PL_GENE_[SSplants.gene_tag_masks[genetype]]_[genesource_uid]"
/datum/computer_file/binary/plantgene/nano_ui_data()
var/list/data = list(
@@ -26,7 +26,7 @@
"strain" = genesource_uid,
"tag" = genetype,
"size" = size,
- "mask" = plant_controller.gene_tag_masks[genetype]
+ "mask" = SSplants.gene_tag_masks[genetype]
)
return data
@@ -378,8 +378,8 @@
seed_noun = pick("spores","nodes","cuttings","seeds")
set_trait(TRAIT_POTENCY,rand(5,30),200,0)
- set_trait(TRAIT_PRODUCT_ICON,pick(plant_controller.plant_product_sprites))
- set_trait(TRAIT_PLANT_ICON,pick(plant_controller.plant_sprites))
+ set_trait(TRAIT_PRODUCT_ICON,pick(SSplants.plant_product_sprites))
+ set_trait(TRAIT_PLANT_ICON,pick(SSplants.plant_sprites))
set_trait(TRAIT_PLANT_COLOUR,get_random_colour(0,75,190))
set_trait(TRAIT_PRODUCT_COLOUR,get_random_colour(0,75,190))
update_growth_stages()
@@ -717,10 +717,10 @@
H.sanity.changeLevel(2.5)
//This may be a new line. Update the global if it is.
- if(name == "new line" || !(name in plant_controller.seeds))
- uid = plant_controller.seeds.len + 1
+ if(name == "new line" || !(name in SSplants.seeds))
+ uid = SSplants.seeds.len + 1
name = "[uid]"
- plant_controller.seeds[name] = src
+ SSplants.seeds[name] = src
if(harvest_sample)
var/obj/item/seeds/seeds = new(get_turf(user))
@@ -804,6 +804,6 @@
/datum/seed/proc/update_growth_stages()
if(get_trait(TRAIT_PLANT_ICON))
- growth_stages = plant_controller.plant_sprites[get_trait(TRAIT_PLANT_ICON)]
+ growth_stages = SSplants.plant_sprites[get_trait(TRAIT_PLANT_ICON)]
else
- growth_stages = plant_controller.plant_sprites[get_trait("bush1")]
+ growth_stages = SSplants.plant_sprites[get_trait("bush1")]
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index ca4174d5700..fd7a4c4b988 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -102,10 +102,10 @@
if(!seed)
return 1
- if(seed.seed.name == "new line" || isnull(plant_controller.seeds[seed.seed.name]))
- seed.seed.uid = plant_controller.seeds.len + 1
+ if(seed.seed.name == "new line" || isnull(SSplants.seeds[seed.seed.name]))
+ seed.seed.uid = SSplants.seeds.len + 1
seed.seed.name = "[seed.seed.uid]"
- plant_controller.seeds[seed.seed.name] = seed.seed
+ SSplants.seeds[seed.seed.name] = seed.seed
seed.update_seed()
@@ -170,8 +170,8 @@
var/list/data = ..()
var/list/geneMasks = list()
- for(var/gene_tag in plant_controller.gene_tag_masks)
- geneMasks.Add(list(list("tag" = gene_tag, "mask" = plant_controller.gene_tag_masks[gene_tag])))
+ for(var/gene_tag in SSplants.gene_tag_masks)
+ geneMasks.Add(list(list("tag" = gene_tag, "mask" = SSplants.gene_tag_masks[gene_tag])))
data["geneMasks"] = geneMasks
if(seed && genes_processed)
@@ -266,7 +266,7 @@
stat_multiplier = min(usr.stats.getMult(STAT_BIO, STAT_LEVEL_GODLIKE), usr.stats.getMult(STAT_COG, STAT_LEVEL_GODLIKE))
seed.modified += round(rand(30, 50) * stat_multiplier)
- if(!isnull(plant_controller.seeds[seed.seed.name]))
+ if(!isnull(SSplants.seeds[seed.seed.name]))
seed.seed = seed.seed.diverge(1)
seed.seed_type = seed.seed.name
seed.update_seed()
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 8d68570c605..fd3ac666f08 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -17,8 +17,8 @@ var/global/list/plant_seed_sprites = list()
//Grabs the appropriate seed datum from the global list.
/obj/item/seeds/proc/update_seed()
- if(!seed && seed_type && !isnull(plant_controller.seeds) && plant_controller.seeds[seed_type])
- seed = plant_controller.seeds[seed_type]
+ if(!seed && seed_type && !isnull(SSplants.seeds) && SSplants.seeds[seed_type])
+ seed = SSplants.seeds[seed_type]
update_appearance()
//Updates strings and icon appropriately based on seed datum.
@@ -75,7 +75,7 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/random/New()
..()
- seed = plant_controller.create_random_seed()
+ seed = SSplants.create_random_seed()
seed_type = seed.name
update_seed()
diff --git a/code/modules/hydroponics/spreading/spacevines.dm b/code/modules/hydroponics/spreading/spacevines.dm
index daebd8e78ac..fa2f3cd07a5 100644
--- a/code/modules/hydroponics/spreading/spacevines.dm
+++ b/code/modules/hydroponics/spreading/spacevines.dm
@@ -31,7 +31,7 @@
origin.break_open()
T = get_turf(origin)
- var/datum/seed/seed = plant_controller.create_random_seed(1)
+ var/datum/seed/seed = SSplants.create_random_seed(1)
seed.set_trait(TRAIT_SPREAD,3) // So it will function properly as vines.
seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects.
seed.set_trait(TRAIT_MATURATION,rand(maturation_min, maturation_max))
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index fb738cbbdf7..3cb9a18eb7d 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -51,10 +51,10 @@
var/near_external = FALSE
/obj/effect/plant/Destroy()
- if(plant_controller)
- plant_controller.remove_plant(src)
+ if(SSplants)
+ SSplants.remove_plant(src)
for(var/obj/effect/plant/neighbor in range(1,src))
- plant_controller.add_plant(neighbor)
+ SSplants.add_plant(neighbor)
if(seed.type == /datum/seed/mushroom/maintshroom)
GLOB.all_maintshrooms -= src
. = ..()
@@ -71,15 +71,15 @@
else
parent = newparent
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
if(!istype(newseed))
- newseed = plant_controller.seeds[DEFAULT_SEED]
+ newseed = SSplants.seeds[DEFAULT_SEED]
seed = newseed
if(!seed)
qdel(src)
@@ -134,7 +134,7 @@
if(seed.get_trait(TRAIT_WALL_HUGGER))
set_dir(calc_dir())
update_icon()
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
// Some plants eat through plating.
if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index 6f10b39aadb..b7d304011a8 100755
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -125,7 +125,7 @@
// We shouldn't have spawned if the controller doesn't exist.
check_health(FALSE)//Dont want to update the icon every process
if(neighbors.len || health != max_health)
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
if (seed.get_trait(TRAIT_CHEM_SPRAYER) && !spray_cooldown)
var/turf/mainloc = get_turf(src)
@@ -274,7 +274,7 @@
continue
for(var/obj/effect/plant/neighbor in check_turf.contents)
neighbor.neighbors |= check_turf
- plant_controller.add_plant(neighbor)
+ SSplants.add_plant(neighbor)
QDEL_IN(src, 1)
diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm
index 16c8617df4e..91b94d3a2fa 100644
--- a/code/modules/hydroponics/spreading/spreading_response.dm
+++ b/code/modules/hydroponics/spreading/spreading_response.dm
@@ -45,7 +45,7 @@
/obj/effect/plant/attackby(var/obj/item/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*1.5)
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
if(istype(W, /obj/item/reagent_containers/syringe))
return
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index aae57527b98..16b22138795 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -300,7 +300,7 @@
//Remove the seed if something is already planted.
if(seed) seed = null
- seed = plant_controller.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
+ seed = SSplants.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
if(!seed) return //Weed does not exist, someone fucked up.
dead = 0
@@ -330,7 +330,7 @@
// We need to make sure we're not modifying one of the global seed datums.
// If it's not in the global list, then no products of the line have been
// harvested yet and it's safe to assume it's restricted to this tray.
- if(!isnull(plant_controller.seeds[seed.name]))
+ if(!isnull(SSplants.seeds[seed.name]))
seed = seed.diverge()
seed.mutate(severity,get_turf(src))
@@ -385,8 +385,8 @@
/obj/machinery/portable_atmospherics/hydroponics/proc/mutate_species()
var/previous_plant = seed.display_name
var/newseed = seed.get_mutant_variant()
- if(newseed in plant_controller.seeds)
- seed = plant_controller.seeds[newseed]
+ if(newseed in SSplants.seeds)
+ seed = SSplants.seeds[newseed]
else
return
diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm
index 918258adddf..bf1f6a7391d 100644
--- a/code/modules/hydroponics/trays/tray_update_icons.dm
+++ b/code/modules/hydroponics/trays/tray_update_icons.dm
@@ -26,7 +26,7 @@
overlays += "over_lowhealth3"
if(dead)
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-dead"
- var/image/dead_overlay = plant_controller.plant_icon_cache["[ikey]"]
+ var/image/dead_overlay = SSplants.plant_icon_cache["[ikey]"]
if(!dead_overlay)
dead_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
dead_overlay.color = DEAD_PLANT_COLOUR
@@ -46,19 +46,19 @@
maturation = 1
overlay_stage = maturation ? max(1,round(age/maturation)) : 1
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-[overlay_stage]"
- var/image/plant_overlay = plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+ var/image/plant_overlay = SSplants.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
if(!plant_overlay)
plant_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
plant_overlay.color = seed.get_trait(TRAIT_PLANT_COLOUR)
- plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
+ SSplants.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
overlays |= plant_overlay
if(harvest && overlay_stage == seed.growth_stages)
ikey = "[seed.get_trait(TRAIT_PRODUCT_ICON)]"
- var/image/harvest_overlay = plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+ var/image/harvest_overlay = SSplants.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
if(!harvest_overlay)
harvest_overlay = image('icons/obj/hydroponics_products.dmi', "[ikey]")
harvest_overlay.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
- plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
+ SSplants.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
overlays |= harvest_overlay
//Draw the cover.
if(closed_system)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 8daec450b0d..5767ec31b49 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -75,7 +75,7 @@
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
return
if(ishuman(user))
- if(!user.get_active_hand())
+ if(!user.get_active_held_item())
user.put_in_hands(choice)
else
choice.loc = get_turf(src)
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index b47662a6342..6a0bd15d449 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -240,7 +240,7 @@
var/obj/item/barcodescanner/scanner = W
scanner.computer = src
to_chat(user, "[scanner]'s associated machine has been set to [src].")
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src] lets out a low, short blip.", 2)
else
..()
@@ -275,7 +275,7 @@
bibledelay = 0
else
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src]'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\"")
if("7")
@@ -354,7 +354,7 @@
if(!dbcon.IsConnected())
alert("Connection to Archive has been severed. Aborting.")
if(bibledelay)
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
else
bibledelay = 1
diff --git a/code/modules/logging/categories/log_category_admin.dm b/code/modules/logging/categories/log_category_admin.dm
new file mode 100644
index 00000000000..713f3eb709a
--- /dev/null
+++ b/code/modules/logging/categories/log_category_admin.dm
@@ -0,0 +1,21 @@
+/datum/log_category/admin
+ category = LOG_CATEGORY_ADMIN
+ config_flag = /datum/config_entry/flag/log_admin
+
+/datum/log_category/admin_dsay
+ category = LOG_CATEGORY_ADMIN_DSAY
+ master_category = /datum/log_category/admin
+ config_flag = /datum/config_entry/flag/log_admin
+
+// private categories //
+
+/datum/log_category/admin_private
+ category = LOG_CATEGORY_ADMIN_PRIVATE
+ config_flag = /datum/config_entry/flag/log_admin
+ secret = TRUE
+
+/datum/log_category/admin_asay
+ category = LOG_CATEGORY_ADMIN_PRIVATE_ASAY
+ master_category = /datum/log_category/admin_private
+ config_flag = /datum/config_entry/flag/log_adminchat
+ secret = TRUE
diff --git a/code/modules/logging/categories/log_category_compats.dm b/code/modules/logging/categories/log_category_compats.dm
new file mode 100644
index 00000000000..2cf7343f01e
--- /dev/null
+++ b/code/modules/logging/categories/log_category_compats.dm
@@ -0,0 +1,7 @@
+/datum/log_category/game_compat
+ category = LOG_CATEGORY_COMPAT_GAME
+ master_category = /datum/log_category/game
+ config_flag = /datum/config_entry/flag/logging_compat_adminprivate
+
+/datum/config_entry/flag/logging_compat_adminprivate
+ default = FALSE
diff --git a/code/modules/logging/categories/log_category_debug.dm b/code/modules/logging/categories/log_category_debug.dm
new file mode 100644
index 00000000000..eb8d04bae30
--- /dev/null
+++ b/code/modules/logging/categories/log_category_debug.dm
@@ -0,0 +1,42 @@
+/datum/log_category/debug
+ category = LOG_CATEGORY_DEBUG
+
+/datum/log_category/debug_tgui
+ category = LOG_CATEGORY_DEBUG_TGUI
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_sql
+ category = LOG_CATEGORY_DEBUG_SQL
+ master_category = /datum/log_category/debug
+
+// #ifndef DISABLE_DREAMLUAU
+// /datum/log_category/debug_lua
+// category = LOG_CATEGORY_DEBUG_LUA
+// master_category = /datum/log_category/debug
+// #endif
+
+/datum/log_category/debug_href
+ category = LOG_CATEGORY_DEBUG_HREF
+ master_category = /datum/log_category/debug
+
+// This is not in the debug master category on purpose, do not add it
+/datum/log_category/debug_runtime
+ category = LOG_CATEGORY_RUNTIME
+ internal_formatting = FALSE
+
+/datum/log_category/debug_mapping
+ category = LOG_CATEGORY_DEBUG_MAPPING
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_mobtag
+ category = LOG_CATEGORY_DEBUG_MOBTAG
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_asset
+ category = LOG_CATEGORY_DEBUG_ASSET
+ config_flag = /datum/config_entry/flag/log_asset
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_qdel
+ category = LOG_CATEGORY_DEBUG_QDEL
+ master_category = /datum/log_category/debug
diff --git a/code/modules/logging/categories/log_category_game.dm b/code/modules/logging/categories/log_category_game.dm
new file mode 100644
index 00000000000..4acf1fb05a2
--- /dev/null
+++ b/code/modules/logging/categories/log_category_game.dm
@@ -0,0 +1,48 @@
+/datum/log_category/game
+ category = LOG_CATEGORY_GAME
+ config_flag = /datum/config_entry/flag/log_game
+
+/datum/log_category/game_vote
+ category = LOG_CATEGORY_GAME_VOTE
+ config_flag = /datum/config_entry/flag/log_vote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_emote
+ category = LOG_CATEGORY_GAME_EMOTE
+ config_flag = /datum/config_entry/flag/log_emote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_radio_emote
+ category = LOG_CATEGORY_GAME_RADIO_EMOTE
+ config_flag = /datum/config_entry/flag/log_emote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_topic
+ category = LOG_CATEGORY_GAME_TOPIC
+ config_flag = /datum/config_entry/flag/log_world_topic
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_say
+ category = LOG_CATEGORY_GAME_SAY
+ config_flag = /datum/config_entry/flag/log_say
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_whisper
+ category = LOG_CATEGORY_GAME_WHISPER
+ config_flag = /datum/config_entry/flag/log_whisper
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_ooc
+ category = LOG_CATEGORY_GAME_OOC
+ config_flag = /datum/config_entry/flag/log_ooc
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_prayer
+ category = LOG_CATEGORY_GAME_PRAYER
+ config_flag = /datum/config_entry/flag/log_prayer
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_access
+ category = LOG_CATEGORY_GAME_ACCESS
+ config_flag = /datum/config_entry/flag/log_access
+ master_category = /datum/log_category/game
diff --git a/code/modules/logging/categories/log_category_internal.dm b/code/modules/logging/categories/log_category_internal.dm
new file mode 100644
index 00000000000..d0b363e6365
--- /dev/null
+++ b/code/modules/logging/categories/log_category_internal.dm
@@ -0,0 +1,6 @@
+/datum/log_category/internal
+ category = LOG_CATEGORY_INTERNAL_ERROR
+
+/datum/log_category/internal_unknown_category
+ category = LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND
+ master_category = /datum/log_category/internal
diff --git a/code/modules/logging/categories/log_category_misc.dm b/code/modules/logging/categories/log_category_misc.dm
new file mode 100644
index 00000000000..9488f44af77
--- /dev/null
+++ b/code/modules/logging/categories/log_category_misc.dm
@@ -0,0 +1,61 @@
+/datum/log_category/virus
+ category = LOG_CATEGORY_VIRUS
+ config_flag = /datum/config_entry/flag/log_virus
+
+// /datum/log_category/tool
+// category = LOG_CATEGORY_TOOL
+// config_flag = /datum/config_entry/flag/log_tools
+
+// TODO: LOG MECH SHTIJSD
+// /datum/log_category/mecha
+// category = LOG_CATEGORY_MECHA
+// config_flag = /datum/config_entry/flag/log_mecha
+
+/datum/log_category/silicon
+ category = LOG_CATEGORY_SILICON
+ config_flag = /datum/config_entry/flag/log_silicon
+
+/datum/log_category/paper
+ category = LOG_CATEGORY_PAPER
+
+/datum/log_category/attack
+ category = LOG_CATEGORY_ATTACK
+ config_flag = /datum/config_entry/flag/log_attack
+
+/datum/log_category/economy
+ category = LOG_CATEGORY_ECONOMY
+ config_flag = /datum/config_entry/flag/log_econ
+
+/datum/log_category/manifest
+ category = LOG_CATEGORY_MANIFEST
+ config_flag = /datum/config_entry/flag/log_manifest
+
+// TODO: LOG SHUTTLE STUFF
+// /datum/log_category/shuttle
+// category = LOG_CATEGORY_SHUTTLE
+// config_flag = /datum/config_entry/flag/log_shuttle
+
+/datum/log_category/supicious_login
+ category = LOG_CATEGORY_SUSPICIOUS_LOGIN
+ config_flag = /datum/config_entry/flag/log_suspicious_login
+
+/datum/log_category/config
+ category = LOG_CATEGORY_CONFIG
+
+/datum/log_category/filter
+ category = LOG_CATEGORY_FILTER
+
+/datum/log_category/signal
+ category = LOG_CATEGORY_SIGNAL
+
+/datum/log_category/dynamic
+ category = LOG_CATEGORY_DYNAMIC
+
+/datum/log_category/telecomms
+ category = LOG_CATEGORY_TELECOMMS
+ config_flag = /datum/config_entry/flag/log_telecomms
+
+/datum/log_category/speech_indicator
+ category = LOG_CATEGORY_SPEECH_INDICATOR
+ config_flag = /datum/config_entry/flag/log_speech_indicators
+
diff --git a/code/modules/logging/categories/log_category_pda.dm b/code/modules/logging/categories/log_category_pda.dm
new file mode 100644
index 00000000000..aefb8776f20
--- /dev/null
+++ b/code/modules/logging/categories/log_category_pda.dm
@@ -0,0 +1,11 @@
+/datum/log_category/pda
+ category = LOG_CATEGORY_PDA
+ config_flag = /datum/config_entry/flag/log_pda
+
+/datum/log_category/pda_chat
+ category = LOG_CATEGORY_PDA_CHAT
+ master_category = /datum/log_category/pda
+
+/datum/log_category/pda_comment
+ category = LOG_CATEGORY_PDA_COMMENT
+ master_category = /datum/log_category/pda
diff --git a/code/modules/logging/categories/log_category_target_zone_switch.dm b/code/modules/logging/categories/log_category_target_zone_switch.dm
new file mode 100644
index 00000000000..2e5b9cc3e1f
--- /dev/null
+++ b/code/modules/logging/categories/log_category_target_zone_switch.dm
@@ -0,0 +1,3 @@
+/datum/log_category/target_zone_switch
+ category = LOG_CATEGORY_TARGET_ZONE_SWITCH
+ config_flag = /datum/config_entry/flag/log_zone_switch
diff --git a/code/modules/logging/categories/log_category_uplink.dm b/code/modules/logging/categories/log_category_uplink.dm
new file mode 100644
index 00000000000..1418e8c2a3a
--- /dev/null
+++ b/code/modules/logging/categories/log_category_uplink.dm
@@ -0,0 +1,23 @@
+/datum/log_category/uplink
+ category = LOG_CATEGORY_UPLINK
+ config_flag = /datum/config_entry/flag/log_uplink
+
+// /datum/log_category/uplink_malf
+// category = LOG_CATEGORY_UPLINK_MALF
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_heretic
+// category = LOG_CATEGORY_UPLINK_HERETIC
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_changeling
+// category = LOG_CATEGORY_UPLINK_CHANGELING
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_spell
+// category = LOG_CATEGORY_UPLINK_SPELL
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
diff --git a/code/modules/logging/log_category.dm b/code/modules/logging/log_category.dm
new file mode 100644
index 00000000000..c2bfd28f7a1
--- /dev/null
+++ b/code/modules/logging/log_category.dm
@@ -0,0 +1,65 @@
+/// The main datum that contains all log entries for a category
+/datum/log_category
+ /// The category name
+ var/category
+
+ /// The schema version of this log category.
+ /// Expected format of "Major.Minor.Patch"
+ var/schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ /// The master category that contains this category
+ var/datum/log_category/master_category
+
+ /// If set this config flag is checked to enable this log category
+ var/config_flag
+
+ /// Whether or not this log should not be publically visible
+ var/secret = FALSE
+
+ /// The list of header information for this category. Used for log file re-initialization
+ var/list/category_header
+
+ /// Whether the readable version of the log message is formatted internally instead of by rustg
+ var/internal_formatting = TRUE
+
+ /// List of log entries for this category
+ var/list/entries = list()
+
+ /// Total number of entries this round so far
+ var/entry_count = 0
+
+GENERAL_PROTECT_DATUM(/datum/log_category)
+
+/// Add an entry to this category. It is very important that any data you provide doesn't hold references to anything!
+/datum/log_category/proc/create_entry(message, list/data, list/semver_store, severity)
+ var/datum/log_entry/entry = new(
+ // world state contains raw timestamp
+ timestamp = logger.human_readable_timestamp(),
+ category = category,
+ message = message,
+ data = data,
+ semver_store = semver_store,
+ severity = severity
+ )
+
+ write_entry(entry)
+ entry_count += 1
+ if(entry_count <= CONFIG_MAX_CACHED_LOG_ENTRIES)
+ entries += entry
+
+/// Allows for category specific file splitting. Needs to accept a null entry for the default file.
+/// If master_category it will always return the output of master_category.get_output_file(entry)
+/datum/log_category/proc/get_output_file(list/entry, extension = "log.json")
+ if(master_category)
+ return master_category.get_output_file(entry, extension)
+ if(secret)
+ return "[GLOB.log_directory]/secret/[category].[extension]"
+ return "[GLOB.log_directory]/[category].[extension]"
+
+/// Writes an entry to the output file(s) for the category
+/datum/log_category/proc/write_entry(datum/log_entry/entry)
+ // config isn't loaded? assume we want human readable logs
+ if(isnull(config) || CONFIG_GET(flag/log_as_human_readable))
+ entry.write_readable_entry_to_file(get_output_file(entry, "log"), format_internally = internal_formatting)
+
+ entry.write_entry_to_file(get_output_file(entry))
diff --git a/code/modules/logging/log_entry.dm b/code/modules/logging/log_entry.dm
new file mode 100644
index 00000000000..65121b6db1c
--- /dev/null
+++ b/code/modules/logging/log_entry.dm
@@ -0,0 +1,123 @@
+
+// Schema version must always be the very last element in the array.
+
+// Current Schema: 1.0.0
+// [timestamp, category, message, data, world_state, semver_store, id, schema_version]
+
+/// A datum which contains log information.
+/datum/log_entry
+ /// Next id to assign to a log entry.
+ var/static/next_id = 0
+
+ /// Unique id of the log entry.
+ var/id
+
+ /// Schema version of the log entry.
+ var/schema_version = "1.0.0"
+
+ /// Unix timestamp of the log entry.
+ var/timestamp
+
+ /// Category of the log entry.
+ var/category
+
+ /// Message of the log entry.
+ var/message
+
+ /// Data of the log entry; optional.
+ var/list/data
+
+ ///severity level of this log
+ var/severity = "info"
+
+ /// Semver store of the log entry, used to store the schema of data entries
+ var/list/semver_store
+
+GENERAL_PROTECT_DATUM(/datum/log_entry)
+
+/datum/log_entry/New(timestamp, category, message, list/data, list/semver_store, severity = "info")
+ ..()
+
+ src.id = next_id++
+ src.timestamp = timestamp
+ src.category = category
+ src.message = message
+ src.severity = severity
+ with_data(data)
+ with_semver_store(semver_store)
+
+/datum/log_entry/proc/with_data(list/data)
+ if(!isnull(data))
+ if(!islist(data))
+ src.data = list("data" = data)
+ stack_trace("Log entry data was not a list, it was [data.type].")
+ else
+ src.data = data
+ return src
+
+/datum/log_entry/proc/with_semver_store(list/semver_store)
+ if(isnull(semver_store))
+ return
+ if(!islist(semver_store))
+ stack_trace("Log entry semver store was not a list, it was [semver_store.type]. We cannot reliably convert it to a list.")
+ else
+ src.semver_store = semver_store
+ return src
+
+/// Converts the log entry to a human-readable string.
+/datum/log_entry/proc/to_readable_text(format = TRUE)
+ if(format)
+ return "\[[timestamp]\] [uppertext(category)]: [message]"
+ else
+ return "[message]"
+
+#define MANUAL_JSON_ENTRY(list, key, value) list.Add("\"[key]\":[(!isnull(value)) ? json_encode(value) : "null"]")
+
+/// Converts the log entry to a JSON string.
+/datum/log_entry/proc/to_json_text()
+ // I do not trust byond's json encoder, and need to ensure the order doesn't change.
+ var/list/json_entries = list()
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_TIMESTAMP, timestamp)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ROUNDID, GLOB.game_id)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_CATEGORY, category)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_MESSAGE, message)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_DATA, data)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_WORLD_STATE, world.get_world_state_for_logging())
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_store)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ID, id)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SCHEMA_VERSION, schema_version)
+ MANUAL_JSON_ENTRY(json_entries, "level", severity)
+ return "{[json_entries.Join(",")]}"
+
+#undef MANUAL_JSON_ENTRY
+
+#define CHECK_AND_TRY_FILE_ERROR_RECOVERY(file) \
+ var/static/in_error_recovery = FALSE; \
+ if(!fexists(##file)) { \
+ if(in_error_recovery) { \
+ in_error_recovery = FALSE; \
+ CRASH("Failed to error recover log file: [file]"); \
+ }; \
+ in_error_recovery = TRUE; \
+ logger.Log(LOG_CATEGORY_INTERNAL_ERROR, "attempting to perform file error recovery: [file]"); \
+ logger.init_category_file(logger.log_categories[category]); \
+ call(src, __PROC__)(arglist(args)); \
+ return; \
+ }; \
+ in_error_recovery = FALSE;
+
+/// Writes the log entry to a file.
+/datum/log_entry/proc/write_entry_to_file(file)
+ CHECK_AND_TRY_FILE_ERROR_RECOVERY(file)
+ WRITE_LOG_NO_FORMAT(file, "[to_json_text()]\n")
+
+/// Writes the log entry to a file as a human-readable string.
+/datum/log_entry/proc/write_readable_entry_to_file(file, format_internally = TRUE)
+ CHECK_AND_TRY_FILE_ERROR_RECOVERY(file)
+ // If it's being formatted internally we need to manually add a newline
+ if(format_internally)
+ WRITE_LOG_NO_FORMAT(file, "[to_readable_text(format = TRUE)]\n")
+ else
+ WRITE_LOG(file, "[to_readable_text(format = FALSE)]")
+
+#undef CHECK_AND_TRY_FILE_ERROR_RECOVERY
diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm
new file mode 100644
index 00000000000..d756e7ffbec
--- /dev/null
+++ b/code/modules/logging/log_holder.dm
@@ -0,0 +1,376 @@
+GLOBAL_REAL(logger, /datum/log_holder)
+/**
+ * Main datum to manage logging actions
+ */
+/datum/log_holder
+ /// Round ID, if set, that logging is initialized for
+ var/round_id
+ /// When the log_holder first initialized
+ var/logging_start_timestamp
+
+ /// Associative: category -> datum
+ var/list/datum/log_category/log_categories
+ /// typecache list for categories that exist but are disabled
+ var/list/disabled_categories
+ /// category nesting tree for ui purposes
+ var/list/category_group_tree
+
+ /// list of Log args waiting for processing pending log initialization
+ var/list/waiting_log_calls
+
+ /// Whether or not logging as human readable text is enabled
+ var/human_readable_enabled = FALSE
+
+ /// Cached ui_data
+ var/list/data_cache = list()
+
+ /// Last time the ui_data was updated
+ var/last_data_update = 0
+
+ var/initialized = FALSE
+ var/shutdown = FALSE
+
+GENERAL_PROTECT_DATUM(/datum/log_holder)
+
+/client/proc/log_viewer_new()
+ set name = "View Round Logs"
+ set category = "Admin.Logging"
+ logger.ui_interact(mob)
+
+/datum/log_holder/ui_interact(mob/user, datum/tgui/ui)
+ if(!check_rights_for(user.client, R_ADMIN))
+ return
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(isnull(ui))
+ ui = new(user, src, "LogViewer")
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+/datum/log_holder/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/log_holder/ui_static_data(mob/user)
+ var/list/data = list(
+ "game_id" = GLOB.game_id,
+ "logging_start_timestamp" = logging_start_timestamp,
+ )
+
+ var/list/tree = list()
+ data["tree"] = tree
+ var/list/enabled_categories = list()
+ for(var/enabled in log_categories)
+ enabled_categories += enabled
+ tree["enabled"] = enabled_categories
+
+ var/list/disabled_categories = list()
+ for(var/disabled in src.disabled_categories)
+ disabled_categories += disabled
+ tree["disabled"] = disabled_categories
+
+ return data
+
+/datum/log_holder/ui_data(mob/user)
+ if(!last_data_update || (world.time - last_data_update) > LOG_UPDATE_TIMEOUT)
+ cache_ui_data()
+ return data_cache
+
+/datum/log_holder/proc/cache_ui_data()
+ var/list/category_map = list()
+ for(var/datum/log_category/category as anything in log_categories)
+ category = log_categories[category]
+ var/list/category_data = list()
+
+ var/list/entries = list()
+ for(var/datum/log_entry/entry as anything in category.entries)
+ entries += list(list(
+ "id" = entry.id,
+ "message" = entry.message,
+ "timestamp" = entry.timestamp,
+ "data" = entry.data,
+ "semver" = entry.semver_store,
+ ))
+ category_data["entries"] = entries
+ category_data["entry_count"] = category.entry_count
+
+ category_map[category.category] = category_data
+
+ data_cache.Cut()
+ last_data_update = world.time
+
+ data_cache["categories"] = category_map
+ data_cache["last_data_update"] = last_data_update
+
+/datum/log_holder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("refresh")
+ cache_ui_data()
+ SStgui.update_uis(src)
+ return TRUE
+
+ else
+ stack_trace("unknown ui_act action [action] for [type]")
+
+/// Assembles basic information for logging, creating the log category datums and checking for config flags as required
+/datum/log_holder/proc/init_logging()
+ if(initialized)
+ CRASH("Attempted to call init_logging twice!")
+
+ round_id = GLOB.game_id
+ logging_start_timestamp = unix_timestamp_string()
+ log_categories = list()
+ disabled_categories = list()
+
+ human_readable_enabled = CONFIG_GET(flag/log_as_human_readable)
+
+ category_group_tree = assemble_log_category_tree()
+ var/config_flag
+ for(var/datum/log_category/master_category as anything in category_group_tree)
+ var/list/sub_categories = category_group_tree[master_category]
+ sub_categories = sub_categories.Copy()
+ for(var/datum/log_category/sub_category as anything in sub_categories)
+ config_flag = initial(sub_category.config_flag)
+ if(config_flag && !config.Get(config_flag))
+ disabled_categories[initial(sub_category.category)] = TRUE
+ sub_categories -= sub_category
+ continue
+
+ config_flag = initial(master_category.config_flag)
+ if(config_flag && !config.Get(config_flag))
+ disabled_categories[initial(master_category.category)] = TRUE
+ if(!length(sub_categories))
+ continue
+ // enabled, or any of the sub categories are enabled
+ init_log_category(master_category, sub_categories)
+
+ initialized = TRUE
+
+ // process any waiting log calls and then cut the list
+ for(var/list/arg_list as anything in waiting_log_calls)
+ Log(arglist(arg_list))
+ waiting_log_calls?.Cut()
+
+ if(fexists(GLOB.config_error_log))
+ fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
+ fdel(GLOB.config_error_log)
+
+ world._initialize_log_files()
+
+/// Tells the log_holder to not allow any more logging to be done, and dumps all categories to their json file
+/datum/log_holder/proc/shutdown_logging()
+ if(shutdown)
+ CRASH("Attempted to call shutdown_logging twice!")
+ shutdown = TRUE
+
+/// Iterates over all log category types to assemble them into a tree of main category -> (sub category)[] while also checking for loops and sanity errors
+/datum/log_holder/proc/assemble_log_category_tree()
+ var/static/list/category_tree
+ if(category_tree)
+ return category_tree
+
+ category_tree = list()
+ var/list/all_types = subtypesof(/datum/log_category)
+ var/list/known_categories = list()
+ var/list/sub_categories = list()
+
+ // Assemble the master categories
+ for(var/datum/log_category/category_type as anything in all_types)
+ var/category = initial(category_type.category)
+ if(category in known_categories)
+ stack_trace("log category type '[category_type]' has duplicate category '[category]', skipping")
+ continue
+
+ if(!initial(category_type.schema_version))
+ stack_trace("log category type '[category_type]' does not have a valid schema version, skipping")
+ continue
+
+ var/master_category = initial(category_type.master_category)
+ if(master_category)
+ sub_categories[master_category] += list(category_type)
+ continue
+ category_tree[category_type] = list()
+
+ // Sort the sub categories
+ for(var/datum/log_category/master as anything in sub_categories)
+ if(!(master in category_tree))
+ stack_trace("log category [master] is an invalid master category as it's a sub category")
+ continue
+ for(var/datum/log_category/sub_category as anything in sub_categories[master])
+ if(initial(sub_category.secret) != initial(master.secret))
+ stack_trace("log category [sub_category] has a secret status that differs from its master category [master]")
+ category_tree[master] += list(sub_category)
+
+ return category_tree
+
+/// Log entry header used to mark a file is being reset
+#define LOG_CATEGORY_RESET_FILE_MARKER "{\"LOG FILE RESET -- THIS IS AN ERROR\"}"
+#define LOG_CATEGORY_RESET_FILE_MARKER_READABLE "LOG FILE RESET -- THIS IS AN ERROR"
+/// Gets a recovery file for the given path. Caches the last known recovery path for each path.
+/datum/log_holder/proc/get_recovery_file_for(path)
+ var/static/cache
+ if(isnull(cache))
+ cache = list()
+
+ var/count = cache[path] || 0
+ while(fexists("[path].rec[count]"))
+ count++
+ cache[path] = count
+
+ return "[path].rec[count]"
+
+/// Sets up the given category's file and header.
+/datum/log_holder/proc/init_category_file(datum/log_category/category)
+ var/file_path = category.get_output_file(null)
+ if(fexists(file_path)) // already exists? implant a reset marker
+ rustg_file_append(LOG_CATEGORY_RESET_FILE_MARKER, file_path)
+ fcopy(file_path, get_recovery_file_for(file_path))
+ rustg_file_write("[json_encode(category.category_header)]\n", file_path)
+
+ if(!human_readable_enabled)
+ return
+
+ file_path = category.get_output_file(null, "log")
+ if(fexists(file_path))
+ rustg_file_append(LOG_CATEGORY_RESET_FILE_MARKER_READABLE, file_path)
+ fcopy(file_path, get_recovery_file_for(file_path))
+ rustg_file_write("\[[human_readable_timestamp()]\] Starting up round ID [round_id].\n - -------------------------\n", file_path)
+
+#undef LOG_CATEGORY_RESET_FILE_MARKER
+#undef LOG_CATEGORY_RESET_FILE_MARKER_READABLE
+
+/// Initializes the given log category and populates the list of contained categories based on the sub category list
+/datum/log_holder/proc/init_log_category(datum/log_category/category_type, list/datum/log_category/sub_categories)
+ var/datum/log_category/category_instance = new category_type
+
+ var/list/contained_categories = list()
+ for(var/datum/log_category/sub_category as anything in sub_categories)
+ sub_category = new sub_category
+ var/sub_category_actual = sub_category.category
+ sub_category.master_category = category_instance
+ log_categories[sub_category_actual] = sub_category
+
+ if(!semver_to_list(sub_category.schema_version))
+ stack_trace("log category [sub_category_actual] has an invalid schema version '[sub_category.schema_version]'")
+ sub_category.schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ contained_categories += sub_category_actual
+
+ log_categories[category_instance.category] = category_instance
+
+ if(!semver_to_list(category_instance.schema_version))
+ stack_trace("log category [category_instance.category] has an invalid schema version '[category_instance.schema_version]'")
+ category_instance.schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ contained_categories += category_instance.category
+
+ var/list/category_header = list(
+ LOG_HEADER_INIT_TIMESTAMP = logging_start_timestamp,
+ LOG_HEADER_ROUND_ID = GLOB.game_id,
+ LOG_HEADER_SECRET = category_instance.secret,
+ LOG_HEADER_CATEGORY_LIST = contained_categories,
+ LOG_HEADER_CATEGORY = category_instance.category,
+ )
+
+ category_instance.category_header = category_header
+ init_category_file(category_instance, category_header)
+
+/datum/log_holder/proc/unix_timestamp_string() // pending change to rust-g
+ return RUSTG_CALL(RUST_G, "unix_timestamp")()
+
+/datum/log_holder/proc/human_readable_timestamp(precision = 3)
+ var/start = time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")
+ // now we grab the millis from the rustg timestamp
+ var/rustg_stamp = unix_timestamp_string()
+ var/list/timestamp = splittext(rustg_stamp, ".")
+#ifdef UNIT_TESTS
+ if(length(timestamp) != 2)
+ stack_trace("rustg returned illegally formatted string '[rustg_stamp]'")
+ return start
+#endif
+ var/millis = timestamp[2]
+ if(length(millis) > precision)
+ millis = copytext(millis, 1, precision + 1)
+ return "[start].[millis]"
+
+/// Adds an entry to the given category, if the category is disabled it will not be logged.
+/// If the category does not exist, we will CRASH and log to the error category.
+/// the data list is optional and will be recursively json serialized.
+/datum/log_holder/proc/Log(category, message, list/data, severity = "info")
+ // This is Log because log is a byond internal proc
+ if(shutdown)
+ return
+
+ // do not include the message because these go into the runtime log and we might be secret!
+ if(!istext(message))
+ message = "[message]"
+ stack_trace("Logging with a non-text message")
+
+ if(!category)
+ category = LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND
+ stack_trace("Logging with a null or empty category")
+
+ if(data && !islist(data))
+ data = list("data" = data)
+ stack_trace("Logging with data this is not a list, it will be converted to a list with a single key 'data'")
+
+ if(!initialized) // we are initialized during /world/proc/SetupLogging which is called in /world/New
+ waiting_log_calls += list(list(category, message, data))
+ return
+
+ if(disabled_categories[category])
+ return
+
+ var/datum/log_category/log_category = log_categories[category]
+ if(!log_category)
+ Log(LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND, message, data)
+ CRASH("Attempted to log to a category that doesn't exist! [category]")
+
+ var/list/semver_store = null
+ if(length(data))
+ semver_store = list()
+ data = recursive_jsonify(data, semver_store)
+ log_category.create_entry(message, data, semver_store, severity)
+
+/// Recursively converts an associative list of datums into their jsonified(list) form
+/datum/log_holder/proc/recursive_jsonify(list/data_list, list/semvers)
+ if(isnull(data_list))
+ return null
+
+ var/list/jsonified_list = list()
+ for(var/key in data_list)
+ var/datum/data = data_list[key]
+
+ if(isnull(data))
+ pass() // nulls are allowed
+
+ else if(islist(data))
+ data = recursive_jsonify(data, semvers)
+
+ else if(isdatum(data))
+ var/list/options_list = list(
+ SCHEMA_VERSION = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET,
+ )
+
+ var/list/serialization_data = data.serialize_list(options_list, semvers)
+ var/current_semver = semvers[data.type]
+ if(!semver_to_list(current_semver))
+ stack_trace("serialization of data had an invalid semver")
+ semvers[data.type] = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ if(!length(serialization_data)) // serialize_list wasn't implemented, and errored
+ stack_trace("serialization data was empty")
+ continue
+
+ data = recursive_jsonify(serialization_data, semvers)
+
+ if(islist(data) && !length(data))
+ stack_trace("recursive_jsonify got an empty list after serialization")
+ continue
+
+ jsonified_list[key] = data
+
+ return jsonified_list
diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm
index b4866ad1fcb..43ef29fc8b4 100644
--- a/code/modules/maps/map_template.dm
+++ b/code/modules/maps/map_template.dm
@@ -218,7 +218,7 @@
specific_sanity--
var/orientation
- if(chosen_template.fixed_orientation || !config.random_submap_orientation)
+ if(chosen_template.fixed_orientation || !CONFIG_GET(flag/random_submap_orientation))
orientation = 0
else
orientation = pick(list(0, 90, 180, 270))
diff --git a/code/modules/mechs/components/frame.dm b/code/modules/mechs/components/frame.dm
index d0a56488767..f79e21fbf7b 100644
--- a/code/modules/mechs/components/frame.dm
+++ b/code/modules/mechs/components/frame.dm
@@ -387,7 +387,7 @@
return 0
if(user)
visible_message(span_notice("\The [user] begins installing \the [I] into \the [src]."))
- if(!user.canUnEquip(I) || !do_after(user, 30) || user.get_active_hand() != I)
+ if(!user.canUnEquip(I) || !do_after(user, 30) || user.get_active_held_item() != I)
return
if(!user.unEquip(I))
return
diff --git a/code/modules/mechs/mech_construction.dm b/code/modules/mechs/mech_construction.dm
index c99e3128f09..ab152232af7 100644
--- a/code/modules/mechs/mech_construction.dm
+++ b/code/modules/mechs/mech_construction.dm
@@ -87,7 +87,7 @@
var/delay = 30 - sqrt(mech_skill * 3)
if(delay > 0)
user.visible_message(span_notice("\The [user] begins trying to install \the [system] into \the [src]."))
- if(!do_after(user, delay, src) || user.get_active_hand() != system) return FALSE
+ if(!do_after(user, delay, src) || user.get_active_held_item() != system) return FALSE
if(user.unEquip(system))
to_chat(user, span_notice("You install \the [system] in \the [src]'s [system_hardpoint]."))
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
diff --git a/code/modules/mechs/mech_interaction.dm b/code/modules/mechs/mech_interaction.dm
index fcc52ee5e16..b2f4b1d4ad2 100644
--- a/code/modules/mechs/mech_interaction.dm
+++ b/code/modules/mechs/mech_interaction.dm
@@ -181,7 +181,7 @@
systm.on_unselect()
selected_hardpoint = null
-/mob/living/exosuit/get_active_hand()
+/mob/living/exosuit/get_active_held_item()
var/obj/item/mech_equipment/ME = selected_system
if(istype(ME))
return ME.get_effective_obj()
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 91acccb25d8..55d1e19539f 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -66,7 +66,7 @@
new /obj/item/stack/cable_coil(user.loc, 1)
overlays = list()
string_attached = null
- to_chat(user, "\blue You detach the string from the coin.")
+ to_chat(user, span_blue("You detach the string from the coin."))
else ..()
/obj/item/coin/attack_self(mob/user as mob)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index c5eb43b7a9c..6f722fed5fe 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -108,7 +108,7 @@
if(..())
return
if(!allowed(user))
- to_chat(user, "\red Access denied.")
+ to_chat(user, span_red("Access denied."))
return
ui_interact(user)
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 5c3477b7938..4f9041f7621 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -52,14 +52,14 @@
..()
if (istype(W, /obj/item/coin))
var/obj/item/coin/C = W
- to_chat(user, "\blue You add the [C.name] into the bag.")
+ to_chat(user, span_blue("You add the [C.name] into the bag."))
usr.drop_item()
contents += C
if (istype(W, /obj/item/moneybag))
var/obj/item/moneybag/C = W
for (var/obj/O in C.contents)
contents += O;
- to_chat(user, "\blue You empty the [C.name] into the bag.")
+ to_chat(user, span_blue("You empty the [C.name] into the bag."))
return
/obj/item/moneybag/Topic(href, href_list)
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 2d9ec29391a..bc26b19194e 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -62,7 +62,7 @@
set src in view(1)
if(!ishuman(usr)) //Only living, intelligent creatures with hands can empty ore boxes.
- to_chat(usr, "\red You are physically incapable of emptying the ore box.")
+ to_chat(usr, span_red("You are physically incapable of emptying the ore box."))
return
if( usr.stat || usr.restrained() )
@@ -75,7 +75,7 @@
add_fingerprint(usr)
if(contents.len < 1)
- to_chat(usr, "\red The ore box is empty")
+ to_chat(usr, span_red("The ore box is empty"))
return
for (var/obj/item/ore/O in contents)
@@ -84,7 +84,7 @@
O.layer = initial(O.layer)
O.set_plane(initial(O.plane))
- to_chat(usr, "\blue You empty the ore box")
+ to_chat(usr, span_blue("You empty the ore box"))
return
diff --git a/code/modules/mob/angel/say.dm b/code/modules/mob/angel/say.dm
index a07820780e4..8fafb8a011d 100644
--- a/code/modules/mob/angel/say.dm
+++ b/code/modules/mob/angel/say.dm
@@ -8,7 +8,7 @@
if (src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- to_chat(src, "\red You cannot talk in deadchat and ANGEL chat (muted).")
+ to_chat(src, span_red("You cannot talk in deadchat and ANGEL chat (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
@@ -19,7 +19,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat and ANGEL chat are globally muted."))
return
@@ -43,7 +43,7 @@
if(src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- to_chat(src, "\red You cannot emote in deadchat and ANGEL chat (muted).")
+ to_chat(src, span_red("You cannot emote in deadchat and ANGEL chat (muted)."))
return
if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
@@ -58,7 +58,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat and ANGEL chat are globally muted."))
return
diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 59f46fda471..8c513051c32 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -166,7 +166,7 @@ note dizziness decrements automatically in the mob's Life() proc.
// What icon do we use for the attack?
var/image/I
- var/obj/item/T = get_active_hand()
+ var/obj/item/T = get_active_held_item()
if (T && T.icon)
I = image(T.icon, A, T.icon_state, A.layer + 1)
else // Attacked with a fist?
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index b8f2b956167..3703b3894c3 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -68,7 +68,7 @@
O.forceMove(loc)
embedded = list()
- for(var/mob/living/carbon/human/H in oviewers(src))
+ for(var/mob/living/carbon/human/H in oviewers(get_turf(src)))
H.sanity.onSeeDeath(src)
SEND_SIGNAL_OLD(H, COMSIG_MOB_DEATH, src)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 6eb644506aa..7ad5aec3a69 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -36,7 +36,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat is globally muted."))
return
@@ -79,4 +79,4 @@
message = "[message]"
for (var/mob/O in messagemobs_neardead)
- O.show_message(message, type)
\ No newline at end of file
+ O.show_message(message, type)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 0f253d773d9..bd11a7047a7 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -93,7 +93,7 @@
nverb = verb
message = language.format_message_radio(message, nverb)
else
- message = "[verb], \"[message]\""
+ message = "[verb], \"[message]\""
on_hear_radio(part_a, speaker_name, part_b, message)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index c647f21637c..a669782f49c 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -1,6 +1,6 @@
//This proc is called whenever someone clicks an inventory ui slot.
/mob/proc/attack_ui(slot)
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
var/obj/item/E = get_equipped_item(slot)
if (istype(E))
if(istype(W))
@@ -14,15 +14,23 @@
//as they handle all relevant stuff like adding it to the player's screen and updating their overlays.
//Returns the thing in our active hand
-/mob/proc/get_active_hand()
+/mob/proc/get_active_held_item()
if(hand) return l_hand
else return r_hand
//Returns the thing in our inactive hand
-/mob/proc/get_inactive_hand()
+/mob/proc/get_inactive_held_item()
if(hand) return r_hand
else return l_hand
+//Check we have an organ for this hand slot (Dismemberment), Only relevant for humans
+/mob/proc/has_hand_for_held_index(i)
+ return TRUE
+
+//Check we have an organ for our active hand slot (Dismemberment),Only relevant for humans
+/mob/proc/has_active_hand()
+ return has_hand_for_held_index(hand)
+
//Declarations. Overrided in human/robots subtypes
//Puts the Item into your l_hand/r_hand if possible and calls all necessary triggers/updates. returns TRUE on success.
/mob/proc/put_in_l_hand(obj/item/Item)
@@ -76,11 +84,11 @@
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something
/mob/proc/drop_item(atom/Target)
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
unEquip(I = I, Target = Target, force = TRUE)
/mob/proc/drop_offhand(atom/Target)
- var/obj/item/I = get_inactive_hand()
+ var/obj/item/I = get_inactive_held_item()
unEquip(I = I, Target = Target, force = TRUE)
/*
@@ -184,7 +192,7 @@
return 0 //zero
//Returns the inventory slot for the current hand
-/mob/proc/get_active_hand_slot()
+/mob/proc/get_active_held_item_slot()
if (hand)
return slot_l_hand
return slot_r_hand
diff --git a/code/modules/mob/inventory/_docs.dm b/code/modules/mob/inventory/_docs.dm
index 14a19d5b54e..66b5638e373 100644
--- a/code/modules/mob/inventory/_docs.dm
+++ b/code/modules/mob/inventory/_docs.dm
@@ -65,7 +65,7 @@ Ovverided for human proc check "slot_back" first.
This proc is called whenever someone clicks an inventory ui slot.
If smth occupy slot, then reslolve_attack/attackhand will be called, else equip_to_slot_if_possible()
It calls:
- - Mob.get_active_hand()
+ - Mob.get_active_held_item()
- Mob.get_equipped_item(slot)
- Mob.equip_to_slot_if_possible(Item, slot)
- or Mob.attackhand(equippedItem)
diff --git a/code/modules/mob/inventory/equip.dm b/code/modules/mob/inventory/equip.dm
index 55fd3815fb8..c61fa3f4451 100644
--- a/code/modules/mob/inventory/equip.dm
+++ b/code/modules/mob/inventory/equip.dm
@@ -126,7 +126,7 @@ var/list/slot_equipment_priority = list(
return backpack
return ..()
/mob/living/carbon/human/proc/quick_equip_storage(obj/item/Item)
- var/potential = src.get_inactive_hand()
+ var/potential = src.get_inactive_held_item()
if(istype(src.back,/obj/item/storage))
var/obj/item/storage/backpack = src.back
if(backpack.attackby(Item,src))
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index f8248d7bfc0..76ec1653716 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -206,7 +206,7 @@
// Language handling.
/mob/proc/add_language(var/language)
- var/datum/language/new_language = all_languages[language]
+ var/datum/language/new_language = GLOB.all_languages[language]
if(!istype(new_language) || (new_language in languages))
return 0
@@ -215,12 +215,12 @@
return 1
/mob/proc/remove_language(var/rem_language)
- var/datum/language/L = all_languages[rem_language]
+ var/datum/language/L = GLOB.all_languages[rem_language]
. = (L in languages)
languages.Remove(L)
/mob/living/remove_language(rem_language)
- var/datum/language/L = all_languages[rem_language]
+ var/datum/language/L = GLOB.all_languages[rem_language]
if(default_language == L)
default_language = null
return ..()
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index 0917ef35296..7d929917be6 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -37,7 +37,7 @@
S.show_message("[message_start] [message_body]", 2)
- var/list/listening = hearers(1, src)
+ var/list/listening = hearers(1, get_turf(src))
listening -= src
for (var/mob/living/M in listening)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 8e48acafb9a..deec11d0eb1 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -40,10 +40,10 @@
var/obj/item/organ/internal/vital/brain/B = O
if(B.health <= 0)
- to_chat(user, "\red That brain is well and truly dead.")
+ to_chat(user, span_red("That brain is well and truly dead."))
return
else if(!B.brainmob)
- to_chat(user, "\red You aren't sure where this brain came from, but you're pretty sure it's a useless brain.")
+ to_chat(user, span_red("You aren't sure where this brain came from, but you're pretty sure it's a useless brain."))
return
var/mob/living/carbon/brain/BM = B.brainmob
if(!BM.client)
@@ -55,8 +55,8 @@
to_chat(user, span_warning("\The [src] indicates that \the [B] is unresponsive."))
return
- for(var/mob/V in viewers(src, null))
- V.show_message(text("\blue [user] sticks \a [O] into \the [src]."))
+ for(var/mob/V in viewers(get_turf(src)))
+ V.show_message(span_blue("[user] sticks \a [O] into \the [src]."))
brainmob = B.brainmob
brainmob.loc = src
@@ -81,9 +81,9 @@
if((istype(O,/obj/item/card/id)||istype(O,/obj/item/modular_computer/pda)) && brainmob)
if(allowed(user))
locked = !locked
- to_chat(user, "\blue You [locked ? "lock" : "unlock"] the brain holder.")
+ to_chat(user, span_blue("You [locked ? "lock" : "unlock"] the brain holder."))
else
- to_chat(user, "\red Access denied.")
+ to_chat(user, span_red("Access denied."))
return
if(brainmob)
O.attack(brainmob, user)//Oh noooeeeee
@@ -93,11 +93,11 @@
//TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data.
/obj/item/device/mmi/attack_self(mob/user as mob)
if(!brainmob)
- to_chat(user, "\red You upend the MMI, but there's nothing in it.")
+ to_chat(user, span_red("You upend the MMI, but there's nothing in it."))
else if(locked)
- to_chat(user, "\red You upend the MMI, but the brain is clamped into place.")
+ to_chat(user, span_red("You upend the MMI, but the brain is clamped into place."))
else
- to_chat(user, "\blue You upend the MMI, spilling the brain onto the floor.")
+ to_chat(user, span_blue("You upend the MMI, spilling the brain onto the floor."))
var/obj/item/organ/internal/vital/brain/brain
if (brainobj) //Pull brain organ out of MMI.
brainobj.loc = user.loc
@@ -168,7 +168,7 @@
to_chat(brainmob, "Can't do that while incapacitated or dead.")
radio.broadcasting = radio.broadcasting==1 ? 0 : 1
- to_chat(brainmob, "\blue Radio is [radio.broadcasting==1 ? "now" : "no longer"] broadcasting.")
+ to_chat(brainmob, span_blue("Radio is [radio.broadcasting==1 ? "now" : "no longer"] broadcasting."))
/obj/item/device/mmi/radio_enabled/verb/Toggle_Listening()
set name = "Toggle Listening"
@@ -181,7 +181,7 @@
to_chat(brainmob, "Can't do that while incapacitated or dead.")
radio.listening = radio.listening==1 ? 0 : 1
- to_chat(brainmob, "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.")
+ to_chat(brainmob, span_blue("Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."))
/obj/item/device/mmi/emp_act(severity)
if(!brainmob)
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 43f094ac982..d985e429735 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -17,7 +17,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot send IC messages (muted).")
+ to_chat(src, span_red("You cannot send IC messages (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
@@ -62,9 +62,9 @@
if ("help")
to_chat(src, "alarm,alert,notice,flash,blink,whistle,beep,boop")
else
- to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+ to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list."))
if (message)
log_emote("[name]/[key] : [message]")
- send_emote(message, m_type)
\ No newline at end of file
+ send_emote(message, m_type)
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index c9ab7ad2677..f59a5540300 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -6,9 +6,9 @@
if(radiation > 100)
radiation = 100
if(!container)//If it's not in an MMI
- to_chat(src, "\red You feel weak.")
+ to_chat(src, span_red("You feel weak."))
else//Fluff-wise, since the brain can't detect anything itself, the MMI handles thing like that
- to_chat(src, "\red STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.")
+ to_chat(src, span_red("STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED."))
switch(radiation)
if(1 to 49)
@@ -23,9 +23,9 @@
if(prob(5))
radiation -= 5
if(!container)
- to_chat(src, "\red You feel weak.")
+ to_chat(src, span_red("You feel weak."))
else
- to_chat(src, "\red STATUS: DANGEROUS LEVELS OF RADIATION DETECTED.")
+ to_chat(src, span_red("STATUS: DANGEROUS LEVELS OF RADIATION DETECTED."))
updatehealth()
if(75 to 100)
@@ -99,7 +99,7 @@
blinded = TRUE
silent = 0
else //ALIVE. LIGHTS ARE ON
- if( !container && (health < HEALTH_THRESHOLD_DEAD || ((world.time - timeofhostdeath) > config.revival_brain_life)) )
+ if( !container && (health < CONFIG_GET(number/health_threshold_dead) || ((world.time - timeofhostdeath) > CONFIG_GET(number/revival_brain_life))) )
death()
blinded = TRUE
silent = 0
@@ -121,7 +121,7 @@
silent = 1
if(!alert)//Sounds an alarm, but only once per 'level'
emote("alarm")
- to_chat(src, "\red Major electrical distruption detected: System rebooting.")
+ to_chat(src, span_red("Major electrical distruption detected: System rebooting."))
alert = 1
if(prob(75))
emp_damage -= 1
@@ -137,7 +137,7 @@
ear_damage = 1
if(!alert)
emote("alert")
- to_chat(src, "\red Primary systems are now online.")
+ to_chat(src, span_red("Primary systems are now online."))
alert = 1
if(prob(50))
emp_damage -= 1
@@ -149,13 +149,13 @@
if(2 to 9)//Low level of EMP damage, has few effects(handled elsewhere)
if(!alert)
emote("notice")
- to_chat(src, "\red System reboot nearly complete.")
+ to_chat(src, span_red("System reboot nearly complete."))
alert = 1
if(prob(25))
emp_damage -= 1
if(1)
alert = 0
- to_chat(src, "\red All systems restored.")
+ to_chat(src, span_red("All systems restored."))
emp_damage -= 1
//Other
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 9b297253668..935dd76d5a9 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -48,7 +48,7 @@
/obj/item/device/mmi/digital/posibrain/examine(mob/user, extra_description = "")
if(get_dist(user, src) < 2)
- var/msg = "[span_info("*---------*")]\nThis is \icon[src] \a [src]!\n[desc]\n"
+ var/msg = "[span_info("*---------*")]\nThis is [icon2html(src, user)] \a [src]!\n[desc]\n"
msg += ""
if(brainmob && brainmob.key)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 934f685a1bb..e156023ecab 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -45,7 +45,7 @@
if(user.last_special <= world.time)
user.last_special = world.time + 50
src.visible_message(span_danger("You hear something rumbling inside [src]'s stomach..."))
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(I && I.force)
var/d = rand(round(I.force / 4), I.force)
if(ishuman(src))
@@ -71,9 +71,9 @@
if(M in src.stomach_contents)
src.stomach_contents.Remove(M)
M.loc = src.loc
- for(var/mob/N in viewers(src, null))
+ for(var/mob/N in viewers(get_turf(src)))
if(N.client)
- N.show_message(text("\red [M] bursts out of [src]!"), 2)
+ N.show_message(span_red("[M] bursts out of [src]!"), 2)
..()
/mob/living/carbon/attack_hand(mob/M as mob)
@@ -83,7 +83,7 @@
if (H.hand)
temp = H.organs_by_name[BP_L_ARM]
if(temp && !temp.is_usable())
- to_chat(H, "\red You can't use your [temp.name]")
+ to_chat(H, span_red("You can't use your [temp.name]"))
return
@@ -97,17 +97,17 @@
playsound(loc, "sparks", 50, 1, -1)
if (shock_damage > 15)
src.visible_message(
- "\red [src] was shocked by the [source]!", \
- "\red You feel a powerful shock course through your body!", \
- "\red You hear a heavy electrical crack." \
+ span_red("[src] was shocked by the [source]!"), \
+ span_red("You feel a powerful shock course through your body!"), \
+ span_red("You hear a heavy electrical crack.") \
)
SEND_SIGNAL_OLD(src, COMSIG_CARBON_ELECTROCTE)
Weaken(max(min(10,round(shock_damage / 10 )), 2) SECONDS)
else
src.visible_message(
- "\red [src] was mildly shocked by the [source].", \
- "\red You feel a mild shock course through your body.", \
- "\red You hear a light zapping." \
+ span_red("[src] was mildly shocked by the [source]."), \
+ span_red("You feel a mild shock course through your body."), \
+ span_red("You hear a light zapping.") \
)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -120,7 +120,7 @@
//We cache the held items before and after swapping using get active hand.
//This approach is future proof and will support people who possibly have >2 hands
- var/obj/item/prev_held = get_active_hand()
+ var/obj/item/prev_held = get_active_held_item()
if(prev_held)
if(prev_held.wielded)
@@ -131,7 +131,7 @@
for (var/obj/screen/inventory/hand/H in src.HUDinventory)
H.update_icon()
- var/obj/item/new_held = get_active_hand()
+ var/obj/item/new_held = get_active_held_item()
//Tell the old and new held items that they've been swapped
@@ -157,7 +157,7 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
- if (src.health >= HEALTH_THRESHOLD_CRIT)
+ if (src.health >= CONFIG_GET(number/health_threshold_crit))
if(src == M && ishuman(src))
var/mob/living/carbon/human/H = src
H.check_self_for_injuries()
@@ -204,12 +204,14 @@
if(show_ssd && !client && !teleop)
M.visible_message(span_notice("[M] shakes [src] trying to wake [t_him] up!"), \
span_notice("You shake [src], but they do not respond... Maybe they have S.S.D?"))
+ jiggle()
else if(lying || src.sleeping)
src.sleeping = max(0,src.sleeping-5)
if(src.sleeping == 0)
src.resting = 0
M.visible_message(span_notice("[M] shakes [src] trying to wake [t_him] up!"), \
span_notice("You shake [src] trying to wake [t_him] up!"))
+ jiggle()
else if((M.targeted_organ == BP_HEAD) && target_organ_exists)
M.visible_message(span_notice("[M] pats [src]'s head."), \
span_notice("You pat [src]'s head."))
@@ -217,6 +219,7 @@
if(target_organ_exists)
M.visible_message(span_notice("[M] shakes hands with [src]."), \
span_notice("You shake hands with [src]."))
+ animate_interact(src, INTERACT_GENERIC)
else
M.visible_message(span_notice("[M] holds out \his hand to [src]."), \
span_notice("You hold out your hand to [src]."))
@@ -227,6 +230,7 @@
else
M.visible_message(span_notice("[M] hugs [src] to make [t_him] feel better!"), \
span_notice("You hug [src] to make [t_him] feel better!"))
+ animate_interact(src, INTERACT_HELP)
if(M.fire_stacks >= (src.fire_stacks + 3))
src.fire_stacks += 1
M.fire_stacks -= 1
@@ -261,7 +265,7 @@
return
if(target.type == /obj/screen) return
- var/atom/movable/item = src.get_active_hand()
+ var/atom/movable/item = src.get_active_held_item()
if(!item) return
@@ -285,7 +289,7 @@
M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
- msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)")
+ msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] [ADMIN_JMP(usr)]")
item.throw_at(target, item.throw_range, item.throw_speed, src)
return
@@ -350,7 +354,7 @@
set category = "IC"
if(usr.sleeping)
- to_chat(usr, "\red You are already sleeping")
+ to_chat(usr, span_red("You are already sleeping"))
return
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
usr.sleeping = 20 //Short nap
@@ -391,7 +395,7 @@
if(!species)
return null
- return species.default_language ? all_languages[species.default_language] : null
+ return species.default_language ? GLOB.all_languages[species.default_language] : null
/mob/living/carbon/show_inv(mob/user as mob)
user.set_machine(src)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 38789de4702..1df02b93803 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,4 +1,6 @@
+#define SHAKE_ANIMATION_OFFSET 4
+
//Called when the mob is hit with an item in combat.
/mob/living/carbon/resolve_item_attack(obj/item/I, mob/living/user, var/hit_zone)
if(check_attack_throat(I, user))
@@ -72,7 +74,7 @@ true, and the mob is not yet deleted, so we need to check that as well*/
return 0
damage_through_armor(W.force, W.damtype, BP_HEAD, wounding_multiplier = 2, sharp = W.sharp, edge = W.edge, used_weapon = W)
-
+
user.visible_message(span_danger("\The [user] cuts [src]'s neck with \the [W]!"), span_danger("You cut [src]'s neck with \the [W]!"))
if(W.hitsound)
@@ -88,3 +90,12 @@ true, and the mob is not yet deleted, so we need to check that as well*/
else
return 0
+
+/mob/living/carbon/proc/jiggle()
+ if (incapacitated())
+ var/direction = prob(50) ? -1 : 1
+ animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
+ animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN)
+
+#undef SHAKE_ANIMATION_OFFSET
diff --git a/code/modules/mob/living/carbon/carbon_powers.dm b/code/modules/mob/living/carbon/carbon_powers.dm
index 5c6899b963d..8c04a5f6436 100644
--- a/code/modules/mob/living/carbon/carbon_powers.dm
+++ b/code/modules/mob/living/carbon/carbon_powers.dm
@@ -10,7 +10,7 @@
var/mob/living/simple_animal/borer/B = get_brain_worms()
if(B && B.host_brain)
- to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]")
+ to_chat(src, span_red("You withdraw your probosci, releasing control of [B.host_brain]"))
B.detach()
@@ -22,7 +22,7 @@
/mob/living/carbon/proc/talk_host))
else
- to_chat(src, "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !")
+ to_chat(src, span_red("ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !"))
//Brain slug proc for talking to the host.
/mob/living/carbon/proc/talk_host()
@@ -39,7 +39,7 @@
if(B.host_brain.ckey)
text = input("What would you like to say?", "Speak to captive host", null, null)
text = capitalize(sanitize(text))
- if(!text)
+ if(!text)
return
log_say("Borer said to its host [text]")
@@ -57,8 +57,8 @@
return
if(B.chemicals >= reproduce_cost)
- to_chat(src, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")
- visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")
+ to_chat(src, span_red("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body."))
+ visible_message(span_red("[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!"))
B.chemicals -= reproduce_cost
B.has_reproduced = 1
if(istype(B.host, /mob/living/carbon/human/) && !B.host.isMonkey())// this is a mess but host's var grabs "[human_name] (mob/living/carbon/human/)"
@@ -73,4 +73,4 @@
else
to_chat(src, "You do not have enough chemicals stored to reproduce. (You need [reproduce_cost]).")
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index af68b76dbcf..cdd32dff098 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -7,9 +7,9 @@
if(!istype(target) || target.incapacitated() || target.client == null)
return
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if(!I)
- I = usr.get_inactive_hand()
+ I = usr.get_inactive_held_item()
if(!I)
to_chat(usr, span_warning("You don't have anything in your hands to give to \the [target]."))
return
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index c07eacef9e6..68b3577fb34 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- to_chat(H, "\blue [cure_message]")
+ to_chat(H, span_blue("[cure_message]"))
return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index e3c8bbbb8fc..067f0416b2f 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -10,7 +10,7 @@
if(species == new_species)
return
- if(!(new_species in all_species))
+ if(!(new_species in GLOB.all_species))
return
set_species(new_species)
@@ -136,7 +136,7 @@
return 1
/mob/living/carbon/human/proc/generate_valid_species()
- return all_species
+ return GLOB.all_species
/mob/living/carbon/human/proc/generate_valid_hairstyles(var/check_gender = 1)
. = list()
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index 62f9cf75f80..1895c63fb8f 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- H <<"\blue [cure_message]"
+ H <= 2)
msg += "[span_deptradio("Damage Specifics:")] [round(src.getOxyLoss(), 1)]-[round(src.getToxLoss(), 1)]-[round(src.getFireLoss(), 1)]-[round(src.getBruteLoss(), 1)]\n"
- if(print_flavor_text()) msg += "[print_flavor_text()]\n"
+ var/flavor_text = get_flavor_text()
+ if(flavor_text) msg += "[flavor_text]"
- msg += "*---------* "
if (pose)
+ msg += "\n"
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\n[T.He] [T.is] [pose]"
if(isobserver(user))
- to_chat(user, msg)
+ to_chat(user, boxed_message("[span_infoplain(msg)]"))
else
- user.visible_message("[user.name] looks at [src].", msg)
+ user.visible_message("[user.name] looks at [src].", boxed_message("[span_infoplain(msg)]"))
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M as mob, hudtype)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 652fcba00c5..f2e0193cf2c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -440,7 +440,7 @@ var/list/rank_prefix = list(\
U.handle_regular_hud_updates()
if(!modified)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecord"])
if(hasHUD(usr,"security"))
@@ -468,7 +468,7 @@ var/list/rank_prefix = list(\
read = 1
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecordComment"])
if(hasHUD(usr,"security"))
@@ -496,7 +496,7 @@ var/list/rank_prefix = list(\
to_chat(usr, "\[Add comment\]")
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecordadd"])
if(hasHUD(usr,"security"))
@@ -524,10 +524,10 @@ var/list/rank_prefix = list(\
counter++
if(ishuman(usr))
var/mob/living/carbon/human/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]")
if(isrobot(usr))
var/mob/living/silicon/robot/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]")
if(href_list["medical"])
if(hasHUD(usr,"medical"))
@@ -563,7 +563,7 @@ var/list/rank_prefix = list(\
U.handle_regular_hud_updates()
if(!modified)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["medrecord"])
if(hasHUD(usr,"medical"))
@@ -596,7 +596,7 @@ var/list/rank_prefix = list(\
read = 1
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["medrecordComment"])
if(hasHUD(usr,"medical"))
@@ -628,7 +628,7 @@ var/list/rank_prefix = list(\
to_chat(usr, "\[Add comment\]")
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["medrecordadd"])
if(hasHUD(usr,"medical"))
@@ -656,10 +656,10 @@ var/list/rank_prefix = list(\
counter++
if(ishuman(usr))
var/mob/living/carbon/human/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]")
if(isrobot(usr))
var/mob/living/silicon/robot/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]")
+ R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]")
if(href_list["lookitem"])
var/obj/item/I = locate(href_list["lookitem"])
@@ -736,7 +736,11 @@ var/list/rank_prefix = list(\
/mob/living/carbon/human/proc/play_xylophone()
if(!src.xylophone)
- visible_message("\red \The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.")
+ visible_message(
+ span_red("\The [src] begins playing \his ribcage like a xylophone. It's quite spooky."),
+ span_blue("You begin to play a spooky refrain on your ribcage."),
+ span_red("You hear a spooky xylophone melody.")
+ )
var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg')
playsound(loc, song, 50, 1, -1)
xylophone = 1
@@ -928,7 +932,7 @@ var/list/rank_prefix = list(\
/mob/living/carbon/human/proc/set_species(new_species, default_colour)
// No more invisible screaming wheelchairs because of set_species() typos.
- if(!all_species[new_species])
+ if(!GLOB.all_species[new_species])
new_species = SPECIES_HUMAN
if(species)
@@ -943,7 +947,7 @@ var/list/rank_prefix = list(\
species.remove_inherent_verbs(src)
holder_type = null
- species = all_species[new_species]
+ species = GLOB.all_species[new_species]
if(species.language)
add_language(species.language)
@@ -1211,7 +1215,7 @@ var/list/rank_prefix = list(\
fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into."
to_chat(user, span_warning(fail_msg))
-/mob/living/carbon/human/print_flavor_text(shrink = 1)
+/mob/living/carbon/human/get_flavor_text(shrink = 1)
var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes)
for(var/obj/item/clothing/C in equipment)
@@ -1302,8 +1306,8 @@ var/list/rank_prefix = list(\
var/obj/item/clothing/under/U = w_uniform
if(U.accessories.len)
for(var/obj/item/clothing/accessory/holster/H in U.accessories)
- if(get_active_hand())//do we hold something?
- H.attackby(get_active_hand(), src)
+ if(get_active_held_item())//do we hold something?
+ H.attackby(get_active_held_item(), src)
else
H.attack_hand(src)
holster_found = TRUE
@@ -1376,8 +1380,11 @@ var/list/rank_prefix = list(\
/mob/living/carbon/human/proc/check_self_for_injuries()
if(stat)
return
+ visible_message(span_notice("You examine yourself."), span_notice("[src] examines themself."))
- to_chat(src, span_notice("You check yourself for injuries."))
+ var/list/combined_msg = list()
+
+ combined_msg += span_boldnotice("I check myself for injuries.")
for(var/obj/item/organ/external/org in organs)
var/list/status = list()
@@ -1421,7 +1428,25 @@ var/list/rank_prefix = list(\
if(status.len)
status_text = span_warning(english_list(status))
- src.show_message("My [org.name] is [status_text].",1)
+ combined_msg += "My [org.name] is [status_text]."
+
+ combined_msg += "\n"
+
+ switch(nutrition)
+ if(NUTRITION_LEVEL_FULL to INFINITY)
+ combined_msg += span_info("I'm completely stuffed!")
+ if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL)
+ combined_msg += span_info("I'm well fed!")
+ if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED)
+ combined_msg += span_info("I'm not hungry.")
+ if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED)
+ combined_msg += span_info("I could use a bite to eat.")
+ if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY)
+ combined_msg += span_info("I feel quite hungry.")
+ if(0 to NUTRITION_LEVEL_STARVING)
+ combined_msg += span_danger("I'm starving!")
+
+ to_chat(src, boxed_message(combined_msg.Join("\n")))
/mob/living/carbon/human/need_breathe()
// if(!(mNobreath in mutations))
@@ -1458,7 +1483,7 @@ var/list/rank_prefix = list(\
if(oxyLoss > 20)
setOxyLoss(20)
- if(getBruteLoss() + getFireLoss() >= abs(HEALTH_THRESHOLD_DEAD))
+ if(getBruteLoss() + getFireLoss() >= abs(CONFIG_GET(number/health_threshold_dead)))
resuscitate_notify(5)
timeofdeath = 0
return 0
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index f87c28d1c89..fa7ad227366 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -16,7 +16,7 @@
if(H.hand)
temp = H.organs_by_name[BP_L_ARM]
if(!temp || !temp.is_usable())
- to_chat(H, "\red You can't use your hand.")
+ to_chat(H, span_red("You can't use your hand."))
return
H.stop_blocking()
@@ -33,7 +33,7 @@
var/damage = rand(0, 9)
if(!damage)
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- visible_message("\red [H] has attempted to punch [src]!")
+ visible_message(span_red("[H] has attempted to punch [src]!"))
return 0
var/obj/item/organ/external/affecting = get_organ(ran_zone(H.targeted_organ))
@@ -42,11 +42,11 @@
playsound(loc, "punch", 25, 1, -1)
- visible_message("\red [H] has punched [src]!")
+ visible_message(span_red("[H] has punched [src]!"))
damage_through_armor(damage, HALLOSS, affecting, ARMOR_MELEE)
if(damage >= 9)
- visible_message("\red [H] has weakened [src]!")
+ visible_message(span_red("[H] has weakened [src]!"))
apply_effect(4, WEAKEN, getarmor(affecting, ARMOR_MELEE))
return
@@ -55,7 +55,7 @@
if(I_HELP)
if(can_operate(src, M) == CAN_OPERATE_ALL && do_surgery(src, M, null, TRUE))
return 1
- else if(istype(H) && health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD)
+ else if(istype(H) && health < CONFIG_GET(number/health_threshold_crit) && health > CONFIG_GET(number/health_threshold_dead))
if(H == src)
to_chat(H, span_notice("You can't perform CPR on yourself."))
return
@@ -215,8 +215,8 @@
//Try to reduce damage by blocking
if(blocking)
- if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item.
- var/obj/item/grab/G = get_active_hand()
+ if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item.
+ var/obj/item/grab/G = get_active_held_item()
grab_redirect_attack(M, G)
return
else
@@ -247,7 +247,7 @@
if(w_uniform)
w_uniform.add_fingerprint(M)
- var/list/holding = list(get_active_hand() = 40, get_inactive_hand = 20)
+ var/list/holding = list(get_active_held_item() = 40, get_inactive_held_item = 20)
//See if they have any guns that might go off
for(var/obj/item/gun/W in holding)
@@ -277,7 +277,7 @@
visible_message(span_warning("[M] attempted to disarm [src]"))
return
if(istype(I, /obj/item/twohanded/offhand)) //did someone dare to switch to offhand to not get disarmed?
- unEquip(src.get_inactive_hand())
+ unEquip(src.get_inactive_held_item())
visible_message(span_danger("[M] has disarmed [src]!"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index bddcb92592d..e9dff6ebfcf 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -304,7 +304,6 @@ This function restores all organs.
return 0
return
-
/mob/living/carbon/human/proc/get_organ(zone)
RETURN_TYPE(/obj/item/organ/external)
if(!zone)
@@ -313,6 +312,14 @@ This function restores all organs.
zone = BP_HEAD
return organs_by_name[zone]
+/mob/living/carbon/human/proc/get_hand_organs()
+ RETURN_TYPE(/obj/item/organ/external)
+
+ return list(
+ organs_by_name[BP_R_ARM],
+ organs_by_name[BP_L_ARM],
+ )
+
/mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone, armor_divisor = 1, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, obj/used_weapon, armor_divisor)
//visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]")
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 992cbba89a1..c5d9cce7b0e 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -212,8 +212,8 @@ meteor_act
var/item_size_affect = 0 //the bigger the thing you hold is, the more damage you can block
var/toughness = max(1, stats.getStat(STAT_TGH))
//passive blocking with shields is handled differently(code is above this proc)
- if(get_active_hand())//are we blocking with an item?
- var/obj/item/I = get_active_hand()
+ if(get_active_held_item())//are we blocking with an item?
+ var/obj/item/I = get_active_held_item()
if(istype(I))
item_size_affect = I.w_class * 5
stat_affect = 0.2
@@ -281,8 +281,8 @@ meteor_act
return FALSE
if(blocking)
- if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item.
- var/obj/item/grab/G = get_active_hand()
+ if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item.
+ var/obj/item/grab/G = get_active_held_item()
grab_redirect_attack(G, I)
return FALSE
else
@@ -379,7 +379,7 @@ meteor_act
visible_message(span_warning("[src] is winded!"), span_danger("You feel disoriented!"))
confused = max(confused, 2)
external_recoil(40)
- var/obj/item/item_in_active_hand = get_active_hand()
+ var/obj/item/item_in_active_hand = get_active_held_item()
if(recoil >= 60 && item_in_active_hand)
if(istype(item_in_active_hand, /obj/item/grab))
break_all_grabs(user) //See about breaking grips or pulls
@@ -409,7 +409,7 @@ meteor_act
if(istype(AM,/obj/))
var/obj/O = AM
- if(in_throw_mode && !get_active_hand() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode
+ if(in_throw_mode && !get_active_held_item() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode
if(canmove && !restrained())
if(isturf(O.loc))
put_in_active_hand(O)
@@ -447,7 +447,7 @@ meteor_act
if (O.is_hot() >= HEAT_MOBIGNITE_THRESHOLD)
IgniteMob()
- src.visible_message("\red [src] has been hit in the [hit_area] by [O].")
+ src.visible_message(span_red("[src] has been hit in the [hit_area] by [O]."))
damage_through_armor(throw_damage, dtype, null, ARMOR_MELEE, null, used_weapon = O, sharp = is_sharp(O), edge = has_edge(O))
@@ -458,7 +458,7 @@ meteor_act
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!ismouse(src))
- msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)")
+ msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]")
//thrown weapon embedded object code.
if(istype(O,/obj/item))
@@ -486,7 +486,7 @@ meteor_act
if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED)
var/dir = get_dir(O.throw_source, src)
- visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!")
+ visible_message(span_red("[src] staggers under the impact!"), span_red("You stagger under the impact!"))
src.throw_at(get_edge_target_turf(src,dir),1,momentum)
if(!O || !src) return
diff --git a/code/modules/mob/living/carbon/human/human_hud.dm b/code/modules/mob/living/carbon/human/human_hud.dm
index e7d5cb063e4..fd173631ba3 100644
--- a/code/modules/mob/living/carbon/human/human_hud.dm
+++ b/code/modules/mob/living/carbon/human/human_hud.dm
@@ -103,7 +103,7 @@
var/slotID = get_inventory_slot(I)
I.screen_loc = find_inv_position(slotID)
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if(I)
I.update_hud_actions()
/* update_inv_w_uniform(0)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 89dbe288ca9..a3a876d05aa 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -26,8 +26,8 @@
tally += 1
if(recoil)
- var/obj/item/gun/GA = get_active_hand()
- var/obj/item/gun/GI = get_inactive_hand()
+ var/obj/item/gun/GA = get_active_held_item()
+ var/obj/item/gun/GI = get_inactive_held_item()
var/brace_recoil = 0
if(istype(GA))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index c39592a7f57..3df095ecbcc 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -45,9 +45,9 @@
if(failed)
src.Weaken(rand(2,4))
- for(var/mob/O in viewers(src, null))
+ for(var/mob/O in viewers(get_turf(src)))
if ((O.client && !( O.blinded )))
- O.show_message(text("\red [] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1)
+ O.show_message(span_red(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T)), 1)
/mob/living/carbon/human/proc/leap(mob/living/carbon/human/T)
if(last_special > world.time)
@@ -87,16 +87,16 @@
return
if(stat || paralysis || stunned || weakened || lying)
- to_chat(src, "\red You cannot do that in your current state.")
+ to_chat(src, span_red("You cannot do that in your current state."))
return
var/obj/item/grab/G = locate() in src
if(!G || !istype(G))
- to_chat(src, "\red You are not grabbing anyone.")
+ to_chat(src, span_red("You are not grabbing anyone."))
return
if(G.state < GRAB_AGGRESSIVE)
- to_chat(src, "\red You must have an aggressive grab to gut your prey!")
+ to_chat(src, span_red("You must have an aggressive grab to gut your prey!"))
return
last_special = world.time + 50
@@ -143,7 +143,7 @@
log_say("[key_name(src)] communed to [key_name(M)]: [text]")
- to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")
+ to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.name == src.species.name)
@@ -163,7 +163,7 @@
if(M in stomach_contents)
stomach_contents.Remove(M)
M.loc = loc
- src.visible_message("\red [src] hurls out the contents of their stomach!")
+ src.visible_message(span_red("[src] hurls out the contents of their stomach!"))
return
/mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview())
@@ -174,8 +174,8 @@
var/msg = sanitize(input("Message:", "Psychic Whisper") as text|null)
if(msg)
log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]")
- to_chat(M, "\green You hear a strange, alien voice in your head... \italic [msg]")
- to_chat(src, "\green You said: \"[msg]\" to [M]")
+ to_chat(M, span_green("You hear a strange, alien voice in your head... \italic [msg]"))
+ to_chat(src, span_green("You said: \"[msg]\" to [M]"))
return
@@ -249,7 +249,11 @@
gender = FEMALE
regenerate_icons()
- visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
+ visible_message(
+ span_blue("\The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!"),
+ span_blue("You change your appearance!"),
+ span_red("Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!")
+ )
/mob/living/carbon/human/proc/phaze_trough()
set name = "Phaze"
@@ -344,10 +348,10 @@
var/say = sanitize(input("What do you wish to say"))
if(get_active_mutation(target, MUTATION_REMOTESAY))
- target.show_message("\blue You hear [real_name]'s voice: [say]")
+ target.show_message(span_blue("You hear [real_name]'s voice: [say]"))
else
- target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
- show_message("\blue You project your mind into [target.real_name]: [say]")
+ target.show_message(span_blue("You hear a voice that seems to echo around the room: [say]"))
+ show_message(span_blue("You project your mind into [target.real_name]: [say]"))
log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]")
for(var/mob/observer/ghost/G in world)
G.show_message("Telepathic message from [src] to [target]: [say]")
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index afc258eccd2..01f17640f1f 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -7,7 +7,7 @@ This saves us from having to call add_fingerprint() any time something is put in
set name = "quick-equip"
set hidden = 1
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if(!I)
to_chat(src, span_notice("You are not holding anything to equip."))
return
@@ -33,7 +33,7 @@ This saves us from having to call add_fingerprint() any time something is put in
set name = "belt-equip"
set hidden = 1
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if(!I)
to_chat(src, span_notice("You are not holding anything to equip."))
return
@@ -43,7 +43,7 @@ This saves us from having to call add_fingerprint() any time something is put in
set name = "suit-storage-equip"
set hidden = 1
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
if(I)
if(src.s_store)
to_chat(src, span_notice("You have no room to equip or draw."))
@@ -68,7 +68,7 @@ This saves us from having to call add_fingerprint() any time something is put in
var/obj/item/storage/S
- for(var/i in list(get_inactive_hand(), back, get_active_hand()))
+ for(var/i in list(get_inactive_held_item(), back, get_active_held_item()))
if(istype(i, /obj/item/storage))
S = i
break
@@ -80,7 +80,7 @@ This saves us from having to call add_fingerprint() any time something is put in
break
if(S && (!istype(S, /obj/item/storage/backpack) || S:worn_check()))
- equip_to_from_bag(get_active_hand(), S)
+ equip_to_from_bag(get_active_held_item(), S)
//Puts the item into our active hand if possible. returns 1 on success.
@@ -240,7 +240,7 @@ This saves us from having to call add_fingerprint() any time something is put in
update_action_buttons()
return 1
-/mob/living/carbon/human/proc/get_active_hand_organ()
+/mob/living/carbon/human/proc/get_active_held_item_organ()
if(hand)
return get_organ(BP_L_ARM)
else
@@ -257,7 +257,7 @@ This saves us from having to call add_fingerprint() any time something is put in
SEND_SIGNAL_OLD(src, COMSING_HUMAN_EQUITP, W)
switch(slot)
if(slot_in_backpack)
- if(src.get_active_hand() == W)
+ if(src.get_active_held_item() == W)
src.remove_from_mob(W)
W.forceMove(src.back)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index f3de8e1a4bc..f2265e87ea2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -200,7 +200,7 @@
to_chat(src, span_warning("It becomes hard to see for some reason."))
eye_blurry = 10
if(getBrainLoss() >= 35)
- if(7 <= rn && rn <= 9) if(get_active_hand())
+ if(7 <= rn && rn <= 9) if(get_active_held_item())
to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!"))
drop_item()
if(getBrainLoss() >= 45)
@@ -329,7 +329,7 @@
failed_last_breath = 1
if(prob(20))
emote("gasp")
- if(health > HEALTH_THRESHOLD_CRIT)
+ if(health > CONFIG_GET(number/health_threshold_crit))
adjustOxyLoss(HUMAN_MAX_OXYLOSS)
else
adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
@@ -791,7 +791,7 @@
blinded = TRUE
silent = 0
return 1
- if(health <= HEALTH_THRESHOLD_DEAD) //No health = death
+ if(health <= CONFIG_GET(number/health_threshold_dead)) //No health = death
if(stats.getPerk(PERK_UNFINISHED_DELIVERY) && prob(33)) //Unless you have this perk
heal_organ_damage(20, 20)
adjustOxyLoss(-100)
@@ -968,7 +968,7 @@
var/external_health = (1 - (limb_health ? limb_damage / limb_health : 0)) * 100
var/internal_health = (1 - (organ_health ? organ_damage / organ_health : 0)) * 100
- var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-HEALTH_THRESHOLD_CRIT)/(maxHealth-HEALTH_THRESHOLD_CRIT)*100)
+ var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(maxHealth-CONFIG_GET(number/health_threshold_crit))*100)
holder.icon_state = "hud[percentage_health]"
hud_list[HEALTH_HUD] = holder
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 1b97f088687..281fedf99c9 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -219,9 +219,9 @@
else
return capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names))
- var/datum/language/species_language = all_languages[name_language]
+ var/datum/language/species_language = GLOB.all_languages[name_language]
if(!species_language)
- species_language = all_languages[default_language]
+ species_language = GLOB.all_languages[default_language]
if(!species_language)
return "unknown"
return species_language.get_random_name(gender)
@@ -233,9 +233,9 @@
else
return capitalize(pick(GLOB.first_names_male))
- var/datum/language/species_language = all_languages[name_language]
+ var/datum/language/species_language = GLOB.all_languages[name_language]
if(!species_language)
- species_language = all_languages[default_language]
+ species_language = GLOB.all_languages[default_language]
if(!species_language)
return "unknown"
return species_language.get_random_name(gender)
@@ -244,9 +244,9 @@
if(!name_language)
return capitalize(pick(GLOB.last_names))
- var/datum/language/species_language = all_languages[name_language]
+ var/datum/language/species_language = GLOB.all_languages[name_language]
if(!species_language)
- species_language = all_languages[default_language]
+ species_language = GLOB.all_languages[default_language]
if(!species_language)
return "unknown"
return species_language.get_random_name()
@@ -346,7 +346,7 @@
if(H.equipment_tint_total >= TINT_BLIND)
H.eye_blind = max(H.eye_blind, 1)
- if(config.welder_vision)
+ if(CONFIG_GET(flag/welder_vision))
if(H.equipment_tint_total == TINT_HEAVY)
H.client.screen |= global_hud.darkMask
else if((!H.equipment_prescription && (H.sdisabilities & NEARSIGHTED)) || H.equipment_tint_total == TINT_MODERATE)
diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm
index 0ee70610054..5b17016c3d3 100644
--- a/code/modules/mob/living/carbon/human/stripping.dm
+++ b/code/modules/mob/living/carbon/human/stripping.dm
@@ -55,7 +55,7 @@
// Are we placing or stripping?
var/stripping
- var/obj/item/held = user.get_active_hand()
+ var/obj/item/held = user.get_active_held_item()
if(!istype(held) || is_robot_module(held))
if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here?
return
@@ -78,7 +78,7 @@
if(!do_mob(user,src,HUMAN_STRIP_DELAY,progress = 1))
return
- if(!stripping && user.get_active_hand() != held)
+ if(!stripping && user.get_active_held_item() != held)
return
if(stripping)
diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm
index 97f71f20298..166077f56ae 100644
--- a/code/modules/mob/living/carbon/human/whisper.dm
+++ b/code/modules/mob/living/carbon/human/whisper.dm
@@ -6,7 +6,7 @@
var/alt_name = ""
if(say_disabled) //This is here to try to identify lag problems
- to_chat(usr, "\red Speech is currently admin-disabled.")
+ to_chat(usr, span_red("Speech is currently admin-disabled."))
return
message = sanitize(message)
@@ -14,7 +14,7 @@
if (src.client)
if (src.client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot whisper (muted).")
+ to_chat(src, span_red("You cannot whisper (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
@@ -112,7 +112,7 @@
message = replacetext(message, "u", "�")
message = replacetext(message, "b", "�")
- var/list/listening = hearers(message_range, src)
+ var/list/listening = hearers(message_range, get_turf(src))
listening |= src
//ghosts
@@ -134,11 +134,11 @@
if (O)
O.hear_talk(src, message, verb, speaking, 1)
- var/list/eavesdropping = hearers(eavesdropping_range, src)
+ var/list/eavesdropping = hearers(eavesdropping_range, get_turf(src))
eavesdropping -= src
eavesdropping -= listening
- var/list/watching = hearers(watching_range, src)
+ var/list/watching = hearers(watching_range, get_turf(src))
watching -= src
watching -= listening
watching -= eavesdropping
diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm
index 1cfd98ba454..27d34a1d529 100644
--- a/code/modules/mob/living/carbon/slime/emote.dm
+++ b/code/modules/mob/living/carbon/slime/emote.dm
@@ -16,7 +16,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot send IC messages (muted).")
+ to_chat(src, span_red("You cannot send IC messages (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
@@ -88,9 +88,9 @@
to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate. You can also set your face with: \n\nnomood, pout, sad, angry, frown, smile")
else
- to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+ to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list."))
if ((message && src.stat == 0))
send_emote(message, m_type)
if(updateicon)
regenerate_icons()
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/living/carbon/superior_animal/ai.dm b/code/modules/mob/living/carbon/superior_animal/ai.dm
index 6a171210ae2..99089e75d91 100644
--- a/code/modules/mob/living/carbon/superior_animal/ai.dm
+++ b/code/modules/mob/living/carbon/superior_animal/ai.dm
@@ -71,7 +71,7 @@
/mob/living/carbon/superior_animal/proc/isValidAttackTarget(var/atom/O)
if (isliving(O))
var/mob/living/L = O
- if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends))
+ if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends))
return
return 1
diff --git a/code/modules/mob/living/carbon/superior_animal/defense.dm b/code/modules/mob/living/carbon/superior_animal/defense.dm
index 2de9a6fb1cd..7e64f9196be 100644
--- a/code/modules/mob/living/carbon/superior_animal/defense.dm
+++ b/code/modules/mob/living/carbon/superior_animal/defense.dm
@@ -72,13 +72,13 @@
if (I_DISARM)
if (!weakened && prob(30))
- M.visible_message("\red [M] has shoved \the [src]")
+ M.visible_message(span_red("[M] has shoved \the [src]"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
Weaken(3)
return 1
else
- M.visible_message("\red [M] failed to shove \the [src]")
+ M.visible_message(span_red("[M] failed to shove \the [src]"))
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
M.do_attack_animation(src)
@@ -87,7 +87,7 @@
var/damage = 3
if ((stat == CONSCIOUS) && prob(10))
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- M.visible_message("\red [M] missed \the [src]")
+ M.visible_message(span_red("[M] missed \the [src]"))
else
if (istype(H))
damage += max(0, (H.stats.getStat(STAT_ROB) / 10))
@@ -95,7 +95,7 @@
// damage *= 2
playsound(loc, "punch", 25, 1, -1)
- M.visible_message("\red [M] has punched \the [src]")
+ M.visible_message(span_red("[M] has punched \the [src]"))
adjustBruteLoss(damage)
updatehealth()
diff --git a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm
index 0f0121ee196..9ae55391a75 100644
--- a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm
+++ b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm
@@ -5,7 +5,7 @@
if(ishuman(L))
H = L
if(H)
- var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_hand()
+ var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_held_item()
if(istype(howdoitameahorseinminecraft))
if(try_tame(H, howdoitameahorseinminecraft))
return FALSE //If they manage to tame the roach, stop the attack
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
index 26dea366e43..ab1bb501764 100644
--- a/code/modules/mob/living/default_language.dm
+++ b/code/modules/mob/living/default_language.dm
@@ -30,6 +30,6 @@
if (istype(langname, /datum/language))
L = langname
else
- L = all_languages[langname]
+ L = GLOB.all_languages[langname]
languages |= L
default_language = L
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index dcb7213b3cd..8595d05da94 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -4,7 +4,7 @@
. = FALSE
..()
- if(config.enable_mob_sleep)
+ if(CONFIG_GET(flag/enable_mob_sleep))
if(stat != DEAD && !mind) // Check for mind so player-driven, nonhuman mobs don't sleep
if(life_cycles_before_scan > 0)
life_cycles_before_scan--
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index f42a6e04a90..7c417797fb8 100755
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -170,7 +170,7 @@ default behaviour is:
if (health < 0)
adjustOxyLoss(health + maxHealth * 2) // Deal 2x health in OxyLoss damage, as before but variable.
health = -maxHealth
- to_chat(src, "\blue You have given up life and succumbed to death.")
+ to_chat(src, span_blue("You have given up life and succumbed to death."))
/mob/living/proc/updatehealth()
@@ -561,7 +561,7 @@ default behaviour is:
var/obj/item/grab/G = pick(M.grabbed_by)
if (istype(G, /obj/item/grab))
for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1)
+ O.show_message(span_red(text("[] has been pulled from []'s grip by []", G.affecting, G.assailant, src)), 1)
//G = null
qdel(G)
else
@@ -834,7 +834,7 @@ default behaviour is:
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.pull_damage())
- to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.")
+ to_chat(src, span_red("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))
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index fe497a0c620..338dd293485 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -175,7 +175,7 @@
if (P.is_hot() >= HEAT_MOBIGNITE_THRESHOLD)
IgniteMob()
- if(config.z_level_shooting && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency
+ if(CONFIG_GET(flag/z_level_shooting) && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency
if(resting || lying)
return PROJECTILE_CONTINUE // Bullet flies overhead
@@ -186,8 +186,8 @@
def_zone_hit = pick(list(BP_CHEST, BP_GROIN, BP_L_LEG, BP_R_LEG))
//Being hit while using a deadman switch
- if(istype(get_active_hand(),/obj/item/device/assembly/signaler))
- var/obj/item/device/assembly/signaler/signaler = get_active_hand()
+ if(istype(get_active_held_item(),/obj/item/device/assembly/signaler))
+ var/obj/item/device/assembly/signaler/signaler = get_active_held_item()
if(signaler.deadman && prob(80))
log_and_message_admins("has triggered a signaler deadman's switch")
src.visible_message(span_warning("[src] triggers their deadman's switch!"))
@@ -297,7 +297,7 @@
src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])")
M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]")
if(!ismouse(src))
- msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)")
+ msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]")
// Begin BS12 momentum-transfer code.
var/mass = 1.5
diff --git a/code/modules/mob/living/living_recoil.dm b/code/modules/mob/living/living_recoil.dm
index 83b51a9a62c..de88f39be74 100644
--- a/code/modules/mob/living/living_recoil.dm
+++ b/code/modules/mob/living/living_recoil.dm
@@ -34,7 +34,7 @@
//Called after setting recoil
/mob/living/proc/update_recoil()
- var/obj/item/gun/G = get_active_hand()
+ var/obj/item/gun/G = get_active_held_item()
if(istype(G) && G)
G.check_safety_cursor(src)
@@ -48,7 +48,7 @@
return
/mob/living/update_cursor()
- var/obj/item/gun/G = get_active_hand()
+ var/obj/item/gun/G = get_active_held_item()
if(get_preference_value(/datum/client_preference/gun_cursor) != GLOB.PREF_YES || (!istype(G, /obj/item/gun) || G.safety))
remove_cursor()
return
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 7c4d631f728..616900c67ce 100755
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -137,7 +137,7 @@ var/list/channel_to_radio_key = new
/mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="")
if(client)
if(client.prefs.muted&MUTE_IC)
- to_chat(src, "\red You cannot speak in IC (Muted).")
+ to_chat(src, span_red("You cannot speak in IC (Muted)."))
return
if(stat)
@@ -298,7 +298,7 @@ var/list/channel_to_radio_key = new
INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(animate_speechbubble), speech_bubble, speech_bubble_recipients, 30)
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), message, speaking, italics, speech_bubble_recipients, 40, verb)
- if(config.tts_enabled && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src)))
+ if(CONFIG_GET(flag/tts_enabled) && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src)))
//TO DO: Remove need for that damn copypasta
var/seed = tts_seed
if(istype(back, /obj/item/rig))
@@ -339,7 +339,7 @@ var/list/channel_to_radio_key = new
/mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language)
- for (var/mob/O in viewers(src, null))
+ for (var/mob/O in viewers(get_turf(src)))
O.hear_signlang(message, verb, language, src)
return 1
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 46f683d1b0d..32f4cb2327a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -393,11 +393,11 @@ var/list/ai_verbs_default = list(
if(emergency_message_cooldown)
to_chat(usr, span_warning("Arrays recycling. Please stand by."))
return
- var/input = sanitize(input(usr, "Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
+ var/input = sanitize(input(usr, "Please choose a message to transmit to [GLOB.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", ""))
if(!input)
return
to_chat(usr, span_notice("No response from the remote server. Please, contact your system administrator."))
- log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]")
+ log_say("[key_name(usr)] has made an IA [GLOB.boss_short] announcement: [input]")
emergency_message_cooldown = 1
spawn(300)
emergency_message_cooldown = 0
@@ -445,7 +445,7 @@ var/list/ai_verbs_default = list(
if(target && (!ishuman(target) || target.real_name == target.get_face_name()))
ai_actual_track(target)
else
- to_chat(src, "\red System error. Cannot locate [href_list["trackname"]].")
+ to_chat(src, span_red("System error. Cannot locate [href_list["trackname"]]."))
return
return
diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm
index e4bda7e3cf4..536190c105e 100644
--- a/code/modules/mob/living/silicon/ai/malf.dm
+++ b/code/modules/mob/living/silicon/ai/malf.dm
@@ -112,7 +112,7 @@
// Returns percentage of AI's remaining hardware integrity (maxhealth - (bruteloss + fireloss))
/mob/living/silicon/ai/proc/hardware_integrity()
- return max(0,(health-HEALTH_THRESHOLD_DEAD)/2)
+ return max(0,(health-CONFIG_GET(number/health_threshold_dead))/2)
// Cleaner proc for creating powersupply for an AI.
/mob/living/silicon/ai/proc/create_powersupply()
diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm
index 6b615ce500b..df8627c954d 100644
--- a/code/modules/mob/living/silicon/decoy/life.dm
+++ b/code/modules/mob/living/silicon/decoy/life.dm
@@ -2,7 +2,7 @@
if (src.stat == 2)
return
else
- if (src.health <= HEALTH_THRESHOLD_DEAD && src.stat != 2)
+ if (src.health <= CONFIG_GET(number/health_threshold_dead) && src.stat != 2)
death()
return
diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm
index ca033aa94c0..a2d3b9b538d 100644
--- a/code/modules/mob/living/silicon/pai/examine.dm
+++ b/code/modules/mob/living/silicon/pai/examine.dm
@@ -9,8 +9,8 @@
extra_description += "\n[span_deadsay("It looks completely unsalvageable.")]"
extra_description += "\n*---------*"
- if(print_flavor_text())
- extra_description += "\n[print_flavor_text()]\n"
+ if(get_flavor_text())
+ extra_description += "\n[get_flavor_text()]\n"
if(pose)
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index 659ce0bbef3..9fda53ff847 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -6,7 +6,7 @@
if(get_dist(src, src.cable) > 1)
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
+ M.show_message(span_red("The data cable rapidly retracts back into its spool."), 3, span_red("You hear a click and the sound of wire spooling rapidly."), 2)
qdel(src.cable)
src.cable = null
@@ -33,4 +33,4 @@
health = 100
stat = CONSCIOUS
else
- health = 100 - getBruteLoss() - getFireLoss()
\ No newline at end of file
+ health = 100 - getBruteLoss() - getFireLoss()
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 4ff76d6891c..3cf09140dcd 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -121,7 +121,7 @@
if(prob(20))
var/turf/T = get_turf_or_move(src.loc)
for (var/mob/M in viewers(T))
- M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
+ 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)
return src.death(0)
switch(pick(1,2,3))
diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm
index c5513644f95..c5abb3fdddd 100644
--- a/code/modules/mob/living/silicon/robot/analyzer.dm
+++ b/code/modules/mob/living/silicon/robot/analyzer.dm
@@ -21,13 +21,13 @@
if(!cell_use_check(5, user))
return
/* if((CLUMSY in user.mutations) && prob(50))
- to_chat(user, text("\red You try to analyze the floor's vitals!"))
+ to_chat(user, text(span_red("You try to analyze the floor's vitals!")))
for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
- user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1)
- user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1)
- user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
- user.show_message("\blue Body Temperature: ???", 1)
+ O.show_message(text(span_red("[user] has analyzed the floor's vitals!")), 1)
+ user.show_message(text(span_blue("Analyzing Results for The floor:\n\t Overall Status: Healthy")), 1)
+ user.show_message(text(span_blue("\t Damage Specifics: [0]-[0]-[0]-[0]")), 1)
+ user.show_message(span_blue("Key: Suffocation/Toxin/Burns/Brute"), 1)
+ user.show_message(span_blue("Body Temperature: ???"), 1)
return
*/
var/scan_type
@@ -36,7 +36,7 @@
else if(ishuman(M))
scan_type = "prosthetics"
else
- to_chat(user, "\red You can't analyze non-robotic things!")
+ to_chat(user, span_red("You can't analyze non-robotic things!"))
return
user.visible_message(span_notice("\The [user] has analyzed [M]'s components."),span_notice("You have analyzed [M]'s components."))
@@ -44,28 +44,28 @@
if("robot")
var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss()
var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss()
- user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]")
+ 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: Electronics/Brute", 1)
user.show_message("\t Damage Specifics: [BU] - [BR]")
if(M.timeofdeath && M.stat == DEAD)
- user.show_message("\blue Time of Disable: [worldtime2stationtime(M.timeofdeath)]")
+ user.show_message(span_blue("Time of Disable: [worldtime2stationtime(M.timeofdeath)]"))
var/mob/living/silicon/robot/H = M
var/list/damaged = H.get_damaged_components(1,1,1)
- user.show_message("\blue Localized Damage:",1)
+ user.show_message(span_blue("Localized Damage:"),1)
if(length(damaged)>0)
for(var/datum/robot_component/org in damaged)
- user.show_message(text("\blue \t []: [][] - [] - [] - []", \
+ user.show_message(span_blue(text("\t []: [][] - [] - [] - []", \
capitalize(org.name), \
(org.installed == -1) ? "DESTROYED " :"",\
(org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \
(org.brute_damage > 0) ? "[org.brute_damage]" :0, \
(org.toggled) ? "Toggled ON" : "Toggled OFF",\
- (org.powered) ? "Power ON" : "Power OFF"),1)
+ (org.powered) ? "Power ON" : "Power OFF")),1)
else
- user.show_message("\blue \t Components are OK.",1)
+ user.show_message(span_blue("\t Components are OK."),1)
if(H.HasTrait(CYBORG_TRAIT_EMAGGED) && prob(5))
- user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1)
- user.show_message("\blue Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1)
+ user.show_message(span_red("\t ERROR: INTERNAL SYSTEMS COMPROMISED"),1)
+ user.show_message(span_blue("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)"), 1)
if("prosthetics")
var/mob/living/carbon/human/H = M
diff --git a/code/modules/mob/living/silicon/robot/drone/_drone.dm b/code/modules/mob/living/silicon/robot/drone/_drone.dm
index ddd5ac3bb2f..6de8b52e9b4 100644
--- a/code/modules/mob/living/silicon/robot/drone/_drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/_drone.dm
@@ -68,7 +68,7 @@ var/list/mob_hat_cache = list()
/mob/living/silicon/robot/drone/can_be_possessed_by(var/mob/observer/ghost/possessor)
if(!istype(possessor) || !possessor.client || !possessor.ckey)
return 0
- if(!config.allow_drone_spawn)
+ if(!CONFIG_GET(flag/allow_drone_spawn))
to_chat(src, span_danger("Playing as drones is not currently permitted."))
return 0
if(too_many_active_drones())
@@ -134,7 +134,7 @@ var/list/mob_hat_cache = list()
additional_law_channels["Drone"] = "d"
if(!laws) laws = new law_type
- flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
+ flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[GLOB.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
//Redefining some robot procs...
@@ -191,7 +191,7 @@ var/list/mob_hat_cache = list()
if(stat == 2)
- if(!config.allow_drone_spawn || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave.
+ if(!CONFIG_GET(flag/allow_drone_spawn) || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave.
to_chat(user, span_danger("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one."))
return
@@ -337,7 +337,7 @@ var/list/mob_hat_cache = list()
for(var/mob/living/silicon/robot/drone/D in SSmobs.mob_list)
if(D.key && D.client)
drones++
- return drones >= config.max_maint_drones
+ return drones >= CONFIG_GET(number/max_maint_drones)
/mob/living/silicon/robot/drone/verb/choose_eyecolor()
set name = "Choose Light Color"
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 d56994581e5..09783e7fea6 100755
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -149,9 +149,9 @@
dat += {"
Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"}
@@ -168,7 +168,7 @@
else if(activated(O))
module_string += text("[O]: Activated
")
else
- module_string += text("[O]: Activate
")
+ module_string += text("[O]: Activate
")
if((istype(O,/obj/item) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil)))
tools += module_string
@@ -183,7 +183,7 @@
else if(activated(module.emag))
dat += text("[module.emag]: Activated
")
else
- dat += text("[module.emag]: Activate
")
+ dat += text("[module.emag]: Activate
")
dat += resources
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 700ea615380..5037154a3d0 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -47,13 +47,13 @@
icon_state = "drone_fab_active"
var/elapsed = world.time - time_last_drone
- drone_progress = round((elapsed/config.drone_build_time)*100)
+ drone_progress = round((elapsed/CONFIG_GET(number/drone_build_time))*100)
if(drone_progress >= 100)
visible_message("\The [src] voices a strident beep, indicating a drone chassis is prepared.")
/obj/machinery/drone_fabricator/examine(mob/user, extra_description = "")
- if(produce_drones && drone_progress >= 100 && isghost(user) && config.allow_drone_spawn && count_drones() < config.max_maint_drones)
+ if(produce_drones && drone_progress >= 100 && isghost(user) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones))
extra_description += "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone."
..(user, extra_description)
@@ -62,7 +62,7 @@
if(stat & NOPOWER)
return
- if(!produce_drones || !config.allow_drone_spawn || count_drones() >= config.max_maint_drones)
+ if(!produce_drones || !CONFIG_GET(flag/allow_drone_spawn) || count_drones() >= CONFIG_GET(number/max_maint_drones))
return
if(!player || (!isghost(player.mob) && !aibound))
@@ -105,7 +105,7 @@
to_chat(user, span_danger("The game hasn't started yet!"))
return
- if(!(config.allow_drone_spawn))
+ if(!CONFIG_GET(flag/allow_drone_spawn))
to_chat(user, span_danger("That verb is not currently permitted."))
return
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 012b537dfd8..ab2995f6211 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm
@@ -16,7 +16,7 @@
return emote(copytext(message,2))
if(copytext(message,1,2) == ";")
- var/datum/language/L = all_languages[communication_channel]
+ var/datum/language/L = GLOB.all_languages[communication_channel]
if(istype(L))
return L.broadcast(src,trim(copytext(message,2)))
@@ -24,7 +24,7 @@
if (stat)
return 0
- var/list/listeners = hearers(5,src)
+ var/list/listeners = hearers(5, get_turf(src))
listeners |= src
for(var/mob/living/silicon/D in listeners)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 1bbb185d6d2..8bbd6600c8d 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -208,7 +208,7 @@
if ("help")
to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt")
else
- to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+ to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list."))
if ((message && src.stat == 0))
custom_emote(m_type, message)
diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm
index 2160f483dcc..479174648dc 100644
--- a/code/modules/mob/living/silicon/robot/examine.dm
+++ b/code/modules/mob/living/silicon/robot/examine.dm
@@ -29,10 +29,10 @@
if(DEAD)
extra_description += "[span_deadsay("It's completely broken, but looks repairable.")]\n" //TODO: add no_soul status or flag
if(module_active)
- extra_description += "It is wielding \icon[module_active] [module_active].\n"
+ extra_description += "It is wielding [icon2html(module_active, user)] [module_active].\n"
extra_description += "*---------*"
- if(print_flavor_text()) extra_description += "\n[print_flavor_text()]\n"
+ if(get_flavor_text()) extra_description += "\n[get_flavor_text()]\n"
if(pose)
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index ab63957e78c..b1eff90c936 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -2,7 +2,7 @@
//as they handle all relevant stuff like adding it to the player's screen and such
//Returns the thing in our active hand (whatever is in our active module-slot, in this case)
-/mob/living/silicon/robot/get_active_hand()
+/mob/living/silicon/robot/get_active_held_item()
return module_active
/*-------TODOOOOOOOOOO--------*/
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index a571f1c3ea0..061ed1742bd 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -62,7 +62,7 @@
src.has_power = 1
else
if (src.has_power)
- to_chat(src, "\red You are now running on emergency backup power.")
+ to_chat(src, span_red("You are now running on emergency backup power."))
src.has_power = 0
if(lights_on) // Light is on but there is no power!
lights_on = 0
@@ -87,7 +87,7 @@
if(src.resting)
Weaken(5)
- if(health < HEALTH_THRESHOLD_DEAD && src.stat != 2) //die only once
+ if(health < CONFIG_GET(number/health_threshold_dead) && src.stat != 2) //die only once
death()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 2c9826d4062..2b3c4cc04ba 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -872,9 +872,9 @@
dat += {"
Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"}
@@ -885,17 +885,17 @@
else if(activated(obj))
dat += text("[obj]: Activated
")
else
- dat += text("[obj]: Activate
")
+ dat += text("[obj]: Activate
")
if (HasTrait(CYBORG_TRAIT_EMAGGED))
if(activated(module.emag))
dat += text("[module.emag]: Activated
")
else
- dat += text("[module.emag]: Activate
")
+ dat += text("[module.emag]: Activate
")
/*
if(activated(obj))
- dat += text("[obj]: \[Activated | Deactivate\]
")
+ dat += text("[obj]: \[Activated | Deactivate\]
")
else
- dat += text("[obj]: \[Activate | Deactivated\]
")
+ dat += text("[obj]: \[Activate | Deactivated\]
")
*/
src << browse(HTML_SKELETON_TITLE("Modules", dat), "window=robotmod")
@@ -1048,7 +1048,7 @@
set category = "IC"
set src = usr
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
if(W)
W.attack_self(src)
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index ee9d900f7e8..6786d541929 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -75,13 +75,13 @@
var/absorb_burn_cost = (burn*shield.shield_level)*100
if(cell.is_empty())
- to_chat(src, "\red Your shield has overloaded!")
+ to_chat(src, span_red("Your shield has overloaded!"))
else
var/absorb_brute = cell.use(absorb_brute_cost)/100
var/absorb_burn = cell.use(absorb_burn_cost)/100
brute -= absorb_brute
burn -= absorb_burn
- to_chat(src, "\red Your shield absorbs some of the impact!")
+ to_chat(src, span_red("Your shield absorbs some of the impact!"))
if(!emp)
var/datum/robot_component/armour/A = get_armour()
@@ -120,13 +120,13 @@
var/absorb_burn_cost = (burn*shield.shield_level)*100
if(cell.is_empty())
- to_chat(src, "\red Your shield has overloaded!")
+ to_chat(src, span_red("Your shield has overloaded!"))
else
var/absorb_brute = cell.use(absorb_brute_cost)/100
var/absorb_burn = cell.use(absorb_burn_cost)/100
brute -= absorb_brute
burn -= absorb_burn
- to_chat(src, "\red Your shield absorbs some of the impact!")
+ to_chat(src, span_red("Your shield absorbs some of the impact!"))
var/datum/robot_component/armour/A = get_armour()
if(A)
diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm
index c51d3184962..3a18a1a949f 100644
--- a/code/modules/mob/living/silicon/robot/robot_items.dm
+++ b/code/modules/mob/living/silicon/robot/robot_items.dm
@@ -172,7 +172,7 @@
overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)
addedSomething = 1
if ( addedSomething )
- user.visible_message("\blue [user] load some items onto their service tray.")
+ user.visible_message(span_blue("[user] load some items onto their service tray."))
return
@@ -212,9 +212,9 @@
sleep(rand(2,4))
if ( droppedSomething )
if ( foundtable )
- user.visible_message("\blue [user] unloads their service tray.")
+ user.visible_message(span_blue("[user] unloads their service tray."))
else
- user.visible_message("\blue [user] drops all the items on their tray.")
+ user.visible_message(span_blue("[user] drops all the items on their tray."))
return ..()
@@ -292,7 +292,7 @@
deploy_paper(get_turf(src))
/obj/item/form_printer/proc/deploy_paper(var/turf/T)
- T.visible_message("\blue \The [src.loc] dispenses a sheet of crisp white paper.")
+ T.visible_message(span_blue("\The [src.loc] dispenses a sheet of crisp white paper."))
new /obj/item/paper(T)
diff --git a/code/modules/mob/living/silicon/robot/robot_parts.dm b/code/modules/mob/living/silicon/robot/robot_parts.dm
index 5c3fa064e01..f761bbcebb0 100644
--- a/code/modules/mob/living/silicon/robot/robot_parts.dm
+++ b/code/modules/mob/living/silicon/robot/robot_parts.dm
@@ -121,7 +121,7 @@
var/obj/item/secbot_assembly/ed209_assembly/B = new(loc)
B.forceMove(get_turf(src))
to_chat(user, span_notice("You armed the robot frame."))
- if (user.get_inactive_hand() == src)
+ if (user.get_inactive_held_item() == src)
user.remove_from_mob(src)
user.put_in_inactive_hand(B)
qdel(src)
@@ -290,7 +290,7 @@
..()
if(istype(W, /obj/item/device/flash))
if(isrobot(user))
- var/current_module = user.get_active_hand()
+ var/current_module = user.get_active_held_item()
if(current_module == W)
to_chat(user, span_warning("How do you propose to do that?"))
return
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 6c28d85e25f..618c07efeb9 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -102,9 +102,9 @@
shock_damage *= 0.75 //take reduced damage
take_overall_damage(0, shock_damage)
- visible_message("\red [src] was shocked by \the [source]!", \
- "\red Energy pulse detected, system damaged!", \
- "\red You hear an electrical crack")
+ visible_message(span_red("[src] was shocked by \the [source]!"), \
+ span_red("Energy pulse detected, system damaged!"), \
+ span_red("You hear an electrical crack"))
if(prob(20))
Stun(2)
return
@@ -158,7 +158,7 @@
return universal_speak || (speaking in speech_synthesizer_langs) //need speech synthesizer support to vocalize a language
/mob/living/silicon/add_language(var/language, var/can_speak=1)
- var/datum/language/added_language = all_languages[language]
+ var/datum/language/added_language = GLOB.all_languages[language]
if(!added_language)
return
@@ -168,7 +168,7 @@
return 1
/mob/living/silicon/remove_language(var/rem_language)
- var/datum/language/removed_language = all_languages[rem_language]
+ var/datum/language/removed_language = GLOB.all_languages[rem_language]
if(!removed_language)
return
@@ -254,7 +254,7 @@
to_chat(src, "\The [A.alarm_name()].")
if(alarm_raised)
- to_chat(src, "\[Show Alerts\]")
+ to_chat(src, "\[Show Alerts\]")
for(var/datum/alarm_handler/AH in queued_alarms)
var/list/alarms = queued_alarms[AH]
diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm
index da7e92776bf..a69fdfbb7dc 100644
--- a/code/modules/mob/living/simple_animal/borer/borer.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer.dm
@@ -158,7 +158,7 @@
if(invisibility)
chemicals -= invisibility_cost
if(chemicals <= max_chemicals/2 && (max_chemicals/2) - invisibility_cost <= chemicals)
- to_chat(src, to_chat(src, "\red Your invisibility will run out soon!"))
+ to_chat(src, to_chat(src, span_red("Your invisibility will run out soon!")))
if(chemicals <= invisibility_cost + 1)
invisible() // Disable invisibility
chemicals = 0
diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
index 72b6240a55d..ce3250f04db 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm
@@ -9,7 +9,7 @@
if (src.client)
if(client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot speak in IC (muted).")
+ to_chat(src, span_red("You cannot speak in IC (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
index 4106b2061f5..2608b75d087 100644
--- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm
+++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm
@@ -238,7 +238,7 @@
return
if(world.time - used_dominate < 1 MINUTE) // a one minutes cooldown.
- to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")
+ to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds."))
return
if(is_ventcrawling)
@@ -263,7 +263,7 @@
var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices
if(world.time - used_dominate < 1 MINUTE)
- to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")
+ to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds."))
return
if(!M || !Adjacent(M)) return
@@ -503,7 +503,7 @@
return
if(!host)
- to_chat(src, "\red You cannot do this without a host.")
+ to_chat(src, span_red("You cannot do this without a host."))
return
if(docile)
@@ -541,11 +541,11 @@
return
if(world.time - used_dominate < 1 MINUTE)
- to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")
+ to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds."))
return
if(host)
- to_chat(src, "\red You cannot do this inside a host.")
+ to_chat(src, span_red("You cannot do this inside a host."))
return
if(invisibility)
@@ -592,12 +592,12 @@
return
if(!host)
- to_chat(src, "\red You cannot do this without a host.")
+ to_chat(src, span_red("You cannot do this without a host."))
return
var/reproduce_cost = (round(max_chemicals_inhost * 0.75)) // literally max chems but 75% of it
if(chemicals >= reproduce_cost)
- to_chat(host, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")
- visible_message("\red [host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")
+ to_chat(host, span_red("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body."))
+ visible_message(span_red("[host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!"))
has_reproduced = TRUE
chemicals -= reproduce_cost
if(istype(host, /mob/living/carbon/human/) && !host.isMonkey())
@@ -645,7 +645,7 @@
log_say("[key_name(src)] communed to [key_name(M)]: [text]")
- to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")
+ to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"))
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm
index 5446b3aa361..03e40896940 100644
--- a/code/modules/mob/living/simple_animal/borer/say.dm
+++ b/code/modules/mob/living/simple_animal/borer/say.dm
@@ -14,7 +14,7 @@
if (src.client)
if(client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot speak in IC (muted).")
+ to_chat(src, span_red("You cannot speak in IC (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index e76f1e43675..1da76f86b17 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -158,7 +158,7 @@
/mob/living/simple_animal/cat/fluff/handle_movement_target()
if (friend)
var/follow_dist = 5
- if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT) //danger
+ if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) //danger
follow_dist = 1
else if (friend.stat || friend.health <= 50) //danger or just sleeping
follow_dist = 2
@@ -192,7 +192,7 @@
if (stat || !friend)
return
if (get_dist(src, friend) <= 1)
- if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT)
+ if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit))
if (prob((friend.stat < DEAD)? 50 : 15))
var/verb = pick("meows", "mews", "mrowls")
visible_emote(pick("[verb] in distress.", "[verb] anxiously."))
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index e8b63560b75..cc775134805 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -109,7 +109,7 @@
//pupplies cannot wear anything.
/mob/living/simple_animal/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
- to_chat(usr, "\red You can't fit this on [src]")
+ to_chat(usr, span_red("You can't fit this on [src]"))
return
..()
@@ -129,7 +129,7 @@
//Lisa already has a cute bow!
/mob/living/simple_animal/corgi/Lisa/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
- to_chat(usr, "\red [src] already has a cute bow!")
+ to_chat(usr, span_red("[src] already has a cute bow!"))
return
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 5460eaf109a..916d556c940 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -38,7 +38,7 @@
if(enemies.len && prob(10))
enemies = list()
LoseTarget()
- src.visible_message("\blue [src] calms down.")
+ src.visible_message(span_blue("[src] calms down."))
if(stat == CONSCIOUS)
if(udder && prob(5))
@@ -76,9 +76,9 @@
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
- to_chat(user, "\red The [O] is full.")
+ to_chat(user, span_red("The [O] is full."))
if(!transfered)
- to_chat(user, "\red The udder is dry. Wait a bit longer...")
+ to_chat(user, span_red("The udder is dry. Wait a bit longer..."))
else
..()
//cow
@@ -114,9 +114,9 @@
user.visible_message(span_notice("[user] milks [src] using \the [O]."))
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
- to_chat(user, "\red The [O] is full.")
+ to_chat(user, span_red("The [O] is full."))
if(!transfered)
- to_chat(user, "\red The udder is dry. Wait a bit longer...")
+ to_chat(user, span_red("The udder is dry. Wait a bit longer..."))
else
..()
@@ -227,12 +227,12 @@ var/global/chicken_count = 0
var/obj/item/reagent_containers/food/snacks/grown/G = O
if(G.seed && G.seed.kitchen_tag == "wheat")
if(!stat && eggsleft < 8)
- user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.")
+ user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."), span_blue("You feed [O] to [name]! It clucks happily."))
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
else
- to_chat(user, "\blue [name] doesn't seem hungry!")
+ to_chat(user, span_blue("[name] doesn't seem hungry!"))
else
to_chat(user, "[name] doesn't seem interested in that.")
else
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index c434df7267c..959a433d774 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -225,7 +225,7 @@
if( ishuman(AM) )
if(!stat)
var/mob/M = AM
- to_chat(M, span_notice("\icon[src] Squeek!"))
+ to_chat(M, span_notice("[icon2html(src, M)] Squeek!"))
poke(1) //Wake up if stepped on
if (prob(95))
squeak(0)
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 30f9da72d7f..1eced813ab7 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -45,7 +45,7 @@
/mob/living/simple_animal/spiderbot/New()
..()
add_language(LANGUAGE_COMMON)
- default_language = all_languages[LANGUAGE_COMMON]
+ default_language = GLOB.all_languages[LANGUAGE_COMMON]
add_verb(src, /mob/living/proc/ventcrawl)
add_verb(src, /mob/living/proc/hide)
@@ -218,7 +218,7 @@
return
if(!held_item)
- to_chat(usr, "\red You have nothing to drop!")
+ to_chat(usr, span_red("You have nothing to drop!"))
return 0
if(istype(held_item, /obj/item/grenade))
@@ -275,7 +275,7 @@
/mob/living/simple_animal/spiderbot/examine(mob/user, extra_description = "")
if(held_item)
- extra_description += "\nIt is carrying \icon[src.held_item] \a [src.held_item]."
+ extra_description += "\nIt is carrying [icon2html(src.held_item, user)] \a [src.held_item]."
..(user, extra_description)
/mob/living/simple_animal/spiderbot/cannot_use_vents()
diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
index 06609e863e2..96eb9f8635d 100644
--- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
+++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm
@@ -104,7 +104,7 @@
//returns a list of everybody we wanna do stuff with.
/mob/living/simple_animal/hostile/commanded/proc/get_targets_by_name(var/text, var/filter_friendlies = 0)
- var/list/possible_targets = hearers(src,10)
+ var/list/possible_targets = hearers(10, get_turf(src))
. = list()
for(var/mob/M in possible_targets)
if(filter_friendlies && ((M in friends) || M.faction == faction || M == master))
@@ -187,4 +187,4 @@
allowed_targets += M
stance = HOSTILE_STANCE_ATTACK
if(M in friends)
- friends -= M
\ No newline at end of file
+ friends -= M
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index bd83011c16c..ebe28496050 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -174,7 +174,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST
/mob/living/simple_animal/hostile/proc/ListTargets(var/dist = 7)
- var/list/L = hearers(src, dist)
+ var/list/L = hearers(dist, get_turf(src))
for (var/mob/living/exosuit/M in GLOB.mechas_list)
if (M.z == z && get_dist(src, M) <= dist)
@@ -209,7 +209,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST
/mob/living/simple_animal/hostile/proc/OpenFire(target_mob)
var/target = target_mob
- visible_message("\red [src] [fire_verb] at [target]!", 1)
+ visible_message(span_danger("[src] [fire_verb] at [target]!"), 1)
if(rapid)
spawn(1)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index a9fbb55f22b..0459e90e7c9 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -71,6 +71,7 @@
//self repair systems have a chance to bring the drone back to life
/mob/living/simple_animal/hostile/retaliate/malf_drone/Life()
+ var/htmlicon = icon2html(src, viewers(get_turf(src)))
//emps and lots of damage can temporarily shut us down
if(disabled > 0)
stat = UNCONSCIOUS
@@ -86,7 +87,7 @@
//repair a bit of damage
if(prob(1))
- src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.")
+ src.visible_message(span_red("[htmlicon] [src] shudders and shakes as some of it's damaged systems come back online."))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -101,10 +102,10 @@
//sometimes our targetting sensors malfunction, and we attack anyone nearby
if(prob(disabled ? 0 : 1))
if(hostile_drone)
- src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.")
+ src.visible_message(span_blue("[htmlicon] [src] retracts several targetting vanes, and dulls it's running lights."))
hostile_drone = 0
else
- src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.")
+ src.visible_message(span_red("[htmlicon] [src] suddenly lights up, and additional targetting vanes slide into place."))
hostile_drone = 1
if(health / maxHealth > 0.9)
@@ -125,17 +126,17 @@
exploding = 0
if(!disabled)
if(prob(50))
- src.visible_message("\blue \icon[src] [src] suddenly shuts down!")
+ src.visible_message(span_blue("[htmlicon] [src] suddenly shuts down!"))
else
- src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.")
+ src.visible_message(span_blue("[htmlicon] [src] suddenly lies still and quiet."))
disabled = rand(150, 600)
walk(src,0)
if(exploding && prob(20))
if(prob(50))
- src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!")
+ src.visible_message(span_red("[htmlicon] [src] begins to spark and shake violenty!"))
else
- src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!")
+ src.visible_message(span_red("[htmlicon] [src] sparks and shakes like it's about to explode!"))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm
index 2132641dd44..03a6b4ba17b 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm
@@ -44,7 +44,7 @@
set category = "Exploration"
set src in view()
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
if(!CanInteract(usr, GLOB.conscious_state))
return
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 97468201f07..6d4fa6dbdd0 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -63,13 +63,13 @@
if (O.damtype == HALLOSS)
damage = 0
health -= damage
- visible_message("\red \b [src] has been attacked with the [O] by [user]. ")
+ visible_message(span_red("\b [src] has been attacked with the [O] by [user]. "))
else
- visible_message("\red \b [src] blocks the [O] with its shield! ")
+ visible_message(span_red("\b [src] blocks the [O] with its shield! "))
//user.do_attack_animation(src)
else
- to_chat(usr, "\red This weapon is ineffective, it does no damage.")
- visible_message("\red [user] gently taps [src] with the [O]. ")
+ to_chat(usr, span_red("This weapon is ineffective, it does no damage."))
+ visible_message(span_red("[user] gently taps [src] with the [O]. "))
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
@@ -77,7 +77,7 @@
if(prob(65))
..()
else
- visible_message("\red [src] blocks [Proj] with its shield!")
+ visible_message(span_red("[src] blocks [Proj] with its shield!"))
return 0
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index b56d94c4b54..908ccafad15 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -156,27 +156,27 @@
if(copytext_char(possible_phrase,1,2) == get_prefix_key(/decl/prefix/radio_channel_selection) && (copytext_char(possible_phrase,2,3) in department_radio_keys))
possible_phrase = copytext_char(possible_phrase,3,length(possible_phrase))
else
- to_chat(usr, "\red There is nothing to remove from its [remove_from].")
+ to_chat(usr, span_red("There is nothing to remove from its [remove_from]."))
return
//Adding things to inventory
else if(href_list["add_inv"])
var/add_to = href_list["add_inv"]
- if(!usr.get_active_hand())
- to_chat(usr, "\red You have nothing in your hand to put on its [add_to].")
+ if(!usr.get_active_held_item())
+ to_chat(usr, span_red("You have nothing in your hand to put on its [add_to]."))
return
switch(add_to)
if("ears")
if(ears)
- to_chat(usr, "\red It's already wearing something.")
+ to_chat(usr, span_red("It's already wearing something."))
return
else
- var/obj/item/item_to_add = usr.get_active_hand()
+ var/obj/item/item_to_add = usr.get_active_held_item()
if(!item_to_add)
return
if( !istype(item_to_add, /obj/item/device/radio/headset) )
- to_chat(usr, "\red This object won't fit.")
+ to_chat(usr, span_red("This object won't fit."))
return
var/obj/item/device/radio/headset/headset_to_add = item_to_add
@@ -406,7 +406,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.loc = src
- visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -566,7 +566,7 @@
return -1
if(held_item)
- to_chat(src, "\red You are already holding the [held_item]")
+ to_chat(src, span_red("You are already holding the [held_item]"))
return 1
for(var/obj/item/I in view(1,src))
@@ -579,10 +579,10 @@
held_item = I
I.loc = src
- visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.")
return held_item
- to_chat(src, "\red There is nothing of interest to take.")
+ to_chat(src, span_red("There is nothing of interest to take."))
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -594,7 +594,7 @@
return -1
if(held_item)
- to_chat(src, "\red You are already holding the [held_item]")
+ to_chat(src, span_red("You are already holding the [held_item]"))
return 1
var/obj/item/stolen_item = null
@@ -617,7 +617,7 @@
)
return held_item
- to_chat(src, "\red There is nothing of interest to take.")
+ to_chat(src, span_red("There is nothing of interest to take."))
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -641,7 +641,7 @@
return -1
if(!held_item)
- to_chat(usr, "\red You have nothing to drop!")
+ to_chat(usr, span_red("You have nothing to drop!"))
return 0
if(!drop_gently)
@@ -674,7 +674,7 @@
src.loc = AM.loc
icon_state = "parrot_sit"
return
- to_chat(src, "\red There is no perch nearby to sit on.")
+ to_chat(src, span_red("There is no perch nearby to sit on."))
return
/*
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index ba7b0b63a88..33bbbef0185 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -352,10 +352,10 @@
if(I_HELP)
if (health > 0)
- M.visible_message("\blue [M] [response_help] \the [src]")
+ M.visible_message(span_blue("[M] [response_help] \the [src]"))
if(I_DISARM)
- M.visible_message("\blue [M] [response_disarm] \the [src]")
+ M.visible_message(span_blue("[M] [response_disarm] \the [src]"))
M.do_attack_animation(src)
//TODO: Push the mob away or something
@@ -373,13 +373,13 @@
G.affecting = src
LAssailant = M
- M.visible_message("\red [M] has grabbed [src] passively!")
+ M.visible_message(span_red("[M] has grabbed [src] passively!"))
M.do_attack_animation(src)
if(I_HURT)
adjustBruteLoss(harm_intent_damage)
playsound(src, pick(punch_sound),60,1)
- M.visible_message("\red [M] [response_harm] \the [src]")
+ M.visible_message(span_red("[M] [response_harm] \the [src]"))
M.do_attack_animation(src)
return
@@ -450,7 +450,7 @@
var/mob/living/exosuit/M = _target_mob
if(length(M.pilots))
return FALSE
- else if(!L.stat || L.health >= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0))
+ else if(!L.stat || L.health >= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0))
return FALSE
if(istype(_target_mob, /obj/machinery/bot))
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 295184da74e..6afa2e87abd 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -4,7 +4,7 @@
lastKnownIP = client.address
computer_id = client.computer_id
log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]")
- if(config.log_access)
+ if(CONFIG_GET(flag/log_access))
var/is_multikeying = 0
for(var/mob/M in GLOB.player_list)
if(M == src) continue
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 6180016f651..fa02b7335f9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -52,31 +52,35 @@
/mob/GenerateTag()
tag = "mob_[next_mob_id++]"
-/mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
+/mob/proc/show_message(msg, type, alt_msg, alt_type, avoid_highlighting = FALSE)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
if(!client)
return
+ msg = copytext_char(msg, 1, MAX_MESSAGE_LEN)
+
if(type)
- if(type & 1 && (sdisabilities & BLIND || blinded || paralysis)) //Vision related
- if(!alt)
+ if(type & MSG_VISUAL && is_blind())//Vision related
+ if(!alt_msg)
return
else
- msg = alt
+ msg = alt_msg
type = alt_type
- if(type & 2 && (sdisabilities & DEAF || ear_deaf)) //Hearing related
- if(!alt)
+
+ if(type & MSG_AUDIBLE && ear_deaf)//Hearing related
+ if(!alt_msg)
return
else
- msg = alt
+ msg = alt_msg
type = alt_type
- if((type & 1 && sdisabilities & BLIND))
+ if(type & MSG_VISUAL && is_blind())
return
+ // voice muffling
+ if(stat == UNCONSCIOUS || stat == HARDCRIT)
+ if(type & MSG_AUDIBLE) //audio
+ to_chat(src, "... You can almost hear something ...")
+ return
+ to_chat(src, msg, avoid_highlighting = avoid_highlighting)
- // Added voice muffling for Issue 41.
- if(stat == UNCONSCIOUS || sleeping > 0)
- to_chat(src, "... You can almost hear someone talking ...")
- else
- to_chat(src, msg)
// Show a message to all mobs and objects in sight of this one
// This would be for visible actions by the src mob
@@ -364,7 +368,7 @@
if(incapacitated())
return
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
if (W)
W.attack_self(src)
@@ -376,7 +380,7 @@
if(incapacitated())
return
- var/obj/item/item = get_active_hand()
+ var/obj/item/item = get_active_held_item()
if(!item)
return
@@ -442,7 +446,7 @@
if(msg != null)
flavor_text = msg
-/mob/proc/print_flavor_text()
+/mob/proc/get_flavor_text()
if (flavor_text && flavor_text != "")
var/msg = trim(replacetext(flavor_text, "\n", " "))
if(!msg) return ""
@@ -466,7 +470,7 @@
if(client.holder && (client.holder.rights & R_ADMIN))
is_admin = 1
else if(stat != DEAD || isnewplayer(src))
- to_chat(usr, "\blue You must be observing to use this!")
+ to_chat(usr, span_blue("You must be observing to use this!"))
return
if(is_admin && stat == DEAD)
@@ -566,7 +570,7 @@
/mob/proc/pull_damage()
if(ishuman(src))
var/mob/living/carbon/human/H = src
- if(H.health - H.halloss <= HEALTH_THRESHOLD_SOFTCRIT)
+ if(H.health - H.halloss <= CONFIG_GET(number/health_threshold_softcrit))
for(var/name in H.organs_by_name)
var/obj/item/organ/external/e = H.organs_by_name[name]
if(e && H.lying)
@@ -589,6 +593,7 @@
set category = "IC"
if(pulling)
+ animate_interact(pulling, INTERACT_UNPULL)
pulling.pulledby = null
pulling = null
if(HUDneed.Find("pull"))
@@ -654,13 +659,12 @@
src.pulling = AM
AM.pulledby = src
- /*if(pullin)
- pullin.icon_state = "pull1"*/
+ animate_interact(AM, INTERACT_PULL)
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
if(H.pull_damage())
- to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.")
+ to_chat(src, span_boldwarning("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))
@@ -1272,6 +1276,12 @@ All Canmove setting in this proc is temporary. This var should not be set from h
return
var/obj/screen/zone_sel/selector = mob.HUDneed["damage zone"]
selector.set_selected_zone(next_list_item(mob.targeted_organ,zones))
+ logger.Log(
+ LOG_CATEGORY_TARGET_ZONE_SWITCH,
+ "[key_name(src)] manually changed selected zone",
+ data = zones
+ )
+
/mob/proc/set_stat(var/new_stat)
. = stat != new_stat
stat = new_stat
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index b303851678d..e377336892c 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -48,7 +48,7 @@
var/other_mobs
var/next_move
var/transforming //Carbon
- var/hand
+ var/hand = 0
var/real_name
var/bhunger = 0 //Carbon
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 67cf64d40a6..9c66f532867 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -328,10 +328,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
/proc/broadcast_hud_message(var/message, var/broadcast_source, var/list/targets, var/icon)
var/turf/sourceturf = get_turf(broadcast_source)
+ var/htmlicon = icon2html(icon, targets)
for(var/mob/M in targets)
var/turf/targetturf = get_turf(M)
if((targetturf.z == sourceturf.z))
- M.show_message(span_info("\icon[icon] [message]"), 1)
+ M.show_message(span_info("[htmlicon] [message]"), 1)
/proc/mobs_in_area(var/area/A)
var/list/mobs = new
@@ -383,7 +384,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
else // Everyone else (dead people who didn't ghost yet, etc.)
lname = name
lname = "[span_name("[lname]")] "
- to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]"))
+ to_chat(M, span_deadsay("DEAD: [lname][follow][message]"))
//Announces that a ghost has joined/left, mainly for use with wizards
/proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "")
@@ -393,7 +394,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
var/mob/M = O
if(M.client)
C = M.client
- else if(istype(O, /client))
+ else if(isclient(O))
C = O
else if(istype(O, /datum/mind))
var/datum/mind/M = O
@@ -521,10 +522,10 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
return can_admin_interact() && ..(ghost_multitool)
/mob/living/carbon/human/get_multitool()
- return ..(get_active_hand())
+ return ..(get_active_held_item())
/mob/living/silicon/robot/get_multitool()
- return ..(get_active_hand())
+ return ..(get_active_held_item())
/mob/living/silicon/ai/get_multitool()
return ..(aiMulti)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 2abd1b02f10..498eb701407 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -67,12 +67,12 @@
to_chat(usr, span_warning("This mob type cannot drop items."))
/mob/living/carbon/hotkey_drop()
- if(!get_active_hand())
+ if(!get_active_held_item())
to_chat(usr, span_warning("You have nothing to drop in your hand."))
if (!isturf(loc))
return
else
- unEquip(get_active_hand(), loc)
+ unEquip(get_active_held_item(), loc)
//This gets called when you press the delete button.
/client/verb/delete_key_pressed()
diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm
index b9f769d4020..876f82c9dc5 100644
--- a/code/modules/mob/mob_transformation_simple.dm
+++ b/code/modules/mob/mob_transformation_simple.dm
@@ -5,7 +5,7 @@
/mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies)
if(isnewplayer(src))
- to_chat(usr, "\red cannot convert players who have not entered yet.")
+ to_chat(usr, span_red("cannot convert players who have not entered yet."))
return
if(!new_type)
@@ -19,7 +19,7 @@
return
if( new_type == /mob/new_player )
- to_chat(usr, "\red cannot convert into a new_player mob type.")
+ to_chat(usr, span_red("cannot convert into a new_player mob type."))
return
var/mob/M
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 1bfb05355cb..b32108d9944 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -17,8 +17,8 @@
// return FALSE
if(join_motd)
- to_chat(src, "[join_motd]")
- to_chat(src, "Game ID: [game_id]")
+ to_chat(src, "[join_motd]")
+ to_chat(src, "Game ID: [GLOB.game_id]")
loc = null
my_client = client
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 53635846ba2..e1d9a3d48e1 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -31,19 +31,29 @@
/mob/new_player/proc/new_player_panel_proc()
var/output = "New Player Options"
output +="
"
- output += ""
+ output += ""
if(SSticker.current_state <= GAME_STATE_PREGAME)
if(ready)
- output += "\[ [span_linkOn("Ready")] | Not Ready \]
"
+ output += "\[ [span_linkOn("Ready")] | Not Ready \]
"
else
- output += "\[ Ready | [span_linkOn("Not Ready")] \]
"
+ output += "\[ Ready | [span_linkOn("Not Ready")] \]
"
else
- output += "View the Crew Manifest
"
- output += ""
+ output += "View the Crew Manifest
"
+ output += ""
- output += ""
+ output += ""
+
+ if (src.client.holder)
+ output += "
"
+ output += "[span_bold("Admin Quick Verbs")]"
+ if (SSticker.state <= GAME_STATE_PREGAME)
+ output += "\[Start Now\]
"
+ else
+ output += "\[End Round\]
"
+ output += "\[Restart\]
"
+ output += "\[View Runtimes\]
"
if(!IsGuestKey(src.key))
establish_db_connection()
@@ -60,13 +70,17 @@
break
if(newpoll)
- output += "Show Player Polls (NEW!)
"
+ output += "Show Player Polls (NEW!)
"
else
- output += ""
+ output += ""
output += ""
- panel = new(src, "Welcome","Welcome", 210, 280, src)
+ if (src.client.holder)
+ panel = new(src, "Welcome","Welcome", 230, 330, src)
+ else
+ panel = new(src, "Welcome","Welcome", 210, 280, src)
+
panel.set_window_options("can_close=0")
panel.set_content(output)
panel.open()
@@ -77,11 +91,11 @@
/mob/new_player/Topic(href, href_list[])
if(src != usr || !client)
- return 0
+ return FALSE
if(href_list["show_preferences"])
client.prefs.ShowChoices(src)
- return 1
+ return TRUE
if(href_list["ready"])
if(SSticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
@@ -114,7 +128,7 @@
if(href_list["observe"])
if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able join the crew! But you can play as a mouse or drone immediately.","Player Setup","Yes","No") == "Yes")
- if(!client) return 1
+ if(!client) return TRUE
var/mob/observer/ghost/observer = new()
spawning = 1
@@ -138,7 +152,7 @@
client.prefs.real_name = random_name(client.prefs.gender)
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.
+ if(!client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed.
remove_verb(observer, /mob/observer/ghost/verb/toggle_antagHUD)
//observer.key = key
observer.ckey = ckey
@@ -153,7 +167,7 @@
if(href_list["late_join"])
if(SSticker.current_state != GAME_STATE_PLAYING)
- to_chat(usr, "\red The round is either not ready, or has already finished...")
+ to_chat(usr, span_red("The round is either not ready, or has already finished..."))
return
// Warn the player if they are trying to spawn without a brain
@@ -162,7 +176,7 @@
if(alert(src,"Are you sure you wish to spawn without a brain? This will likely cause you to do die immediately. \
If not, go to the Augmentation section of Setup Character and change the \"brain\" slot from Removed to the desired kind of brain.", \
"Player Setup", "Yes", "No") == "No")
- return 0
+ return FALSE
// Warn the player if they are trying to spawn without eyes
mod = client.prefs.get_modification(BP_EYES)
@@ -170,13 +184,13 @@
if(alert(src,"Are you sure you wish to spawn without eyes? It will likely be difficult to see without them. \
If not, go to the Augmentation section of Setup Character and change the \"eyes\" slot from Removed to the desired kind of eyes.", \
"Player Setup", "Yes", "No") == "No")
- return 0
+ return FALSE
if(!check_rights(R_ADMIN, 0))
- var/datum/species/S = all_species[client.prefs.species]
+ var/datum/species/S = GLOB.all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
- return 0
+ return FALSE
LateChoices()
@@ -185,18 +199,18 @@
if(href_list["SelectedJob"])
- if(!config.enter_allowed)
+ if(!CONFIG_GET(flag/enter_allowed))
to_chat(usr, span_notice("There is an administrative lock on entering the game!"))
return
else if(SSticker.nuke_in_progress)
to_chat(usr, span_danger("The station is currently exploding. Joining would go poorly."))
return
- var/datum/species/S = all_species[client.prefs.species]
+ var/datum/species/S = GLOB.all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
- return 0
+ return FALSE
AttemptLateSpawn(href_list["SelectedJob"], client.prefs.spawnpoint)
return
@@ -229,6 +243,26 @@
if("TEXT")
var/reply_text = href_list["reply_text"]
log_text_poll_reply(poll_id, reply_text)
+ return
+
+ if (!src.client.holder)
+ return
+
+ if (href_list["startnow"])
+ src.client.holder.startnow()
+ return
+
+ if (href_list["endround"])
+ src.client.holder.end_round()
+ return
+
+ if (href_list["restart"])
+ src.client.holder.restart()
+ return
+
+ if (href_list["runtimes"])
+ src.client.view_runtimes()
+ return
/mob/new_player/proc/IsJobAvailable(rank)
@@ -247,16 +281,16 @@
/mob/new_player/proc/AttemptLateSpawn(rank, var/spawning_at)
if(src != usr)
- return 0
+ return FALSE
if(SSticker.current_state != GAME_STATE_PLAYING)
- to_chat(usr, "\red The round is either not ready, or has already finished...")
- return 0
- if(!config.enter_allowed)
+ to_chat(usr, span_red("The round is either not ready, or has already finished..."))
+ return FALSE
+ if(!CONFIG_GET(flag/enter_allowed))
to_chat(usr, span_notice("There is an administrative lock on entering the game!"))
- return 0
+ return FALSE
if(!IsJobAvailable(rank))
src << alert("[rank] is not available. Please try another.")
- return 0
+ return FALSE
spawning = 1
close_spawn_windows()
@@ -265,6 +299,7 @@
var/datum/job/job = src.mind.assigned_job
var/mob/living/character = create_character() //creates the human and transfers vars and mind
+
// AIs don't need a spawnpoint, they must spawn at an empty core
if(rank == "AI")
@@ -277,6 +312,7 @@
character.forceMove(C.loc)
AnnounceArrival(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
+ log_manifest(character.mind.key, character.mind, character, latejoin = TRUE)
qdel(C)
qdel(src)
@@ -298,8 +334,7 @@
//Grab some data from the character prefs for use in random news procs.
AnnounceArrival(character, character.mind.assigned_role, spawnpoint.message) //will not broadcast if there is no message
-
-
+ log_manifest(character.mind.key, character.mind, character, latejoin = TRUE)
qdel(src)
@@ -328,7 +363,7 @@
// Only players with the job assigned and AFK for less than 10 minutes count as active
for(var/mob/M in GLOB.player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
active++
- dat += "[job.title] ([job.current_positions]) (Active: [active])
"
+ dat += "[job.title] ([job.current_positions]) (Active: [active])
"
dat += ""
src << browse(HTML_SKELETON_TITLE("Late join", dat), "window=latechoices;size=400x640;can_close=1")
@@ -343,7 +378,7 @@
var/use_species_name
var/datum/species/chosen_species
if(client.prefs.species)
- chosen_species = all_species[client.prefs.species]
+ chosen_species = GLOB.all_species[client.prefs.species]
use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm.
if(chosen_species && use_species_name)
@@ -355,7 +390,7 @@
new_character.lastarea = get_area(NULLSPACE)
for(var/lang in client.prefs.alternate_languages)
- var/datum/language/chosen_language = all_languages[lang]
+ var/datum/language/chosen_language = GLOB.all_languages[lang]
if(chosen_language)
if(!(chosen_language.flags & WHITELISTED) || has_admin_rights() \
|| (new_character.species && (chosen_language.name in new_character.species.secondary_langs)))
@@ -401,7 +436,7 @@
return new_character
/mob/new_player/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, var/glide_size_override = 0)
- return 0
+ return FALSE
/mob/new_player/proc/close_spawn_windows()
src << browse(null, "window=latechoices") //closes late choices window
@@ -410,7 +445,7 @@
/mob/new_player/get_species()
var/datum/species/chosen_species
if(client.prefs.species)
- chosen_species = all_species[client.prefs.species]
+ chosen_species = GLOB.all_species[client.prefs.species]
if(!chosen_species)
return SPECIES_HUMAN
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index d60be96b030..4aff695fc4a 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -2,8 +2,8 @@
/datum/preferences
//The mob should have a gender you want before running this proc. Will run fine without H
/datum/preferences/proc/randomize_appearance_and_body_for(var/mob/living/carbon/human/H)
- var/datum/species/current_species = all_species[species]
- if(!current_species) current_species = all_species[SPECIES_HUMAN]
+ var/datum/species/current_species = GLOB.all_species[species]
+ if(!current_species) current_species = GLOB.all_species[SPECIES_HUMAN]
gender = pick(current_species.genders)
h_style = random_hair_style(gender, species)
f_style = random_facial_hair_style(gender, species)
diff --git a/code/modules/mob/observer/ghost/ghost.dm b/code/modules/mob/observer/ghost/ghost.dm
index 1953f88243c..bbf5b8d5a25 100755
--- a/code/modules/mob/observer/ghost/ghost.dm
+++ b/code/modules/mob/observer/ghost/ghost.dm
@@ -168,7 +168,7 @@ Works together with spawning an observer, noted above.
ghost.client = client
ghost.client.init_verbs()
ghost.initialise_postkey()
- 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.
+ if(ghost.client && !ghost.client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed.
remove_verb(ghost, /mob/observer/ghost/verb/toggle_antagHUD)
ghost.client?.create_UI(ghost.type)
@@ -196,7 +196,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
else
response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body")
if(response == "Ghost")
- message_admins("[key_name_admin(usr)] has ghosted. (JMP)")
+ message_admins("[key_name_admin(usr)] has ghosted. [ADMIN_JMP(src)]")
log_game("[key_name_admin(usr)] has ghosted.")
ghostize(0)
announce_ghost_joinleave(client)
@@ -233,10 +233,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
if(medHUD)
medHUD = 0
- to_chat(src, "\blue Medical HUD Disabled")
+ to_chat(src, span_blue("Medical HUD Disabled"))
else
medHUD = 1
- to_chat(src, "\blue Medical HUD Enabled")
+ to_chat(src, span_blue("Medical HUD Enabled"))
/mob/observer/ghost/verb/toggle_antagHUD()
set category = "Ghost"
@@ -246,14 +246,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!client)
return
var/mentor = is_mentor(usr.client)
- if(!config.antag_hud_allowed && (!client.holder || mentor))
- to_chat(src, "\red Admins have disabled this for this round.")
+ if(!CONFIG_GET(flag/antag_hud_allowed) && (!client.holder || mentor))
+ to_chat(src, span_red("Admins have disabled this for this round."))
return
var/mob/observer/ghost/M = src
if(jobban_isbanned(M, "AntagHUD"))
- to_chat(src, "\red You have been banned from using this feature")
+ to_chat(src, span_red("You have been banned from using this feature"))
return
- if(config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || mentor))
+ if(CONFIG_GET(flag/antag_hud_restricted) && !M.has_enabled_antagHUD && (!client.holder || mentor))
var/response = 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?","Yes","No")
if(response == "No") return
M.can_reenter_corpse = 0
@@ -261,10 +261,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
M.has_enabled_antagHUD = 1
if(M.antagHUD)
M.antagHUD = 0
- to_chat(src, "\blue AntagHUD Disabled")
+ to_chat(src, span_blue("AntagHUD Disabled"))
else
M.antagHUD = 1
- to_chat(src, "\blue AntagHUD Enabled")
+ to_chat(src, span_blue("AntagHUD Enabled"))
/mob/observer/ghost/proc/dead_tele(A in SSmapping.ghostteleportlocs)
set category = "Ghost"
@@ -385,11 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/observer/ghost/memory()
set hidden = 1
- to_chat(src, "\red You are dead! You have no mind to store memory!")
+ to_chat(src, span_red("You are dead! You have no mind to store memory!"))
/mob/observer/ghost/add_memory()
set hidden = 1
- to_chat(src, "\red You are dead! You have no mind to store memory!")
+ to_chat(src, span_red("You are dead! You have no mind to store memory!"))
/mob/observer/ghost/verb/analyze_air()
@@ -407,16 +407,16 @@ 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
- to_chat(src, "\blue Results:")
+ to_chat(src, span_blue("Results:"))
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa")
+ to_chat(src, span_blue("Pressure: [round(pressure,0.1)] kPa"))
else
- to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa")
+ to_chat(src, span_red("Pressure: [round(pressure,0.1)] kPa"))
if(total_moles)
for(var/g in environment.gas)
- to_chat(src, "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)")
- to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)")
- to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]")
+ to_chat(src, span_blue("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"))
+ to_chat(src, span_blue("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"))
+ to_chat(src, span_blue("Heat Capacity: [round(environment.heat_capacity(),0.1)]"))
/mob/observer/verb/become_mouse()
@@ -453,7 +453,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(src, span_warning("Unable to find any safe, unwelded vents to spawn mice at. The ship must be quite a mess! Trying again might work, if you think there's still a safe place. "))
if(host)
- if(config.uneducated_mice)
+ if(CONFIG_GET(flag/uneducated_mice))
host.universal_understand = 0
announce_ghost_joinleave(src, 0, "They are now a mouse.")
host.ckey = src.ckey
@@ -561,7 +561,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return ..()
/mob/observer/ghost/proc/try_possession(var/mob/living/M)
- if(!config.ghosts_can_possess_animals)
+ if(!CONFIG_GET(flag/ghosts_can_possess_animals))
to_chat(usr, span_warning("Ghosts are not permitted to possess animals."))
return 0
if(!M.can_be_possessed_by(src))
@@ -690,25 +690,25 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/observer/ghost/MayRespawn(var/feedback = 0, var/respawn_type = 0)
if(!client)
return FALSE
- if(config.antag_hud_restricted && has_enabled_antagHUD == 1)
+ if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1)
if(feedback)
to_chat(src, span_warning("antagHUD restrictions prevent you from respawning."))
return FALSE
- if(!config.respawn_delay)
+ if(!CONFIG_GET(number/respawn_delay))
return TRUE
var/timedifference = world.time- get_death_time(respawn_type)
var/respawn_time = 0
if (respawn_type == CREW)
- respawn_time = config.respawn_delay MINUTES
+ respawn_time = CONFIG_GET(number/respawn_delay) MINUTES
//Here we factor in bonuses added from cryosleep and similar things
timedifference += get_respawn_bonus()
else if (respawn_type == ANIMAL)
- respawn_time = min(ANIMAL_SPAWN_DELAY, config.respawn_delay)
+ respawn_time = min(ANIMAL_SPAWN_DELAY, CONFIG_GET(number/respawn_delay))
else if (respawn_type == MINISYNTH)
- respawn_time = min(DRONE_SPAWN_DELAY, config.respawn_delay)
+ respawn_time = min(DRONE_SPAWN_DELAY, CONFIG_GET(number/respawn_delay))
timedifference = max(timedifference, 0)
if(respawn_time && timedifference > respawn_time)
@@ -765,7 +765,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set name = "Respawn"
set category = "OOC"
- if (!( config.abandon_allowed ))
+ if (!( CONFIG_GET(flag/abandon_allowed) ))
to_chat(usr, span_notice("Respawn is disabled."))
return
@@ -777,7 +777,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
to_chat(usr, span_notice("You must be dead to use this!"))
return
else if(!MayRespawn(1, CREW))
- if(!check_rights(0, 0) || alert("Normal players must wait at least [config.respawn_delay] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok")
+ if(!check_rights(0, 0) || alert("Normal players must wait at least [CONFIG_GET(number/respawn_delay)] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok")
return
//Wipe any bonuses gained in the previous (after)life
diff --git a/code/modules/mob/observer/ghost/say.dm b/code/modules/mob/observer/ghost/say.dm
index dfa5a9e8355..3cb646ad60d 100644
--- a/code/modules/mob/observer/ghost/say.dm
+++ b/code/modules/mob/observer/ghost/say.dm
@@ -8,7 +8,7 @@
if(src.client)
if(src.client.prefs.muted&MUTE_DEADCHAT)
- to_chat(src, "\red You cannot talk in deadchat (muted).")
+ to_chat(src, span_red("You cannot talk in deadchat (muted)."))
return
if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
@@ -42,7 +42,7 @@
if(src.client)
if(src.client.prefs.muted&MUTE_DEADCHAT)
- to_chat(src, "\red You cannot emote in deadchat (muted).")
+ to_chat(src, span_red("You cannot emote in deadchat (muted)."))
return
if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 36d2852f708..cb1e4a72959 100755
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -6,7 +6,7 @@
set category = "IC"
if(say_disabled) //This is here to try to identify lag problems
- to_chat(usr, "\red Speech is currently admin-disabled.")
+ to_chat(usr, span_red("Speech is currently admin-disabled."))
return
if(ishuman(src))
@@ -30,7 +30,7 @@
set category = "IC"
if(say_disabled) //This is here to try to identify lag problems
- to_chat(usr, "\red Speech is currently admin-disabled.")
+ to_chat(usr, span_red("Speech is currently admin-disabled."))
return
if(ishuman(src))
@@ -57,7 +57,7 @@
if(say_disabled) //This is here to try to identify lag problems
to_chat(usr, span_danger("Speech is currently admin-disabled."))
return
- if(src.client && !src.client.holder && !config.dsay_allowed)
+ if(src.client && !src.client.holder && !GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat is globally muted."))
return
@@ -157,11 +157,11 @@
var/prefix = copytext(message, 1, 2)
if(length(message) >= 1 && prefix == get_prefix_key(/decl/prefix/audible_emote))
- return all_languages["Noise"]
+ return GLOB.all_languages["Noise"]
if(length(message) >= 2 && is_language_prefix(prefix))
var/language_prefix = copytext(message, 2, 3)
- var/datum/language/L = language_keys[language_prefix]
+ var/datum/language/L = GLOB.language_keys[language_prefix]
if(can_speak(L))
return L
diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm
index 9846593a23a..756d2d3f1a1 100644
--- a/code/modules/modular_computers/NTNet/NTNet.dm
+++ b/code/modules/modular_computers/NTNet/NTNet.dm
@@ -195,7 +195,7 @@ var/global/datum/ntnet/ntnet_global = new()
add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.")
if(NTNET_SYSTEMCONTROL)
setting_systemcontrol = !setting_systemcontrol
- add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name]'s systems.")
+ add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name()]'s systems.")
/datum/ntnet/proc/find_email_by_login(var/login)
for(var/datum/computer_file/data/email_account/A in ntnet_global.email_accounts)
diff --git a/code/modules/modular_computers/file_system/binary/design.dm b/code/modules/modular_computers/file_system/binary/design.dm
index 7ff1bddf949..50c7289bb60 100644
--- a/code/modules/modular_computers/file_system/binary/design.dm
+++ b/code/modules/modular_computers/file_system/binary/design.dm
@@ -14,7 +14,7 @@
return F
/datum/computer_file/binary/design/proc/set_filename(new_name)
- filename = sanitizeFileName("[new_name]")
+ filename = SANITIZE_FILENAME("[new_name]")
if(findtext(filename, "datum_design_") == 1)
filename = copytext(filename, 14)
diff --git a/code/modules/modular_computers/file_system/binary/research.dm b/code/modules/modular_computers/file_system/binary/research.dm
index 61e58195347..d7bc2013e81 100644
--- a/code/modules/modular_computers/file_system/binary/research.dm
+++ b/code/modules/modular_computers/file_system/binary/research.dm
@@ -11,7 +11,7 @@
/datum/computer_file/binary/tech/proc/set_tech(datum/technology/new_tech)
node = new_tech
- filename = sanitizeFileName(lowertext(node.name))
+ filename = SANITIZE_FILENAME(lowertext(node.name))
// R&D research points file
diff --git a/code/modules/modular_computers/file_system/catalog.dm b/code/modules/modular_computers/file_system/catalog.dm
index 8f61e85ccd7..db15640db34 100644
--- a/code/modules/modular_computers/file_system/catalog.dm
+++ b/code/modules/modular_computers/file_system/catalog.dm
@@ -12,78 +12,6 @@
GLOBAL_LIST_EMPTY(catalogs)
GLOBAL_LIST_EMPTY(all_catalog_entries_by_type)
-/hook/startup/proc/createCatalogs()
- // Reagents
- for(var/V in GLOB.chemical_reagents_list)
- var/datum/reagent/D = GLOB.chemical_reagents_list[V]
- if(D.appear_in_default_catalog)
- create_catalog_entry(D, CATALOG_REAGENTS)
- create_catalog_entry(D, CATALOG_ALL)
- if(istype(D, /datum/reagent/drink) || istype(D, /datum/reagent/alcohol))
- create_catalog_entry(D, CATALOG_DRINKS)
- else
- create_catalog_entry(D, CATALOG_CHEMISTRY)
- // second run to add decompose results
- for(var/V in GLOB.chemical_reagents_list)
- var/datum/reagent/D = GLOB.chemical_reagents_list[V]
- if(D.heating_products && D.heating_point)
- for(var/id in D.heating_products)
- var/datum/catalog_entry/reagent/E = get_catalog_entry(get_reagent_type_by_id(id))
- if(E)
- E.add_decomposition_from(D.type)
-
- if(D.chilling_products && D.chilling_point)
- for(var/id in D.chilling_point)
- var/datum/catalog_entry/reagent/E = get_catalog_entry(D.type)
- if(E)
- E.add_decomposition_from(D.type)
-
- var/datum/catalog/C = GLOB.catalogs[CATALOG_REAGENTS]
- C.associated_template = "catalog_list_reagents.tmpl"
- sortTim(C.entry_list, /proc/cmp_catalog_entry_asc)
- C = GLOB.catalogs[CATALOG_CHEMISTRY]
- C.associated_template = "catalog_list_reagents.tmpl"
- sortTim(C.entry_list, /proc/cmp_catalog_entry_chem)
- C = GLOB.catalogs[CATALOG_DRINKS]
- C.associated_template = "catalog_list_drinks.tmpl"
- sortTim(C.entry_list, /proc/cmp_catalog_entry_asc)
- C = GLOB.catalogs[CATALOG_ALL]
- C.associated_template = "catalog_list_general.tmpl"
- sortTim(C.entry_list, /proc/cmp_catalog_entry_asc)
- createCookingCatalogs()
- return TRUE
-
-/proc/create_catalog_entry(var/datum/thing, var/catalog_id)
- if(catalog_id && !GLOB.catalogs[catalog_id])
- GLOB.catalogs[catalog_id] = new /datum/catalog(catalog_id)
- if(!GLOB.all_catalog_entries_by_type[thing.type])
- if(istype(thing, /datum/reagent))
- if(istype(thing, /datum/reagent/drink) || (istype(thing, /datum/reagent/alcohol) && thing.type != /datum/reagent/alcohol))
- GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/drink(thing)
- else
- GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/reagent(thing)
- else if(istype(thing, /atom))
- GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/atom(thing)
- else
- var/list/element = GLOB.catalogs[catalog_id]
- if(!element.len)
- qdel(element)
- GLOB.catalogs.Remove(catalog_id)
- return FALSE
- error("Unsupported type passed to /proc/create_catalog_entry()")
- return FALSE
- if(catalog_id)
- var/datum/catalog/C = GLOB.catalogs[catalog_id]
- C.add_entry(GLOB.all_catalog_entries_by_type[thing.type])
- else if(catalog_id)
- var/datum/catalog/C = GLOB.catalogs[catalog_id]
- if(!C.entry_list.Find(GLOB.all_catalog_entries_by_type[thing.type]))
- C.add_entry(GLOB.all_catalog_entries_by_type[thing.type])
- return TRUE
-
-/proc/get_catalog_entry(var/type)
- if(GLOB.all_catalog_entries_by_type[type])
- return GLOB.all_catalog_entries_by_type[type]
/datum/catalog
var/id
diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm
index cb62e0aee79..00407ba259c 100644
--- a/code/modules/modular_computers/file_system/programs/command/card.dm
+++ b/code/modules/modular_computers/file_system/programs/command/card.dm
@@ -28,7 +28,7 @@
var/list/data = host.initial_data()
data["src"] = "\ref[src]"
- data["station_name"] = station_name
+ data["station_name()"] = station_name()
data["manifest"] = html_crew_manifest()
data["assignments"] = show_assignments
if(program && program.computer)
@@ -187,7 +187,7 @@
if(computer.card_slot && computer.card_slot.stored_card)
computer.proc_eject_id(user)
else
- computer.attackby(user.get_active_hand(), user)
+ computer.attackby(user.get_active_held_item(), user)
if("terminate")
if(!authorized(user_id_card, ACCESS_REGION_COMMAND))
to_chat(user, span_warning("Access denied."))
diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm
index 756ae88b629..7e876618b1d 100644
--- a/code/modules/modular_computers/file_system/programs/command/comm.dm
+++ b/code/modules/modular_computers/file_system/programs/command/comm.dm
@@ -136,7 +136,7 @@
if(announcment_cooldown)
to_chat(usr, "Please allow at least one minute to pass between announcements")
return TRUE
- var/input = input(usr, "Please write a message to announce to the [station_name].", "Priority Announcement") as null|text
+ var/input = input(usr, "Please write a message to announce to the [station_name()].", "Priority Announcement") as null|text
if(!input || !can_still_topic())
return 1
if(GLOB.in_character_filter.len) //I don't want to read announcements about sending people to brazil.
diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm
index 6a7de53b1cc..2e305034e79 100644
--- a/code/modules/modular_computers/file_system/programs/generic/records.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/records.dm
@@ -130,8 +130,8 @@
return 1
/datum/nano_module/records/proc/get_photo(var/mob/user)
- if(istype(user.get_active_hand(), /obj/item/photo))
- var/obj/item/photo/photo = user.get_active_hand()
+ if(istype(user.get_active_held_item(), /obj/item/photo))
+ var/obj/item/photo/photo = user.get_active_held_item()
return photo.img
if(istype(user, /mob/living/silicon))
var/mob/living/silicon/tempAI = usr
diff --git a/code/modules/modular_computers/file_system/programs/generic/signaller.dm b/code/modules/modular_computers/file_system/programs/generic/signaller.dm
index 0c65ae76712..bec5f499afc 100644
--- a/code/modules/modular_computers/file_system/programs/generic/signaller.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/signaller.dm
@@ -101,5 +101,7 @@
/datum/computer_file/program/signaller/proc/receive_signal(datum/signal/signal)
if(signal.encryption == code)
- for(var/mob/O in hearers(1, computer.loc))
- O.show_message("\icon[computer] *beep* *beep*", 3, "*beep* *beep*", 2)
+ var/our_hearers = hearers(1, get_turf(computer))
+ var/htmlicon = icon2html(computer, our_hearers)
+ for(var/mob/O in our_hearers)
+ O.show_message("[htmlicon] *beep* *beep*", 3, "*beep* *beep*", 2)
diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm
index 134e01e37cc..19be303cd23 100644
--- a/code/modules/modular_computers/file_system/programs/generic/supply.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm
@@ -258,7 +258,7 @@
return
var/t = ""
- t += "[maps_data.station_name] Supply Requisition Reciept
"
+ t += "[maps_data.station_name()] Supply Requisition Reciept
"
t += "INDEX: #[O.ordernum]
"
t += "REQUESTED BY: [O.orderedby]
"
t += "RANK: [O.orderedrank]
"
@@ -272,7 +272,7 @@
/datum/nano_module/supply/proc/print_summary(var/mob/user)
var/t = ""
- t += "
[maps_data.station_name]
[station_date]
Export overview
"
+ t += "
[maps_data.station_name()]
[station_date]
Export overview
"
for(var/source in SSsupply.point_source_descriptions)
t += "[SSsupply.point_source_descriptions[source]]: [SSsupply.point_sources[source] || 0]
"
print_text(t, user)
diff --git a/code/modules/modular_computers/file_system/programs/generic/trade.dm b/code/modules/modular_computers/file_system/programs/generic/trade.dm
index daec921afa8..ae254f69cd8 100644
--- a/code/modules/modular_computers/file_system/programs/generic/trade.dm
+++ b/code/modules/modular_computers/file_system/programs/generic/trade.dm
@@ -68,13 +68,13 @@
var/list/category_list = list()
var/list/inventory_list = list()
- LAZYDISTINCTADD(shoppinglist, station) // Add the station reference to the shopping list if it doesn't already exist
+ shoppinglist |= station // Add the station reference to the shopping list if it doesn't already exist
if(!islist(shoppinglist[station])) // If nothing has been added under this station, create an empty list
shoppinglist[station] = list()
category_list = shoppinglist[station] // Make the category list point to the current station's category list
- LAZYDISTINCTADD(category_list, chosen_category) // Add the category to the shopping list if it doesn't already exist
+ category_list |= chosen_category // Add the category to the shopping list if it doesn't already exist
if(!islist(category_list[chosen_category])) // If nothing has been added under this category, create an empty list
category_list[chosen_category] = list()
@@ -103,7 +103,7 @@
if(!path)
return
var/list/inventory_list = open_shop_list() // Get reference to inventory list
- LAZYDISTINCTADD(inventory_list, path)
+ inventory_list |= path
LAZYAPLUS(inventory_list, path, max(0, amount))
if(inventory_list[path] > limit)
@@ -143,7 +143,7 @@
var/list_name = name ? name : "Saved Cart #[++saved_cart_id]"
- LAZYDISTINCTADD(saved_shopping_lists, list_name)
+ saved_shopping_lists |= list_name
LAZYSET(saved_shopping_lists, list_name, list_to_save)
/datum/computer_file/program/trade/proc/load_shop_list(name)
@@ -609,7 +609,7 @@
.["sending_index"] = SStrade.beacons_sending.Find(PRG.sending)
if(PRG.station)
- .["station_name"] = PRG.station.name
+ .["station_name()"] = PRG.station.name
.["station_desc"] = PRG.station.desc
.["station_id"] = PRG.station.uid
.["station_index"] = SStrade.discovered_stations.Find(PRG.station)
diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm
index f75b3f72ddc..9d86902886d 100755
--- a/code/modules/multiz/turf.dm
+++ b/code/modules/multiz/turf.dm
@@ -107,7 +107,7 @@ see multiz/movement.dm for some info.
/turf/open/fallThrough(var/atom/movable/mover)
// If the target is open space or a shadow, the projectile traverses down
- if( config.z_level_shooting && istype(mover,/obj/item/projectile) )
+ if( CONFIG_GET(flag/z_level_shooting) && istype(mover,/obj/item/projectile) )
var/obj/item/projectile/P = mover
if(isnull(P.height) && ( istype(P.original, /turf/open) || (istype(mover, /mob/shadow)) ) && get_dist(P.starting, P.original) <= get_dist(P.starting, src))
P.Move(below) // We want proc/Enter to get called on the turf, so we can't use forcemove()
diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm
index 2e20b56a0b6..aa2aa2ac24f 100644
--- a/code/modules/nano/nanoexternal.dm
+++ b/code/modules/nano/nanoexternal.dm
@@ -69,4 +69,4 @@
return list() // Not implemented.
// Used by SSnano (/datum/controller/subsystem/processing/nano) to track UIs opened by this mob
-/mob/var/list/open_uis
+// /mob/var/list/open_uis
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index b0d87508210..9b2e5238e3f 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -232,7 +232,7 @@ nanoui is used to open and update nano browser uis
var/list/potential_catalog_data = list()
for(var/type in types)
- var/datum/catalog_entry/E = get_catalog_entry(type)
+ var/datum/catalog_entry/E = SScwj.get_catalog_entry(type)
if(E)
potential_catalog_data.Add(list(list("entry_name" = E.title, "entry_img_path" = E.image_path, "entry_type" = E.thing_type)))
@@ -393,7 +393,7 @@ nanoui is used to open and update nano browser uis
initial_data_json = strip_improper(initial_data_json);
var/url_parameters_json = json_encode(list("src" = "\ref[src]"))
-
+
// This prevents the so-called white screens
spawn(1)
retrieving_html = FALSE
diff --git a/code/modules/onestar/os_cash.dm b/code/modules/onestar/os_cash.dm
index 2a594d305b9..4226f824571 100644
--- a/code/modules/onestar/os_cash.dm
+++ b/code/modules/onestar/os_cash.dm
@@ -38,7 +38,7 @@
..()
/obj/item/stack/os_cash/attack_hand(mob/user)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
split_cash(user)
else
..()
diff --git a/code/modules/organs/body_modifications.dm b/code/modules/organs/body_modifications.dm
index e133a971edd..644d6d943cc 100644
--- a/code/modules/organs/body_modifications.dm
+++ b/code/modules/organs/body_modifications.dm
@@ -240,7 +240,7 @@ var/global/list/modifications_types = list(
replace_limb = /obj/item/organ/internal/eyes/oneeye
/datum/body_modification/organ/oneeye/get_mob_icon(organ, color, gender, species)
- var/datum/species/S = all_species[species]
+ var/datum/species/S = GLOB.all_species[species]
var/icon/I = new/icon(S.faceicobase, "eye_l")
I.Blend(color, ICON_ADD)
return I
@@ -257,7 +257,7 @@ var/global/list/modifications_types = list(
replace_limb = /obj/item/organ/internal/eyes/oneeye/right
/datum/body_modification/organ/oneeye/right/get_mob_icon(organ, color, gender, species)
- var/datum/species/S = all_species[species]
+ var/datum/species/S = GLOB.all_species[species]
var/icon/I = new/icon(S.faceicobase, "eye_r")
I.Blend(color, ICON_ADD)
return I
@@ -271,7 +271,7 @@ var/global/list/modifications_types = list(
hascolor = TRUE
/datum/body_modification/organ/heterochromia/get_mob_icon(organ, color, gender, species)
- var/datum/species/S = all_species[species]
+ var/datum/species/S = GLOB.all_species[species]
var/icon/I = new/icon(S.faceicobase, "eye_l")
I.Blend(color, ICON_ADD)
return I
diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm
index be70eeda9d8..e6179d9bee7 100644
--- a/code/modules/organs/external/_external.dm
+++ b/code/modules/organs/external/_external.dm
@@ -20,7 +20,7 @@
// Strings
var/damage_state = "00" // Modifier used for generating the on-mob damage overlay for this limb.
- var/damage_msg = "\red You feel an intense pain"
+ var/damage_msg = span_red("You feel an intense pain")
// Damage vars.
var/brute_mod = 1 // Multiplier for incoming brute damage.
diff --git a/code/modules/organs/external/damage.dm b/code/modules/organs/external/damage.dm
index 2d6955c8051..57eedce27ae 100644
--- a/code/modules/organs/external/damage.dm
+++ b/code/modules/organs/external/damage.dm
@@ -72,7 +72,7 @@
//If limb took enough damage and is broken, try to cut or tear it off
if(owner && loc == owner && !is_stump())
- if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER))
+ if(!cannot_amputate && CONFIG_GET(flag/limbs_can_break) && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER))
//organs can come off in four cases
//1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off.
//2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated.
diff --git a/code/modules/organs/internal/bones.dm b/code/modules/organs/internal/bones.dm
index af3c5e340c0..d3112d7b130 100644
--- a/code/modules/organs/internal/bones.dm
+++ b/code/modules/organs/internal/bones.dm
@@ -134,3 +134,12 @@
icon_state = "metal_left_leg"
nature = MODIFICATION_SILICON
matter = list(MATERIAL_STEEL = 2, MATERIAL_PLASTIC = 2)
+
+/mob/living/carbon/human/has_hand_for_held_index(i)
+ var/hand_bodyparts = get_hand_organs()
+ if(!length(hand_bodyparts))
+ return FALSE
+ var/obj/item/organ/external/hand_instance = hand_bodyparts[i + 1]
+ if(hand_instance && !(hand_instance.status & ORGAN_DEAD))
+ return hand_instance
+ return FALSE
diff --git a/code/modules/organs/internal/carrion.dm b/code/modules/organs/internal/carrion.dm
index 87f34b6b7b2..1db65a93b27 100644
--- a/code/modules/organs/internal/carrion.dm
+++ b/code/modules/organs/internal/carrion.dm
@@ -370,7 +370,7 @@
return
src = maw
- var/food = owner.get_active_hand()
+ var/food = owner.get_active_held_item()
if(!food)
to_chat(owner, span_warning("You can't eat nothing."))
@@ -446,7 +446,7 @@
var/organ_rotten = FALSE
if (O.status & ORGAN_DEAD)
organ_rotten = TRUE
- if(O.species != all_species[SPECIES_HUMAN])
+ if(O.species != GLOB.all_species[SPECIES_HUMAN])
chemgain = 5
taste_description = "this non-human organ is very bland." // no removal of hunger here, getting and storing a ton of monkey organs isn't too easy, and 5 chem points isn't terribly much.
else
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index ddd2da8bed3..5fbe9a54a7c 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -91,7 +91,7 @@
blood_DNA = list()
blood_DNA.Cut()
blood_DNA[C.dna_trace] = C.b_type
- species = all_species[C.species.name]
+ species = GLOB.all_species[C.species.name]
/obj/item/organ/proc/die()
if(BP_IS_ROBOTIC(src) || status & ORGAN_DEAD)
@@ -106,7 +106,7 @@
owner.death()
/obj/item/organ/get_item_cost()
- if((status & ORGAN_DEAD) || species != all_species[SPECIES_HUMAN]) //No dead or monkey organs!
+ if((status & ORGAN_DEAD) || species != GLOB.all_species[SPECIES_HUMAN]) //No dead or monkey organs!
return FALSE
return ..()
@@ -154,7 +154,7 @@
if(B && prob(40))
reagents.remove_reagent("blood",0.1)
blood_splatter(src,B,1)
- if(config.organs_decay)
+ if(CONFIG_GET(flag/organs_can_decay))
if(prob(5))
take_damage(12, TOX) // Will cause toxin accumulation wounds
else
diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm
index 20e86e4740a..1fb3b46a8cf 100644
--- a/code/modules/organs/pain.dm
+++ b/code/modules/organs/pain.dm
@@ -29,23 +29,23 @@
if(burning)
switch(amount)
if(1 to 10)
- msg = "\red Your [partname] burns."
+ msg = span_warning("Your [partname] burns.")
if(11 to 90)
flash_weak_pain()
- msg = "\red Your [partname] burns badly!"
+ msg = span_warning("Your [partname] burns badly!")
if(91 to 10000)
flash_pain()
- msg = "\red OH GOD! Your [partname] is on fire!"
+ msg = span_danger("OH GOD! Your [partname] is on fire!")
else
switch(amount)
if(1 to 10)
- msg = "Your [partname] hurts."
+ msg = span_warning("Your [partname] hurts.")
if(11 to 90)
flash_weak_pain()
- msg = "Your [partname] hurts badly."
+ msg = span_warning("Your [partname] hurts badly.")
if(91 to 10000)
flash_pain()
- msg = "OH GOD! Your [partname] is hurting terribly!"
+ msg = span_danger("OH GOD! Your [partname] is hurting terribly!")
if(msg && (msg != last_pain_message || prob(10)))
last_pain_message = msg
to_chat(src, msg)
@@ -67,9 +67,9 @@
if(flash_strength < 0)
return
- var/msg = "\red [message]"
+ var/msg = span_warning("[message]")
if(flash_strength >= 1)
- msg = "\red [message]"
+ msg = span_danger("[message]")
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
diff --git a/code/modules/overmap/events/movable.dm b/code/modules/overmap/events/movable.dm
index e2ca8f0843d..ed833b96eb3 100644
--- a/code/modules/overmap/events/movable.dm
+++ b/code/modules/overmap/events/movable.dm
@@ -106,7 +106,7 @@
start_y = rand(2, GLOB.maps_data.overmap_size - rand(5,10))
moving_vector = pick(NORTH, WEST, NORTHWEST)
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE)
@@ -165,7 +165,7 @@
icon_stages[1] = pick(list("meteors0", "meteors1", "meteors2", "meteors3"))
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
walk(src,turn(moving_vector, pick(45,-45,90,-90)),rand(100,160),0)
@@ -198,10 +198,10 @@
icon_stages[1] = pick(list("dust0", "dust1", "dust2", "dust3"))
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
spawn(450)
del_event()
qdel(src)
-////// SPACE_COMET%%%::::::........
\ No newline at end of file
+////// SPACE_COMET%%%::::::........
diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm
index bd68ab48553..e7fb5bf6823 100644
--- a/code/modules/overmap/exoplanets/exoplanet.dm
+++ b/code/modules/overmap/exoplanets/exoplanet.dm
@@ -58,7 +58,7 @@
habitability_class = HABITABILITY_BAD
/obj/effect/overmap/sector/exoplanet/New(nloc, max_x, max_y)
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
maxx = max_x ? max_x : world.maxx
diff --git a/code/modules/overmap/exoplanets/planet_types/grass.dm b/code/modules/overmap/exoplanets/planet_types/grass.dm
index 138f24a6bf9..a54a6034515 100644
--- a/code/modules/overmap/exoplanets/planet_types/grass.dm
+++ b/code/modules/overmap/exoplanets/planet_types/grass.dm
@@ -71,7 +71,7 @@
/turf/floor/exoplanet/grass/Initialize()
. = ..()
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"]
if(istype(E) && E.grass_color)
color = E.grass_color
diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm
index 37b48d18163..73840632d26 100644
--- a/code/modules/overmap/exoplanets/turfs.dm
+++ b/code/modules/overmap/exoplanets/turfs.dm
@@ -11,7 +11,7 @@
return FALSE
*/
/turf/floor/exoplanet/New()
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"]
if(istype(E))
if(E.atmosphere)
diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm
index 160e54e9fd1..6d4dc7a852d 100644
--- a/code/modules/overmap/sectors.dm
+++ b/code/modules/overmap/sectors.dm
@@ -30,7 +30,7 @@
/obj/effect/overmap/Initialize()
. = ..()
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
map_z = GetConnectedZlevels(z)
@@ -42,7 +42,7 @@
start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE)
start_y = start_y || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE)
- if ((!eris_start_set) && (name == config.start_location))
+ if ((!eris_start_set) && (name == CONFIG_GET(string/start_location)))
var/obj/effect/overmap/ship/eris/E = (locate(/obj/effect/overmap/ship/eris) in GLOB.ships)
start_x = E.start_x
start_y = E.start_y
@@ -113,4 +113,4 @@
H.get_known_sectors()
/obj/effect/overmap/proc/add_landmark(obj/effect/shuttle_landmark/landmark)
- generic_waypoints += landmark
\ No newline at end of file
+ generic_waypoints += landmark
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index f539850dc02..ef0284449cd 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -85,7 +85,7 @@
user.reset_view(linked)
user.client.view = "[2*NAVIGATION_VIEW_RANGE+1]x[2*NAVIGATION_VIEW_RANGE+1]"
- else if(!config.use_overmap && user?.client?.holder)
+ else if(!CONFIG_GET(flag/use_overmap) && user?.client?.holder)
// Let the new developers know why the helm console is unresponsive
// (it's disabled by default on local server to make it start a bit faster)
to_chat(user, "NOTE: overmap generation is disabled in server configuration.")
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 77a02790b3e..817740ff6c0 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -82,7 +82,7 @@
else if(href_list["addpen"])
if(!haspen)
- var/obj/item/pen/W = usr.get_active_hand()
+ var/obj/item/pen/W = usr.get_active_held_item()
if(istype(W, /obj/item/pen))
usr.drop_item()
W.loc = src
@@ -94,7 +94,7 @@
if(P && (P.loc == src) && istype(P, /obj/item/paper) && (P == toppaper) )
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if(istype(I, /obj/item/pen))
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index b7be8b7c06c..8c5d27f75ba 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -146,9 +146,9 @@
while(locid < MAX_FIELDS)
var/istart = 0
if(links)
- istart = findtext(info_links, "", laststart)
+ istart = findtext(info_links, "", laststart)
else
- istart = findtext(info, "", laststart)
+ istart = findtext(info, "", laststart)
if(istart == 0)
return // No field found with matching id
@@ -229,7 +229,7 @@
//Count the fields
var/laststart = 1
while(fields < MAX_FIELDS)
- var/i = findtext(t, "", laststart) //
+ var/i = findtext(t, "", laststart) //
if(i == 0)
break
laststart = i + 1
@@ -248,18 +248,18 @@
"You hold \the [P] up to \the [src], burning it slowly.")
spawn(20)
- if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
+ if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit)
user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \
"You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.")
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
user.drop_from_inventory(src)
new /obj/effect/decal/cleanable/ash(src.loc)
qdel(src)
else
- to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
+ to_chat(user, span_red("You must hold \the [P] steady to burn \the [src]."))
/obj/item/paper/Topic(href, href_list)
@@ -268,7 +268,7 @@
return
if(href_list["write"])
- if(!config.paper_input)
+ if(!CONFIG_GET(flag/paper_input))
to_chat(usr, span_warning("No matter how hard you try to write on \the [src], nothing shows up! (Paper input disabled in config.)"))
return
@@ -284,7 +284,7 @@
if(!t)
return
- var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
+ var/obj/item/i = usr.get_active_held_item() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
var/iscrayon = 0
if(!istype(i, /obj/item/pen))
return
@@ -393,7 +393,7 @@
return
else if(istype(P, /obj/item/stamp))
- if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_hand() != P))
+ if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_held_item() != P))
return
playsound(src,'sound/effects/Stamp.ogg',40,1)
stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]."
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 6963c22da86..b75ab4f6b3f 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -79,18 +79,18 @@
"You hold \the [P] up to \the [src], burning it slowly.")
spawn(20)
- if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit)
+ if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit)
user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \
"You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.")
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
user.drop_from_inventory(src)
new /obj/effect/decal/cleanable/ash(src.loc)
qdel(src)
else
- to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
+ to_chat(user, span_red("You must hold \the [P] steady to burn \the [src]."))
/obj/item/paper_bundle/examine(mob/user, extra_description = "")
if(get_dist(user, src) < 2)
@@ -145,7 +145,7 @@
..()
if((src in usr.contents) || (istype(src.loc, /obj/item/folder) && (src.loc in usr.contents)))
usr.set_machine(src)
- var/obj/item/in_hand = usr.get_active_hand()
+ var/obj/item/in_hand = usr.get_active_held_item()
if(href_list["next_page"])
if(in_hand && (istype(in_hand, /obj/item/paper) || istype(in_hand, /obj/item/photo)))
insert_sheet_at(usr, page+1, in_hand)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 528842a7cce..92a2e9b6d27 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -15,7 +15,7 @@
/obj/item/paper_bin/MouseDrop(mob/user as mob)
if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
if(!isslime(usr) && !isanimal(usr))
- if( !usr.get_active_hand() ) //if active hand is empty
+ if( !usr.get_active_held_item() ) //if active hand is empty
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/temp = H.organs_by_name[BP_R_ARM]
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 4fe48cf6153..fd6e0dcf119 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -64,10 +64,10 @@
if(!ismob(M))
return
to_chat(user, span_warning("You stab [M] with the pen."))
-// M << "\red You feel a tiny prick!" //That's a whole lot of meta!
+// M << span_red("You feel a tiny prick!") //That's a whole lot of meta!
M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])")
user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) [ADMIN_JMP(user)]")
return
/*
diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm
index 24f44288dd8..4e51a868fa7 100644
--- a/code/modules/power/antimatter/computer.dm
+++ b/code/modules/power/antimatter/computer.dm
@@ -45,7 +45,7 @@
src.state = STATE_DEFAULT
if("login")
var/mob/M = usr
- var/obj/item/card/id/I = M.get_active_hand()
+ var/obj/item/card/id/I = M.get_active_held_item()
if (I && istype(I))
if(src.check_access(I))
authenticated = 1
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 393cb0bb3ae..c5820be292c 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -130,7 +130,7 @@
if(QUALITY_BOLT_TURNING in I.tool_qualities)
if(anchored || linked_shielding.len)
- to_chat(user, "\red Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!")
+ to_chat(user, span_red("Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!"))
if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC))
if(!anchored)
user.visible_message("[user.name] secures the [src.name] to the floor.", \
@@ -148,7 +148,7 @@
if(istype(I, /obj/item/am_containment))
if(fueljar)
- to_chat(user, "\red There is already a [fueljar] inside!")
+ to_chat(user, span_red("There is already a [fueljar] inside!"))
return
fueljar = I
user.remove_from_mob(I)
diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm
index 00cfa5b2222..5330fb81feb 100644
--- a/code/modules/power/antimatter/engine.dm
+++ b/code/modules/power/antimatter/engine.dm
@@ -108,8 +108,8 @@
H_fuel = 0
antiH_fuel = residual_matter
- for(var/mob/M in hearers(src, null))
- M.show_message(text("\red You hear a loud bang!"))
+ for(var/mob/M in hearers(get_turf(src)))
+ M.show_message(text(span_red("You hear a loud bang!")))
//Q = k x (delta T)
@@ -160,8 +160,8 @@
if(energy > convert2energy(8e-12)) //TOO MUCH ENERGY
- for(var/mob/M in hearers(src, null))
- M.show_message(text("\red You hear a loud whirring!"))
+ for(var/mob/M in hearers(get_turf(src)))
+ M.show_message(text(span_red("You hear a loud whirring!")))
sleep(20)
//Q = k x (delta T)
@@ -179,8 +179,8 @@
antiH_fuel += antiH
if(energy > convert2energy(8e-12)) //FAR TOO MUCH ENERGY STILL
- for(var/mob/M in hearers(src, null))
- M.show_message(text("\red BANG!"))
+ for(var/mob/M in hearers(get_turf(src)))
+ M.show_message(text(span_red("BANG!")))
new /obj/effect/bhole(src.loc)
else //this amount of energy is okay so it does the proper output thing
@@ -204,4 +204,4 @@
stopping = 0
- return
\ No newline at end of file
+ return
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index f1273cdaef7..3b690c775e9 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -66,7 +66,7 @@
/obj/machinery/am_shielding/Destroy()
if(control_unit) control_unit.remove_shielding(src)
if(processing) shutdown_core()
- visible_message("\red The [src.name] melts!")
+ visible_message(span_red("The [src.name] melts!"))
//Might want to have it leave a mess on the floor but no sprites for now
return ..()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 6519e3d6411..928156d19b5 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -751,7 +751,7 @@
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
- user.visible_message("\red [user.name] slashes at the [name]!", "\blue You slash at the [name]!")
+ user.visible_message(span_danger("[user.name] slashes at the [name]!"), span_danger("You slash at the [name]!"))
playsound(loc, 'sound/weapons/slash.ogg', 100, 1)
var/allcut = wires.IsAllCut()
@@ -759,12 +759,12 @@
if(beenhit >= pick(3, 4) && wiresexposed != 1)
wiresexposed = 1
update_icon()
- visible_message("\red The [name]'s cover flies open, exposing the wires!")
+ visible_message(span_red("The [name]'s cover flies open, exposing the wires!"))
else if(wiresexposed == 1 && allcut == 0)
wires.CutAll()
update_icon()
- visible_message("\red The [name]'s wires are shredded!")
+ visible_message(span_red("The [name]'s wires are shredded!"))
else
beenhit += 1
return
diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index 511210cd276..f93665a5ba1 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -23,7 +23,7 @@
if(get_dist(user, src) < 2)
extra_description += span_notice("\nClick any cell below to remove them from \the [src]:")
for(var/obj/item/cell/battery in component_parts)
- extra_description += span_notice("\n\icon[battery] [battery.name]")
+ extra_description += span_notice("\n[icon2html(battery, user)] [battery.name]")
else
extra_description += span_notice("\nThe hatch needs to be opened with a screwdriver to interact with the cells inside!")
extra_description += span_notice("\nIt currently has [capacitors_amount] capacitors installed.")
diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm
index 10d2fa439dc..d6a5df3b214 100644
--- a/code/modules/power/breaker_box.dm
+++ b/code/modules/power/breaker_box.dm
@@ -51,10 +51,10 @@
return
busy = 1
- to_chat(user, "\green Updating power settings..")
+ to_chat(user, span_green("Updating power settings.."))
if(do_after(user, 50, src))
set_state(!on)
- to_chat(user, "\green Update Completed. New setting:[on ? "on": "off"]")
+ to_chat(user, span_green("Update Completed. New setting:[on ? "on": "off"]"))
update_locked = 1
spawn(600)
update_locked = 0
@@ -72,7 +72,7 @@
busy = 1
for(var/mob/O in viewers(user))
- O.show_message(text("\red [user] started reprogramming [src]!"), 1)
+ O.show_message(span_red("[user] started reprogramming [src]!"), 1)
if(do_after(user, 50,src))
set_state(!on)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 47da4472194..c0f4b60ea28 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list(
else
new/obj/item/stack/cable_coil(T, 1, color)
- for(var/mob/O in viewers(src, null))
+ for(var/mob/O in viewers(get_turf(src)))
O.show_message(span_warning("[user] cuts the cable."), 1)
if(d1 == DOWN || d2 == DOWN)
@@ -642,14 +642,14 @@ var/list/possible_cable_coil_colours = list(
if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
if(!istype(usr.loc,/turf)) return
if(src.amount <= 14)
- to_chat(usr, "\red You need at least 15 lengths to make restraints!")
+ to_chat(usr, span_red("You need at least 15 lengths to make restraints!"))
return
var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc)
B.color = color
to_chat(usr, span_notice("You wind some cable together to make some restraints."))
src.use(15)
else
- to_chat(usr, "\blue You cannot do that.")
+ to_chat(usr, span_blue("You cannot do that."))
/obj/item/stack/cable_coil/cyborg/verb/set_colour()
set name = "Change Colour"
diff --git a/code/modules/power/diesel_gen.dm b/code/modules/power/diesel_gen.dm
index e81cafc1bb5..802f76f8137 100644
--- a/code/modules/power/diesel_gen.dm
+++ b/code/modules/power/diesel_gen.dm
@@ -170,9 +170,9 @@
var/obj/item/stack/addstack = I
var/amount = min((max_sheets - sheets), addstack.amount)
if(amount < 1)
- user << "\blue The [src.name] is full!"
+ user << span_blue("The [src.name] is full!")
return
- user << "\blue You add [amount] sheet\s to the [src.name]."
+ user << span_blue("You add [amount] sheet\s to the [src.name].")
sheets += amount
addstack.use(amount)
updateUsrDialog()
diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm
index a40559a5aa6..36216ff7806 100644
--- a/code/modules/power/fractal_reactor.dm
+++ b/code/modules/power/fractal_reactor.dm
@@ -18,7 +18,7 @@
/obj/machinery/power/fractal_reactor/New()
..()
if(!mapped_in)
- to_chat(world, "\red WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]")
+ to_chat(world, span_redtext(span_bold("WARNING: [span_alert("Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]")]")))
/obj/machinery/power/fractal_reactor/Process()
if(!powernet && !powernet_connection_failed)
@@ -26,4 +26,4 @@
powernet_connection_failed = 1
spawn(150) // Error! Check again in 15 seconds.
powernet_connection_failed = 0
- add_avail(power_generation_rate)
\ No newline at end of file
+ add_avail(power_generation_rate)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index d96422a39d7..6b9b82cd4f8 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -282,8 +282,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
update_gravity(gravity_is_on)
priority_announcement.Announce("The gravity generator was brought fully operational.")
investigate_log("was brought full online and is now producing gravity.", "gravity")
- var/area/area = get_area(src)
- message_admins("The gravity generator was brought fully online. ([area.name])")
+ message_admins("The gravity generator was brought fully online. [ADMIN_JMP(src)]")
/obj/machinery/gravity_generator/main/proc/grav_off()
if(!GLOB.maps_data.station_levels.len)
@@ -294,8 +293,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
update_gravity(gravity_is_on)
priority_announcement.Announce("The gravity generator was brought offline.")
investigate_log("was brought offline and there is now no gravity.", "gravity")
- var/area/area = get_area(src)
- message_admins("The gravity generator was brought offline with no backup generator. ([area.name])")
+ message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_JMP(src)]")
shake_everyone()
/obj/machinery/gravity_generator/main/proc/update_gravity(var/is_on)
@@ -340,7 +338,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/main/proc/shake_everyone()
for(var/mob/M in SSmobs.mob_list | SShumans.mob_list)
var/turf/our_turf = get_turf(src.loc)
- if(M.client)
+ if(M.client && !isnewplayer(M))
shake_camera(M, 15, 1)
M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 3a00b8f2e79..ae89507f56e 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -435,7 +435,7 @@
if(prob(1+I.force * 5))
to_chat(user, "You hit the light, and it smashes!")
- for(var/mob/M in viewers(src))
+ for(var/mob/M in viewers(get_turf(src)))
if(M == user)
continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
@@ -526,8 +526,8 @@
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.species.can_shred(H))
- for(var/mob/M in viewers(src))
- M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
+ for(var/mob/M in viewers(get_turf(src)))
+ M.show_message(span_danger("[user.name] smashed the light!"), 3, span_warning("You hear a tinkle of breaking glass"), 2)
broken()
return
@@ -766,7 +766,7 @@
/obj/item/light/proc/shatter()
if(status == LIGHT_OK || status == LIGHT_BURNED)
- src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
+ src.visible_message(span_red("[name] shatters."), span_red("You hear a small glass object shatter."))
status = LIGHT_BROKEN
force = WEAPON_FORCE_WEAK
sharp = TRUE
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 3c019bc6960..1cfef0c2ec8 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -281,9 +281,9 @@
var/obj/item/stack/addstack = I
var/amount = min((max_fuel_volume - sheets), addstack.amount)
if(amount < 1)
- to_chat(user, "\blue The [src.name] is full!")
+ to_chat(user, span_blue("The [src.name] is full!"))
return
- to_chat(user, "\blue You add [amount] sheet\s to the [src.name].")
+ to_chat(user, span_blue("You add [amount] sheet\s to the [src.name]."))
sheets += amount
addstack.use(amount)
updateUsrDialog()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index ebb14a76a77..c11266e1092 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -52,7 +52,7 @@
wifi_receiver = new(_wifi_id, src)
/obj/machinery/power/emitter/Destroy()
- message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1)
+ message_admins("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("Emitter deleted at ([x],[y],[z])")
investigate_log("deleted at ([x],[y],[z])","singulo")
qdel(wifi_receiver)
@@ -78,7 +78,7 @@
if(src.active==1)
src.active = 0
to_chat(user, "You turn off [src].")
- message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned off by [user.key]","singulo")
else
@@ -86,7 +86,7 @@
to_chat(user, "You turn on [src].")
src.shot_number = 0
src.fire_delay = 100
- message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned on by [user.key]","singulo")
playsound(loc, 'sound/machines/machine_switch.ogg', 100, 1)
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index caa428ad34d..165e0faa7bc 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -205,8 +205,8 @@ field_generator power level display
if(draw_power(round(power_draw)) >= power_draw)
return 1
else
- for(var/mob/M in viewers(src))
- M.show_message("\red \The [src] shuts down!")
+ for(var/mob/M in viewers(get_turf(src)))
+ M.show_message(span_red("\The [src] shuts down!"))
turn_off()
investigate_log("ran out of power and deactivated","singulo")
src.power = 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 4eac81f4e87..df7aa46fd7e 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -62,7 +62,7 @@
var/radiation = (energy*2)
M.apply_effect((radiation*3),IRRADIATE,0)
M.updatehealth()
- //M << "\red You feel odd."
+ //M << span_red("You feel odd.")
return
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 00a2f429f87..cc571d3f0a2 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -121,7 +121,7 @@
if(strength > strength_upper_limit)
strength = strength_upper_limit
else
- message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])")
investigate_log("increased to [strength] by [usr.key]","singulo")
strength_change()
@@ -132,7 +132,7 @@
if(strength < 0)
strength = 0
else
- message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])")
investigate_log("decreased to [strength] by [usr.key]","singulo")
strength_change()
@@ -213,7 +213,7 @@
/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
src.active = !src.active
investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo")
- message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1)
+ message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1)
log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr.ckey]([usr]) in ([x],[y],[z])")
if(src.active)
set_power_use(ACTIVE_POWER_USE)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 40e1685eff5..8e011c40098 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -83,7 +83,7 @@
var/count = locate(/obj/machinery/containment_field) in orange(30, src)
if (!count)
- message_admins("A singulo has been created without containment fields active ([x], [y], [z] - JMP).")
+ message_admins("A singulo has been created without containment fields active ([x], [y], [z] - [ADMIN_JMP(src)]).")
investigate_log("was created. [count ? "" : "No containment fields were active."]", I_SINGULO)
@@ -416,10 +416,10 @@
if (ishuman(M))
var/mob/living/carbon/human/H = M
if(istype(H.glasses,/obj/item/clothing/glasses/powered/meson) && current_size != 11)
- to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!")
+ to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!")
return
else
- to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!")
+ to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!")
to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == 11 ? "helpless" : "weak"]."))
M.apply_effect(3, STUN)
for(var/mob/O in viewers(M, null))
@@ -435,11 +435,11 @@
for(var/mob/living/M in view(10, src.loc))
if(prob(67))
M.apply_effect(rand(energy), IRRADIATE)
- to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
- to_chat(M, "Miraculously, it fails to kill you.")
+ to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
+ to_chat(M, "Miraculously, it fails to kill you.")
else
- to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
- to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.")
+ to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
+ to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.")
M.dust()
return
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 57dfacf9b32..ed51f125960 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -416,8 +416,8 @@
/obj/machinery/power/smes/proc/ion_act()
if(isStationLevel(src.z))
if(prob(1)) //explosion
- for(var/mob/M in viewers(src))
- M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
+ for(var/mob/M in viewers(get_turf(src)))
+ M.show_message(span_warning("The [src.name] is making strange noises!"), 3, span_warning("You hear sizzling electronics."), 2)
sleep(10*pick(4,5,6,7,10,14))
var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread()
smoke.set_up(3, 0, loc)
diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm
index 14f0ff2a544..72c1c027db9 100644
--- a/code/modules/power/smes_construction.dm
+++ b/code/modules/power/smes_construction.dm
@@ -164,7 +164,7 @@
if(G.siemens_coefficient == 0)
user_protected = 1
log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100")
- message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP")
+ message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - [ADMIN_JMP(src)]")
switch (intensity)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index f06bb149ef0..82e36b0e4dd 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -306,9 +306,9 @@
nano_ui_interact(user)
/obj/machinery/power/supermatter/attack_hand(mob/user as mob)
- user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
- "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
- "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
+ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
+ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
+ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
Consume(user)
@@ -365,9 +365,9 @@
//If you fail the above, your tape will be eaten by the code below
user.visible_message(
- "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\
- "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
- "Everything suddenly goes silent."
+ "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\
+ "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
+ "Everything suddenly goes silent."
)
user.drop_from_inventory(W)
@@ -380,12 +380,12 @@
if(istype(AM, /obj/effect))
return
if(isliving(AM))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
- "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
- "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
else if(!grav_pulling) //To prevent spam, detonating supermatter does not indicate non-mobs being destroyed
- AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
+ AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
Consume(AM)
@@ -402,10 +402,10 @@
//Some poor sod got eaten, go ahead and irradiate people nearby.
for(var/mob/living/l in range(10))
if(l in view())
- l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
- "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
+ l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
+ "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
else
- l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
+ l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
var/rads = 500 * sqrt( 1 / (get_dist(l, src) + 1) )
l.apply_effect(rads, IRRADIATE)
@@ -428,7 +428,7 @@
/obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom.
name = "Supermatter Shard"
- desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it."
+ desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure."
icon_state = "darkmatter_shard"
base_icon_state = "darkmatter_shard"
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 40b366ad834..58974daf0a3 100755
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -67,7 +67,7 @@
/obj/item/ammo_casing/attack_hand(mob/user)
- if((src.amount > 1) && (src == user.get_inactive_hand()))
+ if((src.amount > 1) && (src == user.get_inactive_held_item()))
src.amount -= 1
var/obj/item/ammo_casing/new_casing = new src.type(src)
new_casing.forceMove(get_turf(user))
@@ -271,7 +271,7 @@
visible_message("[user] tactically reloads [W] using only one hand!")
/obj/item/ammo_magazine/attack_hand(mob/user)
- if(user.get_inactive_hand() == src && stored_ammo.len)
+ if(user.get_inactive_held_item() == src && stored_ammo.len)
var/obj/item/ammo_casing/stack = removeCasing()
if(stack)
if(stored_ammo.len)
@@ -289,7 +289,7 @@
..()
/obj/item/ammo_magazine/AltClick(var/mob/living/user)
- var/obj/item/W = user.get_active_hand()
+ var/obj/item/W = user.get_active_held_item()
if(istype(W, /obj/item/ammo_casing))
var/obj/item/ammo_casing/C = W
if(stored_ammo.len >= max_ammo)
@@ -304,7 +304,7 @@
if(!C.mergeCasing(T, null, user))
insertCasing(T)
else if(!W)
- if(user.get_inactive_hand() == src && stored_ammo.len)
+ if(user.get_inactive_held_item() == src && stored_ammo.len)
var/obj/item/ammo_casing/AC = removeCasing()
if(AC)
user.put_in_active_hand(AC)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 4a1deef66ae..cff5d312510 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -817,7 +817,7 @@
to_chat(user, span_notice("\The [src] is now set to [new_mode.name]."))
/obj/item/gun/proc/toggle_safety(mob/living/user)
- if(restrict_safety || src != user.get_active_hand())
+ if(restrict_safety || src != user.get_active_held_item())
return
safety = !safety
diff --git a/code/modules/projectiles/guns/breacher.dm b/code/modules/projectiles/guns/breacher.dm
index 31f86cd33b4..5e4bfb518c4 100644
--- a/code/modules/projectiles/guns/breacher.dm
+++ b/code/modules/projectiles/guns/breacher.dm
@@ -100,7 +100,7 @@
return
/*if(ishuman(user))
if(user.dna && user.dna.mutantrace == "adamantine")
- to_chat(user, "\red Your metal fingers don't fit in the trigger guard!")
+ to_chat(user, span_red("Your metal fingers don't fit in the trigger guard!"))
return*/
add_fingerprint(user)
diff --git a/code/modules/projectiles/guns/energy/charge.dm b/code/modules/projectiles/guns/energy/charge.dm
index cfd2408180c..15dc42b58d9 100644
--- a/code/modules/projectiles/guns/energy/charge.dm
+++ b/code/modules/projectiles/guns/energy/charge.dm
@@ -38,7 +38,7 @@
skip_hand_check = TRUE
//We enable it if the gun is held in the user's active hand and the safety is off
- if (skip_hand_check || L.get_active_hand() == gun)
+ if (skip_hand_check || L.get_active_held_item() == gun)
//Lets also make sure it can fire
var/can_fire = TRUE
diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm
index eb1e065d227..5ff99580003 100644
--- a/code/modules/projectiles/guns/launcher/pneumatic.dm
+++ b/code/modules/projectiles/guns/launcher/pneumatic.dm
@@ -61,7 +61,7 @@
to_chat(user, "There is nothing to remove in \the [src].")
/obj/item/gun/launcher/pneumatic/attack_hand(mob/user as mob)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
unload_hopper(user)
else
return ..()
diff --git a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm
index fd15edfffc6..8a17d0585b0 100644
--- a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm
+++ b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm
@@ -114,7 +114,7 @@
..()
/obj/item/gun/projectile/shotgun/pump/grenade/makeshift/attack_hand(mob/user)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
unload_underslung(user)
else
..()
diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm
index 2da25794b2d..aab1ccf3af4 100644
--- a/code/modules/projectiles/guns/launcher/syringe_gun.dm
+++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm
@@ -111,7 +111,7 @@
add_fingerprint(user)
/obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
if(!darts.len)
to_chat(user, span_warning("[src] is empty."))
return
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 019d7dde83b..7d714f28ed4 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -301,7 +301,7 @@
unload_ammo(user)
/obj/item/gun/projectile/attack_hand(mob/user as mob)
- if(user.get_inactive_hand() == src)
+ if(user.get_inactive_held_item() == src)
unload_ammo(user, allow_dump=0)
else
return ..()
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 73f4c0bf87e..45013f20227 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -53,7 +53,7 @@
//We enable it if the gun is held in the user's active hand and the safety is off or if they are doing this from inside a mech
- if (L.get_active_hand() == gun || ismech(L.loc))
+ if (L.get_active_held_item() == gun || ismech(L.loc))
//Lets also make sure it can fire
var/can_fire = TRUE
diff --git a/code/modules/projectiles/guns/projectile/automatic/lmg.dm b/code/modules/projectiles/guns/projectile/automatic/lmg.dm
index 4165c8c756b..b738cf72acd 100644
--- a/code/modules/projectiles/guns/projectile/automatic/lmg.dm
+++ b/code/modules/projectiles/guns/projectile/automatic/lmg.dm
@@ -58,7 +58,7 @@
return ..() //once closed, behave like normal
/obj/item/gun/projectile/automatic/lmg/attack_hand(mob/user as mob)
- if(!cover_open && user.get_inactive_hand() == src)
+ if(!cover_open && user.get_inactive_held_item() == src)
toggle_cover(user) //open the cover
playsound(src.loc, 'sound/weapons/guns/interact/lmg_open.ogg', 100, 1)
else
diff --git a/code/modules/projectiles/guns/projectile/automatic/z8.dm b/code/modules/projectiles/guns/projectile/automatic/z8.dm
index 1e70f49ca8a..4b433dd2b9d 100644
--- a/code/modules/projectiles/guns/projectile/automatic/z8.dm
+++ b/code/modules/projectiles/guns/projectile/automatic/z8.dm
@@ -50,7 +50,7 @@
/obj/item/gun/projectile/automatic/z8/attack_hand(mob/user)
var/datum/firemode/cur_mode = firemodes[sel_mode]
- if(user.get_inactive_hand() == src && cur_mode.settings["use_launcher"])
+ if(user.get_inactive_held_item() == src && cur_mode.settings["use_launcher"])
launcher.unload_underslung(user)
else
..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 558d1685893..f76231bda07 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -247,7 +247,7 @@
loc = get_turf(H.client.eye)
if(!(loc.Adjacent(target)))
loc = get_turf(H)
- if(config.z_level_shooting && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel
+ if(CONFIG_GET(flag/z_level_shooting) && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel
var/newTurf = get_turf(H.shadow)
if(!(locate(/obj/structure/catwalk) in newTurf)) // Can't shoot through catwalks
loc = newTurf
@@ -309,7 +309,7 @@
var/result = PROJECTILE_CONTINUE
- if(config.z_level_shooting && height == HEIGHT_HIGH)
+ if(CONFIG_GET(flag/z_level_shooting) && height == HEIGHT_HIGH)
if(target_mob.resting == TRUE || target_mob.stat == TRUE)
return FALSE // Bullet flies overhead
@@ -372,7 +372,7 @@
admin_attack_log(firer, target_mob, attacker_message, victim_message, admin_message)
else
target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with \a [src]"
- msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] (JMP)")
+ msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] [ADMIN_JMP(target_mob)]")
if(target_mob.mob_classification & CLASSIFICATION_ORGANIC)
var/turf/target_loca = get_turf(target_mob)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index eabbeab9953..01b0f5a547c 100755
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -164,13 +164,13 @@
if(prob(15))
H.apply_effect((rand(30,80)),IRRADIATE)
H.Weaken(5)
- for (var/mob/V in viewers(src))
- V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2)
+ for (var/mob/V in viewers(get_turf(src)))
+ V.show_message(span_danger("[M] writhes in pain as \his vacuoles boil."), 3, span_warning("You hear the crunching of leaves."), 2)
else
M.adjustFireLoss(rand(5,15))
- M.show_message("\red The radiation beam singes you!")
+ M.show_message(span_red("The radiation beam singes you!"))
else if(istype(target, /mob/living/carbon/))
- M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
+ M.show_message(span_blue("The radiation beam dissipates harmlessly through your body."))
else
return 1
@@ -188,7 +188,7 @@
if((H.species.flags & IS_PLANT) && (H.nutrition < 500))
H.adjustNutrition(30)
else if (istype(target, /mob/living/carbon/))
- M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
+ M.show_message(span_blue("The radiation beam dissipates harmlessly through your body."))
else
return 1
diff --git a/code/modules/reagents/bonsai.dm b/code/modules/reagents/bonsai.dm
index 2bf40c1839e..a161968dd54 100644
--- a/code/modules/reagents/bonsai.dm
+++ b/code/modules/reagents/bonsai.dm
@@ -48,7 +48,7 @@
if(reagent_count > 10)
var/amount_to_spawn = round(reagent_count/10)
for(var/i = 0 to amount_to_spawn)
- var/datum/seed/S = plant_controller.seeds[pick(
+ var/datum/seed/S = SSplants.seeds[pick(
"tomato",
"carrot",
"corn",
diff --git a/code/modules/reagents/holder.dm b/code/modules/reagents/holder.dm
index e1ca2881521..5238822e58d 100644
--- a/code/modules/reagents/holder.dm
+++ b/code/modules/reagents/holder.dm
@@ -131,6 +131,7 @@
var/list/eligible_reactions = list()
var/temperature = chem_temp
+ var/htmlicon = icon2html(my_atom, viewers(get_turf(src)))
for(var/thing in reagent_list)
var/datum/reagent/R = thing
if(R.custom_temperature_effects(temperature))
@@ -162,7 +163,7 @@
if(my_atom)
if(replace_message)
- my_atom.visible_message(span_notice("\icon[my_atom] [replace_message]"))
+ my_atom.visible_message(span_notice("[htmlicon] [replace_message]"))
if(replace_sound)
playsound(my_atom, replace_sound, 80, 1)
@@ -393,7 +394,7 @@
/datum/reagents/proc/trans_to(datum/target, amount = 1, multiplier = 1, copy = 0, ignore_isinjectable = FALSE)
if(istype(target, /datum/reagents))
return trans_to_holder(target, amount, multiplier, copy)
- else if(istype(target, /atom))
+ else if(isatom(target))
var/atom/A = target
touch(A)
if(ismob(target))
diff --git a/code/modules/reagents/machinery/centrifuge.dm b/code/modules/reagents/machinery/centrifuge.dm
index 7e92150ea02..53ab1768596 100644
--- a/code/modules/reagents/machinery/centrifuge.dm
+++ b/code/modules/reagents/machinery/centrifuge.dm
@@ -166,7 +166,7 @@
/obj/machinery/centrifuge/proc/finish()
stop()
playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3)
- visible_message("\icon[src]\The [src] pings indicating that cycle is complete.")
+ visible_message("[icon2html(src, hearers(get_turf(src)))]\The [src] pings indicating that cycle is complete.")
/obj/machinery/centrifuge/Topic(href, href_list)
if(..())
diff --git a/code/modules/reagents/machinery/electrolyzer.dm b/code/modules/reagents/machinery/electrolyzer.dm
index 53dbb732c82..15425a0b309 100644
--- a/code/modules/reagents/machinery/electrolyzer.dm
+++ b/code/modules/reagents/machinery/electrolyzer.dm
@@ -81,15 +81,16 @@
return
if(on && beaker && beaker.reagents.total_volume)
var/state = electrolysis(beaker, separation_beaker, convertion_coefficient)
+ update_icon()
+ var/htmlicon = icon2html(src, hearers(get_turf(src)))
if(!state)
on = FALSE
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3)
- visible_message("\icon[src]\The [src] buzzes indicating that error has occured.")
+ visible_message("[htmlicon] \The [src] buzzes indicating that error has occured.")
else if(state == -1)
on = FALSE
playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3)
- visible_message("\icon[src]\The [src] pings indicating that process is complete.")
- update_icon()
+ visible_message("[htmlicon] \The [src] pings indicating that process is complete.")
SSnano.update_uis(src)
diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm
index 02eed7c36bd..9faa9376159 100644
--- a/code/modules/reagents/machinery/grinder.dm
+++ b/code/modules/reagents/machinery/grinder.dm
@@ -401,7 +401,7 @@
var/obj/item/reagent_containers/container = I
if(!container.standard_pour_into(user, src)) . = ..()
else if (LAZYLEN(I.reagents)) . = ..()
- else to_chat(user, span_notice("\icon[I] \the [I] seems that it is not suitable for a \icon[src] [src]."))
+ else to_chat(user, span_notice("[icon2html(I, user)] \the [I] seems that it is not suitable for a [icon2html(src, user)] [src]."))
update_icon()
/obj/item/storage/makeshift_grinder/afterattack(atom/target, mob/user, flag)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index b9a47d442cc..3a1b0414730 100755
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -96,7 +96,7 @@
var/contained = reagents.log_list()
target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained]")
user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained]")
- msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]")
user.visible_message(
span_danger("[target] has been splashed with something by [user]!"),
@@ -162,7 +162,7 @@
var/contained = reagents.log_list()
target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]")
user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]")
- msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]")
reagents.trans_to_mob(target, issmall(user) ? CEILING(amount_per_transfer_from_this * 0.5, 1) : amount_per_transfer_from_this, CHEM_INGEST)
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 7374f65acad..35133e22431 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -66,7 +66,7 @@
var/contained = reagents.log_list()
M.attack_log += "\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]"
user.attack_log += "\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]"
- msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]")
trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD)
user.visible_message(
@@ -98,7 +98,7 @@
/obj/item/reagent_containers/dropper/update_icon()
cut_overlays()
- if(reagents.total_volume)
+ if(reagents?.total_volume)
var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "dropper")
filling.color = reagents.get_color()
add_overlay(filling)
diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm
index 8879522cd8b..0acf709f428 100644
--- a/code/modules/reagents/reagent_containers/food/sandwich.dm
+++ b/code/modules/reagents/reagent_containers/food/sandwich.dm
@@ -23,7 +23,7 @@
sandwich_limit += 4
if(src.contents.len > sandwich_limit)
- to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.")
+ to_chat(user, span_red("If you put anything else on \the [src] it's going to collapse."))
return
else if(istype(W,/obj/item/material/shard))
to_chat(user, span_notice("You hide [W] in \the [src]."))
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index d8c7c539dea..0d6c1d31ac6 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -3348,7 +3348,7 @@
return
if(boxes.len > 0 )
- if(user.get_inactive_hand() != src )
+ if(user.get_inactive_held_item() != src )
..()
return
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 5a7546dcdac..6ef2d41b5ce 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -37,7 +37,7 @@
// I think rig is advanced enough for this, and people will learn what causes this error
if(RIG)
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3)
- RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".")
+ RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".")
return
// check without message
else if(!H.can_inject(user, FALSE))
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 966bbedacc0..b6443ec363d 100755
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -44,7 +44,7 @@
to_chat(user, span_notice("You dissolve \the [src] in [target]."))
user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagents.log_list()]")
- msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) (JMP)")
+ msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]")
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 7430d05d1ee..6daf6acb79e 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -160,7 +160,7 @@
// I think rig is advanced enough for this, and people will learn what causes this error
if(RIG)
playsound(src.loc, 'sound/machines/buzz-two.ogg', 30, 1, -3)
- RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".")
+ RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".")
return
// check without message
else if(!H.can_inject(user, FALSE))
@@ -264,13 +264,13 @@
if (target != user && H.getarmor(target_zone, ARMOR_MELEE) > 5 && prob(50))
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
+ O.show_message(span_red("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1)
user.remove_from_mob(src)
qdel(src)
user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)."
target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)."
- msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)")
+ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) [ADMIN_JMP(user)]")
return
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index c1ef302c050..75bceb40525 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -159,7 +159,7 @@
"You screw [src]'s faucet [modded ? "closed" : "open"]")
modded = !modded
if (modded)
- message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)")
+ message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. [ADMIN_JMP(loc)]")
log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.")
leak_fuel(amount_per_transfer_from_this)
if (istype(I,/obj/item/device/assembly_holder))
@@ -172,7 +172,7 @@
var/obj/item/device/assembly_holder/H = I
if (istype(H.left_assembly,/obj/item/device/assembly/igniter) || istype(H.right_assembly,/obj/item/device/assembly/igniter))
- message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)")
+ message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. [ADMIN_JMP(loc)]")
log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.")
rig = I
@@ -194,7 +194,7 @@
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
if(Proj.get_structure_damage())
if(istype(Proj.firer))
- message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).")
+ message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) [ADMIN_JMP(loc)].")
log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).")
if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
diff --git a/code/modules/reagents/reagents.dm b/code/modules/reagents/reagents.dm
index f22cb92fbb7..60fd45dd6ac 100644
--- a/code/modules/reagents/reagents.dm
+++ b/code/modules/reagents/reagents.dm
@@ -1,13 +1,15 @@
//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
/proc/initialize_chemical_reagents()
- var/paths = typesof(/datum/reagent) - /datum/reagent
- GLOB.chemical_reagents_list = list()
+ var/list/reagent_list = list()
+
+ var/paths = subtypesof(/datum/reagent)
+
for(var/path in paths)
var/datum/reagent/D = new path()
- if(!D.name)
- continue
- GLOB.chemical_reagents_list[D.id] = D
+ reagent_list[D.id] = D
+
+ . = reagent_list
/datum/reagent
var/name = ""
diff --git a/code/modules/reagents/reagents/stims.dm b/code/modules/reagents/reagents/stims.dm
index 4df667885f5..e04254f4971 100644
--- a/code/modules/reagents/reagents/stims.dm
+++ b/code/modules/reagents/reagents/stims.dm
@@ -89,7 +89,7 @@
/datum/reagent/stim/pro_surgeon/overdose(mob/living/carbon/M, alien)
var/inverse_tough_mult = 1 - M.stats.getMult(STAT_TGH)
if(prob(5 - (5 * inverse_tough_mult)))
- M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others
+ M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others
M.drop_item()
if(prob(80 - (20 * inverse_tough_mult)))
M.add_chemical_effect(CE_TOXIN, 5)
@@ -286,7 +286,7 @@
if(prob(80 - (20 * inverse_tough_mult)))
M.add_chemical_effect(CE_TOXIN, 10)
if(prob(10 - (5 * inverse_tough_mult)))
- M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others
+ M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others
M.drop_item()
if(ishuman(M) && prob(80 - (60 * inverse_tough_mult)))
var/mob/living/carbon/human/H = M
diff --git a/code/modules/reagents/recipes.dm b/code/modules/reagents/recipes.dm
index 9f8483294c3..38e2f44c3d5 100644
--- a/code/modules/reagents/recipes.dm
+++ b/code/modules/reagents/recipes.dm
@@ -1,38 +1,4 @@
-//Chemical Reactions - Initialises all /datum/chemical_reaction into a list
-// It is filtered into multiple lists within a list.
-// For example:
-// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma
-// Note that entries in the list are NOT duplicated. So if a reaction pertains to
-// more than one chemical it will still only appear in only one of the sublists.
-/proc/initialize_chemical_reactions()
- var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
- GLOB.chemical_reactions_list = list()
-
- for(var/path in paths)
- var/datum/chemical_reaction/D = new path()
- for(var/id in D.required_reagents)
- if(!is_reagent_with_id_exist(id))
- error("recipe [D.type] created incorectly,\[required_reagents\] reagent with id \"[id]\" does not exist.")
- for(var/id in D.catalysts)
- if(!is_reagent_with_id_exist(id))
- error("recipe [D.type] created incorectly,\[catalysts\] reagent with id [id] does not exist.")
- for(var/id in D.inhibitors)
- if(!is_reagent_with_id_exist(id))
- error("recipe [D.type] created incorectly,\[inhibitors\] reagent with id [id] does not exist.")
- for(var/id in D.byproducts)
- if(!is_reagent_with_id_exist(id))
- error("recipe [D.type] created incorectly,\[byproducts\] reagent with id [id] does not exist.")
- if(D.required_reagents && D.required_reagents.len)
- if(D.result)
- if(!GLOB.chemical_reactions_list_by_result[D.result])
- GLOB.chemical_reactions_list_by_result[D.result] = list()
- GLOB.chemical_reactions_list_by_result[D.result] += D
- var/reagent_id = D.required_reagents[1]
- if(!GLOB.chemical_reactions_list[reagent_id])
- GLOB.chemical_reactions_list[reagent_id] = list()
- GLOB.chemical_reactions_list[reagent_id] += D
-
//helper that ensures the reaction rate holds after iterating
//Ex. REACTION_RATE(0.3) means that 30% of the reagents will react each chemistry tick (~2 seconds by default).
#define REACTION_RATE(rate) (1 - (1-rate)**(1/PROCESS_REACTION_ITER))
@@ -208,8 +174,9 @@
if(mix_message && container && !ismob(container))
var/turf/T = get_turf(container)
var/list/seen = viewers(4, T)
+ var/htmlicon = icon2html(container, seen)
for(var/mob/M in seen)
- M.show_message(span_notice("\icon[container] [mix_message]"), 1)
+ M.show_message(span_notice("[htmlicon] [mix_message]"), 1)
playsound(T, reaction_sound, 80, 1)
//obtains any special data that will be provided to the reaction products
@@ -799,7 +766,7 @@
var/obj/item/slime_extract/T = holder.my_atom
T.Uses--
if(T.Uses <= 0)
- T.visible_message("\icon[T][span_notice("\The [T]'s power is consumed in the reaction.")]")
+ T.visible_message("[icon2html(T, viewers(T))][span_notice("\The [T]'s power is consumed in the reaction.")]")
T.name = "used slime extract"
T.desc = "This extract has been used up."
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index f850bcfe37a..444ccee36ca 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -63,7 +63,7 @@
visible_message(span_notice("[target] has been placed in the [src] by [user]."))
user.attack_log += text("\[[time_stamp()]\] Has placed [target] ([target.ckey]) in disposals.")
target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])")
- msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)")
+ msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(usr)]")
return TRUE
/obj/machinery/disposal/MouseDrop_T(var/obj/item/I, mob/user, src_location, over_location, src_control, over_control, params)
@@ -131,7 +131,7 @@
if(istype(I, /obj/item/storage/bag))
var/obj/item/storage/bag/T = I
- to_chat(user, "\blue You empty the bag.")
+ to_chat(user, span_blue("You empty the bag."))
for(var/obj/item/O in T.contents)
T.remove_from_storage(O,src)
T.update_icon()
@@ -190,7 +190,7 @@
user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.")
target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])")
- msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)")
+ msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(user)]")
else
return
if (target.client)
@@ -200,7 +200,7 @@
target.simple_move_animation(src)
target.forceMove(src)
- for (var/mob/C in viewers(src))
+ for (var/mob/C in viewers(get_turf(src)))
if(C == user)
continue
C.show_message(msg, 3)
@@ -615,27 +615,16 @@
// called when player tries to move while in a pipe
/obj/structure/disposalholder/relaymove(mob/user as mob)
-
- if(!isliving(user))
- return
-
- var/mob/living/U = user
-
- if (U.stat || U.last_special <= world.time)
+ if(!isliving(user) || user.incapacitated())
return
- U.last_special = world.time+100
-
- if (src.loc)
- for (var/mob/M in hearers(src.loc.loc))
- to_chat(M, "CLONG, clong!")
-
- playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0)
+ for(var/mob/M in range(5, get_turf(src)))
+ M.show_message("CLONG, clong!", MSG_AUDIBLE)
+ playsound(src.loc, 'sound/effects/clang.ogg', 50, FALSE, FALSE)
// called to vent all gas in holder to a location
/obj/structure/disposalholder/proc/vent_gas(var/atom/location)
location.assume_air(gas) // vent all gas to turf
- return
/obj/structure/disposalholder/Destroy()
qdel(gas)
@@ -1201,7 +1190,7 @@
if(O.currTag)// Tag set
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
- to_chat(user, "\blue Changed filter to '[sortType]'.")
+ to_chat(user, span_blue("Changed filter to '[sortType]'."))
updatename()
updatedesc()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index a55689594b8..588a78061fa 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -62,7 +62,7 @@
if("Description")
var/str = sanitize(input(usr,"Label text?","Set label",""))
if(!str || !length(str))
- to_chat(usr, "\red Invalid text.")
+ to_chat(usr, span_red("Invalid text."))
return
if(!examtext && !nameset)
examtext = str
@@ -173,7 +173,7 @@
if("Description")
var/str = sanitize(input(usr,"Label text?","Set label",""))
if(!str || !length(str))
- to_chat(usr, "\red Invalid text.")
+ to_chat(usr, span_red("Invalid text."))
return
if(!examtext && !nameset)
examtext = str
@@ -305,7 +305,7 @@
else if(src.amount < 3)
to_chat(user, span_warning("You need more paper."))
else
- to_chat(user, "\blue The object you are trying to wrap is unsuitable for the sorting machinery!")
+ to_chat(user, span_blue("The object you are trying to wrap is unsuitable for the sorting machinery!"))
if (src.amount <= 0)
new /obj/item/c_tube( src.loc )
qdel(src)
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 0b00565b409..a094c87492f 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -124,7 +124,7 @@ Note: Must be placed within 3 tiles of the R&D Console
return
if(linked_console)
linked_console.handle_item_analysis(loaded_item)
- for(var/mob/living/carbon/human/H in viewers(src))
+ for(var/mob/living/carbon/human/H in viewers(get_turf(src)))
SEND_SIGNAL_OLD(H, COMSING_DESTRUCTIVE_ANALIZER, loaded_item)
if(istype(loaded_item,/obj/item/stack))
var/obj/item/stack/S = loaded_item
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index dfd28b8ba2f..cc326f9bb5d 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -96,10 +96,14 @@ var/global/list/obj/machinery/message_server/message_servers = list()
authmsg += "[id_auth]
"
if (stamp)
authmsg += "[stamp]
"
+
+
for (var/obj/machinery/requests_console/Console in allConsoles)
+ var/htmlicon = icon2html(Console, hearers(get_turf(Console)))
+
if (ckey(Console.department) == ckey(recipient))
if(Console.inoperable())
- Console.message_log += "Message lost due to console failure.
Please contact [station_name] system adminsitrator or AI for technical assistance.
"
+ Console.message_log += "Message lost due to console failure.
Please contact [station_name()] system adminsitrator or AI for technical assistance.
"
continue
if(Console.newmessagepriority < priority)
Console.newmessagepriority = priority
@@ -108,18 +112,18 @@ var/global/list/obj/machinery/message_server/message_servers = list()
if(2)
if(!Console.silent)
playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5)
+ Console.audible_message("[htmlicon] *The Requests Console beeps: 'PRIORITY Alert in [sender]'")
Console.message_log += "High Priority message from [sender]
[authmsg]"
else
if(!Console.silent)
playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
- Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4)
+ Console.audible_message("[htmlicon] *The Requests Console beeps: 'Message from [sender]'")
Console.message_log += "Message from [sender]
[authmsg]"
Console.set_light(2)
/obj/machinery/message_server/attack_hand(user as mob)
-// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays."
+// user << span_blue("There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.")
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
update_icon()
diff --git a/code/modules/sanity/breakdowns.dm b/code/modules/sanity/breakdowns.dm
index 3022c0ee953..31cf033da29 100644
--- a/code/modules/sanity/breakdowns.dm
+++ b/code/modules/sanity/breakdowns.dm
@@ -175,7 +175,7 @@
))
holder.owner.custom_emote(message=emote)
else if(!holder.owner.incapacitated())
- var/obj/item/W = holder.owner.get_active_hand()
+ var/obj/item/W = holder.owner.get_active_held_item()
if(W)
W.attack(holder.owner, holder.owner, ran_zone())
else
@@ -649,7 +649,7 @@
candidates -= I
continue
if(!holder.owner.put_in_hands(I) && prob(50))
- holder.owner.unEquip(holder.owner.get_inactive_hand())
+ holder.owner.unEquip(holder.owner.get_inactive_held_item())
holder.owner.put_in_hands(I)
break
diff --git a/code/modules/sanity/sanity_atom.dm b/code/modules/sanity/sanity_atom.dm
index 5174a79c970..46b707c4b08 100644
--- a/code/modules/sanity/sanity_atom.dm
+++ b/code/modules/sanity/sanity_atom.dm
@@ -3,7 +3,7 @@
var/desc
/datum/component/atom_sanity/Initialize(value, new_desc)
- if(!istype(parent, /atom))
+ if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
var/atom/A = parent
affect = value
diff --git a/code/modules/sanity/sanity_effects.dm b/code/modules/sanity/sanity_effects.dm
index e9acbacebaf..f8b2e9e450d 100644
--- a/code/modules/sanity/sanity_effects.dm
+++ b/code/modules/sanity/sanity_effects.dm
@@ -2,7 +2,7 @@
owner.custom_emote(message = level < 20 ? pick_emote_20() : pick_emote_40())
/datum/sanity/proc/effect_quote()
- to_chat(owner, span_danger(level < 20 ? "\icon['icons/effects/fabric_symbols_20.dmi'][pick_quote_20()]" : "\icon['icons/effects/fabric_symbols_40.dmi'][pick_quote_40()]"))
+ to_chat(owner, span_danger(level < 20 ? "[icon2html('icons/effects/fabric_symbols_20.dmi', owner)][pick_quote_20()]" : "[icon2html('icons/effects/fabric_symbols_40.dmi', owner)][pick_quote_40()]"))
/datum/sanity/proc/effect_sound()
var/sound/S = pick_sound()
diff --git a/code/modules/sanity/sanity_mob.dm b/code/modules/sanity/sanity_mob.dm
index 2f2f99f0481..15de35c307d 100644
--- a/code/modules/sanity/sanity_mob.dm
+++ b/code/modules/sanity/sanity_mob.dm
@@ -275,7 +275,7 @@ GLOBAL_VAR_INIT(GLOBAL_INSIGHT_MOD, 1)
desires.Cut()
if(!rest_timer_active)
to_chat(owner, "[owner.stats.getPerk(PERK_ARTIST) ? "You have created art." : "You have rested well."]\
-
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\
+
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\
The prompt will appear in one minute.")
rest_timer_active = TRUE
rest_timer_time = 60 SECONDS
diff --git a/code/modules/shield_generators/shield.dm b/code/modules/shield_generators/shield.dm
index bc4da7d5ab6..ef98e60f5e6 100644
--- a/code/modules/shield_generators/shield.dm
+++ b/code/modules/shield_generators/shield.dm
@@ -351,7 +351,7 @@ Like for example singulo act and whatever.
if (istype(hit_location))
var/area/A = get_area(hit_location)
var/where = "[A? A.name : "Unknown Location"] | [hit_location.x], [hit_location.y]"
- var/whereLink = "[where]"
+ var/whereLink = ADMIN_JMP(hit_location)
message_admins("A meteor has impacted shields at ([whereLink])", 0, 1)
log_game("A meteor has impacted shields at ([where]).")
*/
diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm
index d4a8bba736d..299fe77548b 100644
--- a/code/modules/shieldgen/emergency_shield.dm
+++ b/code/modules/shieldgen/emergency_shield.dm
@@ -233,16 +233,16 @@
if(is_open)
to_chat(user, "The panel must be closed before operating this machine.")
return
-
+ var/iconhtml = icon2html(src, hearers(get_turf(src)))
if (src.active)
- user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \
- "\blue \icon[src] You deactivate the shield generator.", \
+ user.visible_message(span_blue("[iconhtml] [user] deactivated the shield generator."), \
+ span_blue("[iconhtml] You deactivate the shield generator."), \
"You hear heavy droning fade out.")
src.shields_down()
else
if(anchored)
- user.visible_message("\blue \icon[src] [user] activated the shield generator.", \
- "\blue \icon[src] You activate the shield generator.", \
+ user.visible_message(span_blue("[iconhtml] [user] activated the shield generator."), \
+ span_blue("[iconhtml] You activate the shield generator."), \
"You hear heavy droning.")
src.shields_up()
else
diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm
index ec16555aa92..46bf87c03ab 100644
--- a/code/modules/shieldgen/sheldwallgen.dm
+++ b/code/modules/shieldgen/sheldwallgen.dm
@@ -33,13 +33,13 @@
/obj/machinery/shieldwallgen/attack_hand(mob/user as mob)
if(state != 1)
- to_chat(user, "\red \The [src] needs to be firmly secured to the floor first.")
+ to_chat(user, span_red("\The [src] needs to be firmly secured to the floor first."))
return 1
if(src.locked && !issilicon(user))
- to_chat(user, "\red The controls are locked!")
+ to_chat(user, span_red("The controls are locked!"))
return 1
if(power != 1)
- to_chat(user, "\red \The [src] needs to be powered by wire underneath.")
+ to_chat(user, span_red("\The [src] needs to be powered by wire underneath."))
return 1
if(src.active >= 1)
@@ -122,7 +122,7 @@
if(!power)
- visible_message("\red The [src.name] shuts down due to lack of power!", \
+ visible_message(span_red("The [src.name] shuts down due to lack of power!"), \
"You hear heavy droning fade out")
active = FALSE
for(var/fdir in GLOB.cardinal)
@@ -229,11 +229,11 @@
src.locked = !src.locked
to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]")
else
- to_chat(user, "\red Access denied.")
+ to_chat(user, span_red("Access denied."))
else
src.add_fingerprint(user)
- visible_message("\red The [src.name] has been hit with \the [I.name] by [user.name]!")
+ visible_message(span_red("The [src.name] has been hit with \the [I.name] by [user.name]!"))
/obj/machinery/shieldwallgen/emag_act()
diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm
index 6b3ce2a7bdd..db8ebdafb04 100644
--- a/code/modules/shieldgen/shield_capacitor.dm
+++ b/code/modules/shieldgen/shield_capacitor.dm
@@ -46,11 +46,11 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
- user << "\red Access denied."
+ user << span_red("Access denied.")
if(QUALITY_BOLT_TURNING in I.tool_qualities)
if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC))
src.anchored = !src.anchored
- src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")
+ src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user]."))
if(anchored)
spawn(0)
@@ -131,7 +131,7 @@
return
if( href_list["toggle"] )
if(!active && !anchored)
- usr << "\red The [src] needs to be firmly secured to the floor first."
+ usr << span_red("The [src] needs to be firmly secured to the floor first.")
return
active = !active
if( href_list["charge_rate"] )
diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm
index c0f3211c818..abab689fdcd 100644
--- a/code/modules/shieldgen/shield_gen.dm
+++ b/code/modules/shieldgen/shield_gen.dm
@@ -63,12 +63,12 @@
user << "Controls are now [src.locked ? "locked." : "unlocked."]"
updateDialog()
else
- user << "\red Access denied."
+ user << span_red("Access denied.")
if(QUALITY_BOLT_TURNING in I.tool_qualities)
if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC))
src.anchored = !src.anchored
- src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")
+ src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user]."))
if(active)
toggle()
@@ -189,7 +189,7 @@
return
else if( href_list["toggle"] )
if (!active && !anchored)
- usr << "\red The [src] needs to be firmly secured to the floor first."
+ usr << span_red("The [src] needs to be firmly secured to the floor first.")
return
toggle()
else if( href_list["change_radius"] )
@@ -210,6 +210,8 @@
set background = 1
active = !active
update_icon()
+ var/our_viewers = viewers(5,src)
+ var/htmlicon = icon2html(src, our_viewers)
if(active)
var/list/covered_turfs = get_shielded_turfs()
var/turf/T = get_turf(src)
@@ -220,15 +222,15 @@
field.Add(E)
covered_turfs = null
- for(var/mob/M in view(5,src))
- M << "\icon[src] You hear heavy droning start up."
+ for(var/mob/M in our_viewers)
+ to_chat(M, "[htmlicon] You hear heavy droning start up.")
else
for(var/obj/effect/energy_field/D in field)
field.Remove(D)
D.loc = null
- for(var/mob/M in view(5,src))
- M << "\icon[src] You hear heavy droning fade out."
+ for(var/mob/M in our_viewers)
+ to_chat(M, "[htmlicon] You hear heavy droning fade out.")
/obj/machinery/shield_gen/update_icon()
if(stat & BROKEN)
diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm
index 4f0235833e3..7bee5738843 100644
--- a/code/modules/shuttles/landmarks.dm
+++ b/code/modules/shuttles/landmarks.dm
@@ -88,7 +88,7 @@
tag = landmark_tag+"-[x]-[y]"
. = ..()
base_area = get_area(src)
- if(!config.use_overmap)
+ if(!CONFIG_GET(flag/use_overmap))
return
add_to_sector(map_sectors["[z]"])
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index 1c441052c98..694a5ddc4e3 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -28,7 +28,7 @@
/datum/shuttle/autodock/ferry/emergency/shuttle_moved()
if(next_location != waypoint_station)
emergency_controller.shuttle_leaving() // This is a hell of a line. v
- priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s"))
+ priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s"))
else if(next_location == waypoint_offsite && emergency_controller.has_evacuated())
emergency_controller.shuttle_evacuated()
..()
@@ -195,9 +195,9 @@
if (shuttle.in_use)
shuttle_status = "Busy."
else if (!shuttle.location)
- shuttle_status = "Standing-by at [station_name]."
+ shuttle_status = "Standing-by at [station_name()]."
else
- shuttle_status = "Standing-by at [dock_name]."
+ shuttle_status = "Standing-by at [GLOB.dock_name]."
if(WAIT_LAUNCH, FORCE_LAUNCH)
shuttle_status = "Shuttle has recieved command and will depart shortly."
if(WAIT_ARRIVE)
@@ -253,6 +253,6 @@
//They selected an empty entry. Try to scan their id.
var/mob/living/carbon/human/H = user
if (istype(H))
- if (!read_authorization(H.get_active_hand())) //try to read what's in their hand first
+ if (!read_authorization(H.get_active_held_item())) //try to read what's in their hand first
read_authorization(H.wear_id)
. = TOPIC_REFRESH
diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm
index 70fcd371cb2..1a50c4ec1a5 100644
--- a/code/modules/shuttles/shuttle_specops.dm
+++ b/code/modules/shuttles/shuttle_specops.dm
@@ -35,7 +35,7 @@
var/obj/machinery/computer/C = user
if(world.time <= reset_time)
- C.visible_message(span_notice("[boss_name] will not allow the Special Operations shuttle to launch yet."))
+ C.visible_message(span_notice("[GLOB.boss_name] will not allow the Special Operations shuttle to launch yet."))
if (((world.time - reset_time)/10) > 60)
C.visible_message(span_notice("[-((world.time - reset_time)/10)/60] minutes remain!"))
else
@@ -66,12 +66,12 @@
if (!location) //just arrived home
for(var/turf/T in get_area_turfs(shuttle_area))
var/mob/M = locate(/mob) in T
- to_chat(M, span_danger("You have arrived at [boss_name]. Operation has ended!"))
+ to_chat(M, span_danger("You have arrived at [GLOB.boss_name]. Operation has ended!"))
else //just left for the station
launch_mauraders()
for(var/turf/T in get_area_turfs(shuttle_area))
var/mob/M = locate(/mob) in T
- to_chat(M, span_danger("You have arrived at [station_name]. Commence operation!"))
+ to_chat(M, span_danger("You have arrived at [station_name()]. Commence operation!"))
// var/obj/machinery/light/small/readylight/light = locate() in T
// if(light) light.set_state(1)
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index bb2aacc79e3..ffbd2d0d8b8 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -53,12 +53,12 @@
/datum/shuttle/autodock/multi/antag/proc/announce_departure()
if(cloaked || isnull(departure_message))
return
- command_announcement.Announce(departure_message, announcer || "[boss_name]")
+ command_announcement.Announce(departure_message, announcer || "[GLOB.boss_name]")
/datum/shuttle/autodock/multi/antag/proc/announce_arrival()
if(cloaked || isnull(arrival_message))
return
- command_announcement.Announce(arrival_message, announcer || "[boss_name]")
+ command_announcement.Announce(arrival_message, announcer || "[GLOB.boss_name]")
/datum/shuttle/autodock/multi/antag/set_destination(var/destination_key, mob/user)
if(!return_warning && destination_key == home_waypoint.name && current_location != home_waypoint)
diff --git a/code/modules/surgery/old_cavity.dm b/code/modules/surgery/old_cavity.dm
index 1a77943498c..5bd26378681 100644
--- a/code/modules/surgery/old_cavity.dm
+++ b/code/modules/surgery/old_cavity.dm
@@ -16,8 +16,8 @@
/datum/old_surgery_step/cavity/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
- "\red [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!",
- "\red Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!"
+ span_red("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!"),
+ span_red("Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!")
)
affected.createwound(CUT, 20)
@@ -43,8 +43,8 @@
/datum/old_surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
- "\blue [user] makes some space inside [target]'s [affected.cavity_name] with \the [tool].",
- "\blue You make some space inside [target]'s [affected.cavity_name] with \the [tool]."
+ span_blue("[user] makes some space inside [target]'s [affected.cavity_name] with \the [tool]."),
+ span_blue("You make some space inside [target]'s [affected.cavity_name] with \the [tool].")
)
/datum/old_surgery_step/cavity/close_space
@@ -70,6 +70,6 @@
/datum/old_surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(
- "\blue [user] mends [target]'s [affected.cavity_name] walls with \the [tool].",
- "\blue You mend [target]'s [affected.cavity_name] walls with \the [tool]."
+ span_blue("[user] mends [target]'s [affected.cavity_name] walls with \the [tool]."),
+ span_blue("You mend [target]'s [affected.cavity_name] walls with \the [tool].")
)
diff --git a/code/modules/surgery/old_encased.dm b/code/modules/surgery/old_encased.dm
index 38b7047148d..d4ea637828c 100644
--- a/code/modules/surgery/old_encased.dm
+++ b/code/modules/surgery/old_encased.dm
@@ -43,8 +43,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\blue [user] has cut [target]'s [affected.encased] open with \the [tool].", \
- "\blue You have cut [target]'s [affected.encased] open with \the [tool].")
+ user.visible_message(span_blue("[user] has cut [target]'s [affected.encased] open with \the [tool]."), \
+ span_blue("You have cut [target]'s [affected.encased] open with \the [tool]."))
affected.open = 2.5
/datum/old_surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
@@ -53,8 +53,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- user.visible_message("\red [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \
- "\red Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" )
+ user.visible_message(span_red("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!") , \
+ span_red("Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!") )
affected.createwound(CUT, 20)
affected.fracture()
@@ -89,8 +89,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] forces open [target]'s [affected.encased] with \the [tool]."
- var/self_msg = "\blue You force open [target]'s [affected.encased] with \the [tool]."
+ var/msg = span_blue("[user] forces open [target]'s [affected.encased] with \the [tool].")
+ var/self_msg = span_blue("You force open [target]'s [affected.encased] with \the [tool].")
user.visible_message(msg, self_msg)
affected.open = 3
@@ -101,8 +101,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\red [user]'s hand slips, cracking [target]'s [affected.encased]!"
- var/self_msg = "\red Your hand slips, cracking [target]'s [affected.encased]!"
+ var/msg = span_red("[user]'s hand slips, cracking [target]'s [affected.encased]!")
+ var/self_msg = span_red("Your hand slips, cracking [target]'s [affected.encased]!")
user.visible_message(msg, self_msg)
affected.createwound(BRUISE, 20)
@@ -138,8 +138,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] bends [target]'s [affected.encased] back into place with \the [tool]."
- var/self_msg = "\blue You bend [target]'s [affected.encased] back into place with \the [tool]."
+ var/msg = span_blue("[user] bends [target]'s [affected.encased] back into place with \the [tool].")
+ var/self_msg = span_blue("You bend [target]'s [affected.encased] back into place with \the [tool].")
user.visible_message(msg, self_msg)
affected.open = 2.5
@@ -150,8 +150,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\red [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!"
- var/self_msg = "\red Your hand slips, bending [target]'s [affected.encased] the wrong way!"
+ var/msg = span_red("[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!")
+ var/self_msg = span_red("Your hand slips, bending [target]'s [affected.encased] the wrong way!")
user.visible_message(msg, self_msg)
affected.createwound(BRUISE, 20)
@@ -193,8 +193,8 @@
return
var/obj/item/organ/external/affected = target.get_organ(target_zone)
- var/msg = "\blue [user] finish mending back [target]'s bones on [affected.encased] with \the [tool]."
- var/self_msg = "\blue You finish mending back [target]'s bones on [affected.encased] with \the [tool]."
+ var/msg = span_blue("[user] finish mending back [target]'s bones on [affected.encased] with \the [tool].")
+ var/self_msg = span_blue("You finish mending back [target]'s bones on [affected.encased] with \the [tool].")
user.visible_message(msg, self_msg)
- affected.open = 2
\ No newline at end of file
+ affected.open = 2
diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm
index e8279878fc5..cc9b9232448 100644
--- a/code/modules/surgery/slimes.dm
+++ b/code/modules/surgery/slimes.dm
@@ -21,13 +21,13 @@
"You start cutting through [target]'s flesh with \the [tool].")
/datum/old_surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\blue [user] cuts through [target]'s flesh with \the [tool].", \
- "\blue You cut through [target]'s flesh with \the [tool], revealing its silky innards.")
+ user.visible_message(span_blue("[user] cuts through [target]'s flesh with \the [tool]."), \
+ span_blue("You cut through [target]'s flesh with \the [tool], revealing its silky innards."))
target.core_removal_stage = 1
/datum/old_surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \
- "\red Your hand slips, tearing [target]'s flesh with \the [tool]!")
+ user.visible_message(span_red("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!"), \
+ span_red("Your hand slips, tearing [target]'s flesh with \the [tool]!"))
/datum/old_surgery_step/slime/cut_innards
required_tool_quality = QUALITY_CUTTING
@@ -42,13 +42,13 @@
"You start cutting [target]'s silky innards apart with \the [tool].")
/datum/old_surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\blue [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \
- "\blue You cut [target]'s innards apart with \the [tool], exposing the cores.")
+ user.visible_message(span_blue("[user] cuts [target]'s innards apart with \the [tool], exposing the cores."), \
+ span_blue("You cut [target]'s innards apart with \the [tool], exposing the cores."))
target.core_removal_stage = 2
/datum/old_surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \
- "\red Your hand slips, tearing [target]'s innards with \the [tool]!")
+ user.visible_message(span_red("[user]'s hand slips, tearing [target]'s innards with \the [tool]!"), \
+ span_red("Your hand slips, tearing [target]'s innards with \the [tool]!"))
/datum/old_surgery_step/slime/saw_core
required_tool_quality = QUALITY_SAWING
@@ -64,8 +64,8 @@
/datum/old_surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
target.cores--
- user.visible_message("\blue [user] cuts out one of [target]'s cores with \the [tool].",, \
- "\blue You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")
+ user.visible_message(span_blue("[user] cuts out one of [target]'s cores with \the [tool]."),, \
+ span_blue("You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left."))
if(target.cores >= 0)
new target.coretype(target.loc)
@@ -74,5 +74,5 @@
/datum/old_surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool)
- user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \
- "\red Your hand slips, causing you to miss the core!")
\ No newline at end of file
+ user.visible_message(span_red("[user]'s hand slips, causing \him to miss the core!"), \
+ span_red("Your hand slips, causing you to miss the core!"))
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index b4daa7456b0..3670213350b 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -92,7 +92,7 @@
return FALSE
if(!tool)
- tool = user.get_active_hand()
+ tool = user.get_active_held_item()
var/quality = S.tool_quality(tool)
if(!quality)
diff --git a/code/modules/surgery/surgery_ui.dm b/code/modules/surgery/surgery_ui.dm
index 5db5c31f465..c43d78482b4 100644
--- a/code/modules/surgery/surgery_ui.dm
+++ b/code/modules/surgery/surgery_ui.dm
@@ -195,7 +195,7 @@
var/target_stat = BP_IS_ROBOTIC(src) ? STAT_MEC : STAT_BIO
var/removal_time = 70 * usr.stats.getMult(target_stat, STAT_LEVEL_PROF)
var/target = get_surgery_target()
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(!I || !(QUALITY_CLAMPING in I.tool_qualities))
to_chat(user, span_warning("You need a tool with [QUALITY_CLAMPING] quality"))
@@ -222,7 +222,7 @@
if("treat_wound")
var/mob/living/user = usr
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(!user || !I)
return
diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm
index 8a039304744..44408228525 100644
--- a/code/modules/tables/interactions.dm
+++ b/code/modules/tables/interactions.dm
@@ -22,7 +22,7 @@
//checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops.
/obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from)
- if(config.z_level_shooting)
+ if(CONFIG_GET(flag/z_level_shooting))
if(P.height == HEIGHT_HIGH)
return TRUE // Bullet is too high to hit
P.height = (P.height == HEIGHT_LOW) ? HEIGHT_LOW : HEIGHT_CENTER
@@ -50,7 +50,7 @@
valid = FALSE //But only from one side
// Bullet is low enough to hit the table
- if(config.z_level_shooting && P.height == HEIGHT_LOW)
+ if(CONFIG_GET(flag/z_level_shooting) && P.height == HEIGHT_LOW)
valid = TRUE
if(valid)
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
index f6e31c5d445..c8d6e0de8b4 100644
--- a/code/modules/tables/tables.dm
+++ b/code/modules/tables/tables.dm
@@ -218,7 +218,7 @@ var/list/custom_table_appearance = list(
return ..()
/obj/structure/table/MouseDrop_T(obj/item/stack/material/what)
- if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_hand() == what && Adjacent(usr))
+ if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_held_item() == what && Adjacent(usr))
reinforce_table(what, usr)
else
return ..()
diff --git a/code/modules/text_to_speech/tts_main.dm b/code/modules/text_to_speech/tts_main.dm
index d796ad1bb5f..3296fae597c 100644
--- a/code/modules/text_to_speech/tts_main.dm
+++ b/code/modules/text_to_speech/tts_main.dm
@@ -15,10 +15,10 @@ GLOBAL_VAR_INIT(tts_error_raw, "")
var/list/tts_seeds = list()
/proc/initialize_text_to_speech()
- if(!config.tts_key)
+ if(!CONFIG_GET(string/tts_key))
return
- GLOB.tts_bearer = "Bearer [config.tts_key]"
+ GLOB.tts_bearer = "Bearer [CONFIG_GET(string/tts_key)]"
if(!fexists("config/tts_seeds.txt"))
return
@@ -69,7 +69,7 @@ var/list/tts_seeds = list()
fdel(.)
return null
GLOB.tts_request_succeeded++
- if(!config.tts_cache)
+ if(!CONFIG_GET(flag/tts_cache))
GLOB.tts_death_row += .
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS)
@@ -109,7 +109,7 @@ var/list/tts_seeds = list()
fdel(.)
return ""
GLOB.tts_request_succeeded++
- if(!config.tts_cache)
+ if(!CONFIG_GET(flag/tts_cache))
GLOB.tts_death_row += .
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS)
diff --git a/code/modules/tgchat/README.md b/code/modules/tgchat/README.md
new file mode 100644
index 00000000000..95f28ae0e8c
--- /dev/null
+++ b/code/modules/tgchat/README.md
@@ -0,0 +1,30 @@
+## /TG/ Chat
+
+/TG/ Chat, which will be referred to as TgChat from this point onwards, is a system in which we can send messages to clients in a controlled and semi-reliable manner. The standard way of sending messages to BYOND clients simply dumps whatever you output to them directly into their chat window, however BYOND allows us to load our own code on the client to change this behaviour in a way that allows us to do some pretty neat things.
+
+### Message Format
+
+TgChat handles sending messages from the server to the client through the use of JSON payloads, of which the format will change depending on the type of message and the intended client endpoint. An example of the payload for chat messages is as follows:
+```json
+{
+ "sequence": 0,
+ "content": {
+ "type": ". . .", // ?optional
+ "text": ". . .", // ?optional !atleast-one
+ "html": ". . .", // ?optional !atleast-one
+ "avoidHighlighting": 0 // ?optional
+ },
+}
+```
+
+### Reliability
+
+In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of recieved sequence numbers. Should the client recieve an unexpected sequence number TgChat asks the server to resend any missing packets.
+
+### Ping System
+
+TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server recieves said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request.
+
+### Chat Tabs, Local Storage, and Highlighting
+
+To make organizing and managing chat easier and more functional for both players and admins, TgChat has the ability to filter out messages based on their primary tag, such as individual departmental radios, to a dedicated chat tab for easier reading and comprehension. These tabs can also be configured to highlist messages based on a simple keyword search. You can set a multitude of different keywords to search for and they will be highlighting for instant alerting of the client. Said tabs, highlighting rules, and your chat history will persist thanks to use of local storage on the client. Using local storage TgChat can ensure that your preferences are saved and maintained between client restarts and switching between other /TG/ servers. Local Storage is also used to keep your chat history aswell, should you need to scroll through your chat logs.
diff --git a/code/modules/tgchat/message.dm b/code/modules/tgchat/message.dm
new file mode 100644
index 00000000000..2e9bfe784ec
--- /dev/null
+++ b/code/modules/tgchat/message.dm
@@ -0,0 +1,17 @@
+/**
+ * Message-related procs
+ *
+ * Message format (/list):
+ * - type - Message type, must be one of defines in `code/__DEFINES/chat.dm`
+ * - text - Plain message text
+ * - html - HTML message text
+ * - Optional metadata, can be any key/value pair.
+ *
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/proc/message_to_html(message)
+ // Here it is possible to add a switch statement
+ // to custom-handle various message types.
+ return message["html"] || message["text"]
diff --git a/code/modules/tgchat/to_chat.dm b/code/modules/tgchat/to_chat.dm
new file mode 100644
index 00000000000..9b99dbdea45
--- /dev/null
+++ b/code/modules/tgchat/to_chat.dm
@@ -0,0 +1,90 @@
+/*!
+ * Copyright (c) 2020 Aleksej Komarov
+ * SPDX-License-Identifier: MIT
+ */
+
+/**
+ * Circumvents the message queue and sends the message
+ * to the recipient (target) as soon as possible.
+ */
+/proc/to_chat_immediate(
+ target,
+ html,
+ type = null,
+ text = null,
+ avoid_highlighting = FALSE,
+ // FIXME: These flags are now pointless and have no effect
+ handle_whitespace = TRUE,
+ trailing_newline = TRUE,
+ confidential = FALSE
+)
+ // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "")
+ html = "[html]"
+ text = "[text]"
+ if(!target)
+ return
+ if(!html && !text)
+ if(istext(target))
+ CRASH("Passed text without target in to_chat proc call.")
+ else
+ CRASH("Empty or null string in to_chat proc call.")
+ if(target == world)
+ target = GLOB.clients
+
+ // Build a message
+ var/message = list()
+ if(type) message["type"] = type
+ if(text) message["text"] = text
+ if(html) message["html"] = html
+ if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting
+
+ // send it immediately
+ SSchat.send_immediate(target, message)
+
+/**
+ * Sends the message to the recipient (target).
+ *
+ * Recommended way to write to_chat calls:
+ * ```
+ * to_chat(client,
+ * type = MESSAGE_TYPE_INFO,
+ * html = "You have found [object]")
+ * ```
+ */
+/proc/to_chat(
+ target,
+ html,
+ type = null,
+ text = null,
+ avoid_highlighting = FALSE,
+ // FIXME: These flags are now pointless and have no effect
+ handle_whitespace = TRUE,
+ trailing_newline = TRUE,
+ confidential = FALSE
+)
+ if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage))
+ to_chat_immediate(target, html, type, text, avoid_highlighting, confidential = confidential)
+ return
+
+ // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "")
+ html = "[html]"
+ text = "[text]"
+
+ if(!target)
+ return
+ if(!html && !text)
+ if(istext(target))
+ CRASH("Passed text without target in to_chat proc call.")
+ else
+ CRASH("Empty or null string in to_chat proc call.")
+ if(target == world)
+ target = GLOB.clients
+
+ // Build a message
+ var/message = list()
+ if(type) message["type"] = type
+ if(text) message["text"] = text
+ if(html) message["html"] = html
+ if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting
+
+ SSchat.queue(target, message)
diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm
index a5c599ef396..6e52af118aa 100644
--- a/code/modules/tgui/external.dm
+++ b/code/modules/tgui/external.dm
@@ -42,7 +42,7 @@
*
* required user mob The mob interacting with the UI.
*
- * return list Statuic Data to be sent to the UI.
+ * return list Static Data to be sent to the UI.
*/
/datum/proc/ui_static_data(mob/user)
return list()
@@ -70,7 +70,7 @@
* change static data.
*/
/datum/proc/update_static_data_for_all_viewers()
- for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)])
+ for (var/datum/tgui/window as anything in open_uis)
window.send_full_update()
/**
@@ -86,10 +86,14 @@
*/
/datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
SHOULD_CALL_PARENT(TRUE)
- SEND_SIGNAL_OLD(src, COMSIG_UI_ACT, usr, action)
+ SEND_SIGNAL(src, COMSIG_UI_ACT, usr, action, params)
// If UI is not interactive or usr calling Topic is not the UI user, bail.
if(!ui || ui.status != UI_INTERACTIVE)
return TRUE
+ // if(action == "change_ui_state")
+ // var/mob/living/user = ui.user
+ // //write_preferences will make sure it's valid for href exploits.
+ // user.client.prefs.write_preference(GLOB.preference_entries[layout_prefs_used], params["new_state"])
/**
* public
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index b35931d92d3..df14ad0ebf4 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -63,7 +63,7 @@
// Close UIs if mindless.
if(!client) // && !HAS_TRAIT(src, TRAIT_PRESERVE_UI_WITHOUT_CLIENT))
return UI_CLOSE
- // Disable UIs if unconcious.
+ // Disable UIs if unconscious.
else if(stat)
return UI_DISABLED
// Update UIs if incapicitated but concious.
@@ -71,8 +71,9 @@
return UI_UPDATE
return UI_INTERACTIVE
-/mob/living/shared_ui_interaction(src_object)
+/mob/living/shared_ui_interaction(atom/src_object)
. = ..()
+ // if(!(mobility_flags & MOBILITY_UI) && !(src_object.interaction_flags_atom & INTERACT_ATOM_IGNORE_MOBILITY) && . == UI_INTERACTIVE)
// downgrade from UI_INTERACTIVE to UI_UPDATE when lying or resting.
if((lying || resting) && . == UI_INTERACTIVE)
return UI_UPDATE
@@ -102,6 +103,11 @@
* return UI_state The state of the UI.
*/
/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE, allow_tk = TRUE)
+ // var/obj/item/item_in_hand = get_active_held_item()
+ // if(istype(item_in_hand, /obj/item/machine_remote)) //snowflake, this lets you interact with all.
+ // var/obj/item/machine_remote/remote = item_in_hand
+ // if(remote.controlling_machine_or_bot == src_object)
+ // return UI_INTERACTIVE
// If the object is obscured, close it.
if(viewcheck && !(src_object in view(src)))
return UI_CLOSE
diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm
index 4da5061dfcb..eb12cb1eb6e 100644
--- a/code/modules/tgui/states/admin.dm
+++ b/code/modules/tgui/states/admin.dm
@@ -6,12 +6,26 @@
/**
* tgui state: admin_state
*
- * Checks that the user is an admin, end-of-story.
+ * Checks if the user has specific admin permissions.
*/
-GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new)
+GLOBAL_LIST_EMPTY_TYPED(admin_states, /datum/ui_state/admin_state)
+GLOBAL_PROTECT(admin_states)
+
+/datum/ui_state/admin_state
+ /// The specific admin permissions required for the UI using this state.
+ VAR_FINAL/required_perms = R_ADMIN
+
+/datum/ui_state/admin_state/New(required_perms = R_ADMIN)
+ . = ..()
+ src.required_perms = required_perms
/datum/ui_state/admin_state/can_use_topic(src_object, mob/user)
- if(check_rights_for(user.client, R_ADMIN))
+ if(check_rights_for(user.client, required_perms))
return UI_INTERACTIVE
return UI_CLOSE
+
+// /datum/ui_state/admin_state/vv_edit_var(var_name, var_value)
+// if(var_name == NAMEOF(src, required_perms))
+// return FALSE
+// return ..()
diff --git a/code/modules/tgui/states/greyscale_menu.dm b/code/modules/tgui/states/greyscale_menu.dm
new file mode 100644
index 00000000000..b08c0b8c980
--- /dev/null
+++ b/code/modules/tgui/states/greyscale_menu.dm
@@ -0,0 +1,14 @@
+/**
+ * tgui state: greyscale menu
+ *
+ * Checks that the target var of the greyscale menu meets the default can_use_topic criteria
+ */
+
+GLOBAL_DATUM_INIT(greyscale_menu_state, /datum/ui_state/greyscale_menu_state, new)
+
+/datum/ui_state/greyscale_menu_state/can_use_topic(src_object, mob/user)
+ var/datum/greyscale_modify_menu/menu = src_object
+ if(!isatom(menu.target))
+ return UI_INTERACTIVE
+
+ return GLOB.default_state.can_use_topic(menu.target, user)
diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm
index 9b4b7b1c811..0bd23aa27b9 100644
--- a/code/modules/tgui/states/hands.dm
+++ b/code/modules/tgui/states/hands.dm
@@ -25,7 +25,6 @@ GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new)
return UI_CLOSE
/mob/living/silicon/robot/hands_can_use_topic(src_object)
- for(var/obj/item/gripper/active_gripper in list(module_state_1, module_state_2, module_state_3))
- if(active_gripper.contains(src_object))
- return UI_INTERACTIVE
+ if(activated(src_object))
+ return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/tgui/states/holoposter.dm b/code/modules/tgui/states/holoposter.dm
index 4a21e87f35a..43c2b23a8cb 100644
--- a/code/modules/tgui/states/holoposter.dm
+++ b/code/modules/tgui/states/holoposter.dm
@@ -2,14 +2,14 @@ GLOBAL_DATUM_INIT(holoposter_state, /datum/ui_state/holoposter_state, new)
/datum/ui_state/holoposter_state/can_use_topic(obj/machinery/holoposter/src_object, mob/user)
ASSERT(istype(src_object))
-
+
if(src_object.stat & NOPOWER)
return UI_CLOSE
-
+
if(isobserver(user) || issilicon(user))
return user.default_can_use_topic(src_object)
-
- if(!istype(user.get_active_hand(), /obj/item/tool/multitool))
+
+ if(!istype(user.get_active_held_item(), /obj/item/tool/multitool))
return UI_CLOSE
-
+
return user.default_can_use_topic(src_object)
diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm
index eaaa125786d..1786175f051 100644
--- a/code/modules/tgui/states/language_menu.dm
+++ b/code/modules/tgui/states/language_menu.dm
@@ -14,6 +14,6 @@ GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new)
if(check_rights_for(user.client, R_ADMIN))
. = UI_INTERACTIVE
else if(istype(src_object, /datum/language_menu))
- var/datum/language_menu/LM = src_object
- if(LM.language_holder.get_atom() == user)
+ var/datum/language_menu/my_languages = src_object
+ if(my_languages.language_holder.owner == user)
. = UI_INTERACTIVE
diff --git a/code/modules/tgui/states/new_player.dm b/code/modules/tgui/states/new_player.dm
index cf6f83ed3a1..cd33bcfcfae 100644
--- a/code/modules/tgui/states/new_player.dm
+++ b/code/modules/tgui/states/new_player.dm
@@ -1,13 +1,10 @@
/**
* tgui state: new_player_state
*
- * Checks that the user is a new_player, or if user is an admin
+ * Checks that the user is a /mob/dead/new_player
*/
GLOBAL_DATUM_INIT(new_player_state, /datum/ui_state/new_player_state, new)
/datum/ui_state/new_player_state/can_use_topic(src_object, mob/user)
- if(isnewplayer(user) || check_rights_for(user.client, R_ADMIN))
- return UI_INTERACTIVE
- return UI_CLOSE
-
+ return isnewplayer(user) ? UI_INTERACTIVE : UI_CLOSE
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index f7278c86de4..ab8cd5f6246 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -29,6 +29,6 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate
/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
if(user.stat != CONSCIOUS)
return UI_CLOSE
- if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc)))
+ if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc)))
return UI_DISABLED
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index 018e0fa0304..b144a375757 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -28,5 +28,5 @@ GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
/mob/living/silicon/notcontained_can_use_topic(src_object)
return default_can_use_topic(src_object) // Silicons use default bevhavior.
-/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
+/mob/living/basic/drone/notcontained_can_use_topic(src_object)
return default_can_use_topic(src_object) // Drones use default bevhavior.
diff --git a/code/modules/tgui/states/standing.dm b/code/modules/tgui/states/standing.dm
new file mode 100644
index 00000000000..5d6a49c401e
--- /dev/null
+++ b/code/modules/tgui/states/standing.dm
@@ -0,0 +1,17 @@
+/**
+ * tgui state: standing_state
+ *
+ * Checks that the user isn't incapacitated and is standing upright
+ */
+
+GLOBAL_DATUM_INIT(standing_state, /datum/ui_state/not_incapacitated_state/standing, new)
+
+/datum/ui_state/not_incapacitated_state/standing
+
+/datum/ui_state/not_incapacitated_state/standing/can_use_topic(src_object, mob/user)
+ if (!isliving(user))
+ return ..()
+ var/mob/living/living_user = user
+ if (living_user.body_position)
+ return UI_DISABLED
+ return ..()
diff --git a/code/modules/tgui/status_composers.dm b/code/modules/tgui/status_composers.dm
index 4e9952b25ac..2836302fd06 100644
--- a/code/modules/tgui/status_composers.dm
+++ b/code/modules/tgui/status_composers.dm
@@ -57,7 +57,7 @@
/// Returns a UI status such that advanced tool users will be able to interact,
/// but everyone else can only watch.
/proc/ui_status_user_is_advanced_tool_user(mob/user)
- return user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE
+ return ISADVANCEDTOOLUSER(user) ? UI_INTERACTIVE : UI_UPDATE
/// Returns a UI status such that silicons will be able to interact with whatever
/// they would have access to if this was a machine. For example, AIs can
@@ -111,3 +111,11 @@
return UI_CLOSE
return UI_INTERACTIVE
+
+/// Return UI_INTERACTIVE if the user is inside the target atom, whether they can see it or not.
+/// Return UI_CLOSE otherwise.
+/proc/ui_status_user_inside(mob/user, atom/target)
+ if(target.contains(user))
+ return UI_INTERACTIVE
+
+ return UI_CLOSE
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 8386204e588..b889ab5b9af 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -11,7 +11,7 @@
var/mob/user
/// The object which owns the UI.
var/datum/src_object
- /// The title of te UI.
+ /// The title of the UI.
var/title
/// The window_id for browse() and onclose().
var/datum/tgui_window/window
@@ -37,8 +37,6 @@
var/datum/ui_state/state = null
/// Rate limit client refreshes to prevent DoS.
COOLDOWN_DECLARE(refresh_cooldown)
- /// Are byond mouse events beyond the window passed in to the ui
- var/mouse_hooked = FALSE
/**
* public
@@ -103,22 +101,25 @@
))
else
window.send_message("ping")
+ send_assets()
+ window.send_message("update", get_payload(
+ with_data = TRUE,
+ with_static_data = TRUE))
+ SStgui.on_open(src)
+
+ return TRUE
+
+/datum/tgui/proc/send_assets()
var/flush_queue = window.send_asset(get_asset_datum(
/datum/asset/simple/namespaced/fontawesome))
flush_queue |= window.send_asset(get_asset_datum(
/datum/asset/simple/namespaced/tgfont))
+ flush_queue |= window.send_asset(get_asset_datum(
+ /datum/asset/json/icon_ref_map))
for(var/datum/asset/asset in src_object.ui_assets(user))
flush_queue |= window.send_asset(asset)
if (flush_queue)
user.client.browse_queue_flush()
- window.send_message("update", get_payload(
- with_data = TRUE,
- with_static_data = TRUE))
- if(mouse_hooked)
- window.set_mouse_macro()
- SStgui.on_open(src)
-
- return TRUE
/**
* public
@@ -154,18 +155,6 @@
/datum/tgui/proc/set_autoupdate(autoupdate)
src.autoupdate = autoupdate
-/**
- * public
- *
- * Enable/disable passing through byond mouse events to the window
- *
- * required value bool Enable/disable hooking.
- */
-/datum/tgui/proc/set_mouse_hook(value)
- src.mouse_hooked = value
- //Handle unhooking/hooking on already open windows ?
-
-
/**
* public
*
@@ -241,13 +230,18 @@
json_data["config"] = list(
"title" = title,
"status" = status,
- "interface" = interface,
+ "interface" = list(
+ "name" = interface,
+ // "layout" = user.client.prefs.read_preference(src_object.layout_prefs_used),
+ "layout" = TGUI_LAYOUT_GRID,
+ ),
"refreshing" = refreshing,
"window" = list(
"key" = window_key,
"size" = window_size,
"fancy" = user.client.get_preference_value(/datum/client_preference/tgui_fancy),
"locked" = user.client.get_preference_value(/datum/client_preference/tgui_lock),
+ // "scale" = user.client.get_preference_value(/datum/client_preference/ui_scale),
),
"client" = list(
"ckey" = user.client.ckey,
@@ -275,7 +269,7 @@
* Run an update cycle for this UI. Called internally by SStgui
* every second or so.
*/
-/datum/tgui/Process(delta_time, force = FALSE)
+/datum/tgui/Process(seconds_per_tick, force = FALSE)
if(closing)
return
var/datum/host = src_object.ui_host(user)
diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm
index 4c311276279..34284dba42c 100644
--- a/code/modules/tgui/tgui_window.dm
+++ b/code/modules/tgui/tgui_window.dm
@@ -11,6 +11,7 @@
var/is_browser = FALSE
var/status = TGUI_WINDOW_CLOSED
var/locked = FALSE
+ var/visible = FALSE
var/datum/tgui/locked_by
var/datum/subscriber_object
var/subscriber_delegate
@@ -24,7 +25,8 @@
var/initial_inline_html
var/initial_inline_js
var/initial_inline_css
- var/mouse_event_macro_set = FALSE
+
+ var/list/oversized_payloads = list()
/**
* public
@@ -220,12 +222,11 @@
/datum/tgui_window/proc/close(can_be_suspended = TRUE)
if(!client)
return
- if(mouse_event_macro_set)
- remove_mouse_macro()
if(can_be_suspended && can_be_suspended())
log_tgui(client,
context = "[id]/close (suspending)",
window = src)
+ visible = FALSE
status = TGUI_WINDOW_READY
send_message("suspend")
return
@@ -233,6 +234,7 @@
context = "[id]/close",
window = src)
release_lock()
+ visible = FALSE
status = TGUI_WINDOW_CLOSED
message_queue = null
// Do not close the window to give user some time
@@ -301,6 +303,9 @@
if(istype(asset, /datum/asset/spritesheet))
var/datum/asset/spritesheet/spritesheet = asset
send_message("asset/stylesheet", spritesheet.css_filename())
+ else if(istype(asset, /datum/asset/spritesheet_batched))
+ var/datum/asset/spritesheet_batched/spritesheet = asset
+ send_message("asset/stylesheet", spritesheet.css_filename())
send_raw_message(asset.get_serialized_url_mappings())
/**
@@ -364,6 +369,9 @@
switch(type)
if("ping")
send_message("ping/reply", payload)
+ if("visible")
+ visible = TRUE
+ SEND_SIGNAL(src, COMSIG_TGUI_WINDOW_VISIBLE, client)
if("suspend")
close(can_be_suspended = TRUE)
if("close")
@@ -372,43 +380,48 @@
client << link(href_list["url"])
if("cacheReloaded")
reinitialize()
+ if("chat/resend")
+ SSchat.handle_resend(client, payload)
+ if("oversizedPayloadRequest")
+ var/payload_id = payload["id"]
+ var/chunk_count = payload["chunkCount"]
+ var/permit_payload = chunk_count <= CONFIG_GET(number/tgui_max_chunk_count)
+ if(permit_payload)
+ create_oversized_payload(payload_id, payload["type"], chunk_count)
+ send_message("oversizePayloadResponse", list("allow" = permit_payload, "id" = payload_id))
+ if("payloadChunk")
+ var/payload_id = payload["id"]
+ append_payload_chunk(payload_id, payload["chunk"])
+ send_message("acknowlegePayloadChunk", list("id" = payload_id))
// /datum/tgui_window/vv_edit_var(var_name, var_value)
// return var_name != NAMEOF(src, id) && ..()
-/datum/tgui_window/proc/set_mouse_macro()
- if(mouse_event_macro_set)
+/datum/tgui_window/proc/create_oversized_payload(payload_id, message_type, chunk_count)
+ if(oversized_payloads[payload_id])
+ stack_trace("Attempted to create oversized tgui payload with duplicate ID.")
return
-
- var/list/byondToTguiEventMap = list(
- "MouseDown" = "byond/mousedown",
- "MouseUp" = "byond/mouseup"
+ oversized_payloads[payload_id] = list(
+ "type" = message_type,
+ "count" = chunk_count,
+ "chunks" = list(),
+ "timeout" = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)
)
- for(var/mouseMacro in byondToTguiEventMap)
- var/command_template = ".output CONTROL PAYLOAD"
- var/event_message = TGUI_CREATE_MESSAGE(byondToTguiEventMap[mouseMacro], null)
- var target_control = is_browser \
- ? "[id]:update" \
- : "[id].browser:update"
- var/with_id = replacetext(command_template, "CONTROL", target_control)
- var/full_command = replacetext(with_id, "PAYLOAD", event_message)
-
- var/list/params = list()
- params["parent"] = "default" //Technically this is external to tgui but whatever
- params["name"] = mouseMacro
- params["command"] = full_command
-
- winset(client, "[mouseMacro]Window[id]Macro", params)
- mouse_event_macro_set = TRUE
+/datum/tgui_window/proc/append_payload_chunk(payload_id, chunk)
+ var/list/payload = oversized_payloads[payload_id]
+ if(!payload)
+ return
+ var/list/chunks = payload["chunks"]
+ chunks += chunk
+ if(length(chunks) >= payload["count"])
+ deltimer(payload["timeout"])
+ var/message_type = payload["type"]
+ var/final_payload = chunks.Join()
+ remove_oversized_payload(payload_id)
+ on_message(message_type, json_decode(final_payload), list("type" = message_type, "payload" = final_payload, "tgui" = TRUE, "window_id" = id))
+ else
+ payload["timeout"] = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE)
-/datum/tgui_window/proc/remove_mouse_macro()
- if(!mouse_event_macro_set)
- stack_trace("Unsetting mouse macro on tgui window that has none")
- var/list/byondToTguiEventMap = list(
- "MouseDown" = "byond/mousedown",
- "MouseUp" = "byond/mouseup"
- )
- for(var/mouseMacro in byondToTguiEventMap)
- winset(client, null, "[mouseMacro]Window[id]Macro.parent=null")
- mouse_event_macro_set = FALSE
+/datum/tgui_window/proc/remove_oversized_payload(payload_id)
+ oversized_payloads -= payload_id
diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm
index 55485c5cc76..119be13d0c9 100644
--- a/code/modules/tgui_input/alert.dm
+++ b/code/modules/tgui_input/alert.dm
@@ -1,7 +1,7 @@
/**
* Creates a TGUI alert window and returns the user's response.
*
- * This proc should be used to create alerts that the requester will wait for a response from.
+ * This proc should be used to create alerts that the caller will wait for a response from.
* Arguments:
* * user - The user to show the alert to.
* * message - The content of the alert, shown in the body of the TGUI window.
@@ -10,15 +10,19 @@
* * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout.
* * autofocus - The bool that controls if this alert should grab window focus.
*/
-/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE)
+/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state)
if (!user)
user = usr
if (!istype(user))
- if (istype(user, /client))
+ if (isclient(user))
var/client/client = user
user = client.mob
else
- return
+ return null
+
+ if(isnull(user.client))
+ return null
+
// A gentle nudge - you should not be using TGUI alert for anything other than a simple message.
if(length(buttons) > 3)
log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert")
@@ -29,7 +33,7 @@
return alert(user, message, title, buttons[1], buttons[2])
if(length(buttons) == 3)
return alert(user, message, title, buttons[1], buttons[2], buttons[3])
- var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus)
+ var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus, ui_state)
alert.ui_interact(user)
alert.wait()
if (alert)
@@ -59,20 +63,24 @@
var/autofocus
/// Boolean field describing if the tgui_alert was closed by the user.
var/closed
+ /// The TGUI UI state that will be returned in ui_state(). Default: always_state
+ var/datum/ui_state/state
-/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus)
+/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state)
src.autofocus = autofocus
src.buttons = buttons.Copy()
src.message = message
src.title = title
+ src.state = ui_state
if (timeout)
src.timeout = timeout
start_time = world.time
QDEL_IN(src, timeout)
-/datum/tgui_alert/Destroy(force, ...)
+/datum/tgui_alert/Destroy(force)
SStgui.close_uis(src)
- QDEL_NULL(buttons)
+ state = null
+ buttons?.Cut()
return ..()
/**
@@ -94,7 +102,7 @@
closed = TRUE
/datum/tgui_alert/ui_state(mob/user)
- return GLOB.always_state
+ return state
/datum/tgui_alert/ui_static_data(mob/user)
var/list/data = list()
@@ -103,7 +111,7 @@
data["message"] = message
/* data["large_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large)
data["swapped_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) */
- data["large_buttons"] = FALSE
+ data["large_buttons"] = TRUE
data["swapped_buttons"] = FALSE
data["title"] = title
return data
@@ -114,7 +122,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
-/datum/tgui_alert/ui_act(action, list/params)
+/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm
index 204848fd29c..5efaa846a30 100644
--- a/code/modules/tgui_input/list.dm
+++ b/code/modules/tgui_input/list.dm
@@ -16,7 +16,7 @@
if(!length(items))
return
if (!istype(user))
- if (istype(user, /client))
+ if (isclient(user))
var/client/client = user
user = client.mob
else
diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm
index 3133461299d..9f85cdf07df 100644
--- a/code/modules/tgui_input/number.dm
+++ b/code/modules/tgui_input/number.dm
@@ -19,7 +19,7 @@
if (!user)
user = usr
if (!istype(user))
- if (istype(user, /client))
+ if (isclient(user))
var/client/client = user
user = client.mob
else
diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm
index 020af14cea7..876c4476f67 100644
--- a/code/modules/tgui_input/say_modal/modal.dm
+++ b/code/modules/tgui_input/say_modal/modal.dm
@@ -36,6 +36,7 @@
/datum/tgui_say/New(client/client, id)
src.client = client
window = new(client, id)
+ winset(client, "tgui_say", "size=1,1;is-visible=0;")
window.subscribe(src, PROC_REF(on_message))
window.is_browser = TRUE
@@ -62,11 +63,15 @@
*/
/datum/tgui_say/proc/load()
window_open = FALSE
- winshow(client, "tgui_say", FALSE)
+
+ winset(client, "tgui_say", "pos=848,500;is-visible=0;")
+
window.send_message("props", list(
- lightMode = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode),
- maxLength = max_length,
+ "lightMode" = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode),
+ "scale" = client.prefs?.read_preference(/datum/preference/toggle/ui_scale),
+ "maxLength" = max_length,
))
+
stop_thinking()
return TRUE
@@ -82,11 +87,9 @@
if(!payload?["channel"])
CRASH("No channel provided to an open TGUI-Say")
window_open = TRUE
- if(payload["channel"] != OOC_CHANNEL)
+ if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL)
start_thinking()
- if(client.typing_indicators)
- log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators enabled.")
- else
+ if(!client.typing_indicators)
log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.")
return TRUE
@@ -97,9 +100,7 @@
/datum/tgui_say/proc/close()
window_open = FALSE
stop_thinking()
- if(client.typing_indicators)
- log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators enabled.")
- else
+ if(!client.typing_indicators)
log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators DISABLED.")
/**
@@ -117,10 +118,10 @@
close()
return TRUE
if (type == "thinking")
- if(payload["mode"] == TRUE)
+ if(payload["visible"] == TRUE)
start_thinking()
return TRUE
- if(payload["mode"] == FALSE)
+ if(payload["visible"] == FALSE)
stop_thinking()
return TRUE
return FALSE
diff --git a/code/modules/tgui_input/say_modal/speech.dm b/code/modules/tgui_input/say_modal/speech.dm
index 62d98b56d4c..0d95b855a15 100644
--- a/code/modules/tgui_input/say_modal/speech.dm
+++ b/code/modules/tgui_input/say_modal/speech.dm
@@ -33,17 +33,20 @@
/datum/tgui_say/proc/delegate_speech(entry, channel)
switch(channel)
if(SAY_CHANNEL)
- client.mob.say(entry)
+ client.mob.say_verb(entry)
return TRUE
if(RADIO_CHANNEL)
- client.mob.say(";" + entry)
+ client.mob.say_verb(";" + entry)
return TRUE
if(ME_CHANNEL)
- client.mob.me(entry)
+ client.mob.me_verb(entry)
return TRUE
if(OOC_CHANNEL)
client.ooc(entry)
return TRUE
+ if(ADMIN_CHANNEL)
+ SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry)
+ return TRUE
return FALSE
/**
@@ -65,6 +68,7 @@
log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators enabled.")
else
log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators DISABLED.")
+ SEND_SIGNAL(src, COMSIG_HUMAN_FORCESAY)
/**
* Handles text entry and forced speech.
diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm
index 61ebd7c3745..7fc6a93f294 100644
--- a/code/modules/tgui_input/say_modal/typing.dm
+++ b/code/modules/tgui_input/say_modal/typing.dm
@@ -36,49 +36,41 @@
/datum/preference/toggle/typing_indicator/apply_to_client(client/client, value)
client?.typing_indicators = value
-/** Sets the mob as "thinking" - with indicator and variable thinking_IC */
+/** Sets the mob as "thinking" - with indicator and the TRAIT_THINKING_IN_CHARACTER trait */
/datum/tgui_say/proc/start_thinking()
- if(!window_open || !client.typing_indicators)
+ if(!window_open)
return FALSE
- /// Special exemptions
- if(isabductor(client.mob))
- return FALSE
- client.mob.thinking_IC = TRUE
- client.mob.create_thinking_indicator()
+ return client.start_thinking()
/** Removes typing/thinking indicators and flags the mob as not thinking */
/datum/tgui_say/proc/stop_thinking()
- client.mob?.remove_all_indicators()
+ return client.stop_thinking()
/**
* Handles the user typing. After a brief period of inactivity,
* signals the client mob to revert to the "thinking" icon.
*/
/datum/tgui_say/proc/start_typing()
- client.mob.remove_thinking_indicator()
- if(!window_open || !client.typing_indicators || !client.mob.thinking_IC)
+ if(!window_open)
return FALSE
- client.mob.create_typing_indicator()
- addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE)
+ return client.start_typing()
/**
- * Callback to remove the typing indicator after a brief period of inactivity.
+ * Remove the typing indicator after a brief period of inactivity or during say events.
* If the user was typing IC, the thinking indicator is shown.
*/
/datum/tgui_say/proc/stop_typing()
- if(!client?.mob)
- return FALSE
- client.mob.remove_typing_indicator()
- if(!window_open || !client.typing_indicators || !client.mob.thinking_IC)
+ if(!window_open)
return FALSE
- client.mob.create_thinking_indicator()
+ client.stop_typing()
/// Overrides for overlay creation
/mob/living/create_thinking_indicator()
- if(active_thinking_indicator || active_typing_indicator || !thinking_IC || stat != CONSCIOUS )
+ if(active_thinking_indicator || active_typing_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER))
return FALSE
- active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE)
+ active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER)
add_overlay(active_thinking_indicator)
+ play_fov_effect(src, 6, "talk", ignore_self = TRUE)
/mob/living/remove_thinking_indicator()
if(!active_thinking_indicator)
@@ -87,10 +79,11 @@
active_thinking_indicator = null
/mob/living/create_typing_indicator()
- if(active_typing_indicator || active_thinking_indicator || !thinking_IC || stat != CONSCIOUS)
+ if(active_typing_indicator || active_thinking_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER))
return FALSE
- active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE)
+ active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER)
add_overlay(active_typing_indicator)
+ play_fov_effect(src, 6, "talk", ignore_self = TRUE)
/mob/living/remove_typing_indicator()
if(!active_typing_indicator)
@@ -99,7 +92,7 @@
active_typing_indicator = null
/mob/living/remove_all_indicators()
- thinking_IC = FALSE
+ REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT)
remove_thinking_indicator()
remove_typing_indicator()
diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm
index b229607d9ab..6f8911c1e1b 100644
--- a/code/modules/tgui_input/text.dm
+++ b/code/modules/tgui_input/text.dm
@@ -19,7 +19,7 @@
if (!user)
user = usr
if (!istype(user))
- if (istype(user, /client))
+ if (isclient(user))
var/client/client = user
user = client.mob
else
diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm
index 3e7dbc3178f..64717a03345 100644
--- a/code/modules/tgui_panel/external.dm
+++ b/code/modules/tgui_panel/external.dm
@@ -9,7 +9,7 @@
* tgui panel / chat troubleshooting verb
*/
/client/verb/fix_tgui_panel()
- set name = "Fix chat"
+ set name = "Fix Chat"
set category = "OOC"
var/action
log_tgui(src, "Started fixing.", context = "verb/fix_tgui_panel")
@@ -19,22 +19,19 @@
// Failed to fix, using tgalert as fallback
action = tgalert(src, "Did that work?", "", "Yes", "No, switch to old ui")
if (action == "No, switch to old ui")
- winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
- winset(src, "browseroutput", "is-disabled=1;is-visible=0")
+ winset(src, "output_selector.legacy_output_selector", "left=output_legacy")
log_tgui(src, "Failed to fix.", context = "verb/fix_tgui_panel")
/client/proc/nuke_chat()
// Catch all solution (kick the whole thing in the pants)
- winset(src, "output", "on-show=&is-disabled=0&is-visible=1")
- winset(src, "browseroutput", "is-disabled=1;is-visible=0")
+ winset(src, "output_selector.legacy_output_selector", "left=output_legacy")
if(!tgui_panel || !istype(tgui_panel))
log_tgui(src, "tgui_panel datum is missing",
context = "verb/fix_tgui_panel")
tgui_panel = new(src)
tgui_panel.initialize(force = TRUE)
// Force show the panel to see if there are any errors
- winset(src, "output", "is-disabled=1&is-visible=0")
- winset(src, "browseroutput", "is-disabled=0;is-visible=1")
+ winset(src, "output_selector.legacy_output_selector", "left=output_browser")
/client/verb/refresh_tgui()
set name = "Refresh TGUI"
diff --git a/code/modules/tgui_panel/telemetry.dm b/code/modules/tgui_panel/telemetry.dm
index 18e41247061..3abcb050f2a 100644
--- a/code/modules/tgui_panel/telemetry.dm
+++ b/code/modules/tgui_panel/telemetry.dm
@@ -66,76 +66,78 @@
if (!ckey)
return
- var/list/all_known_alts = GLOB.known_alts.load_known_alts()
- var/list/our_known_alts = list()
-
- for (var/known_alt in all_known_alts)
- if (known_alt[1] == ckey)
- our_known_alts += known_alt[2]
- else if (known_alt[2] == ckey)
- our_known_alts += known_alt[1]
-
- var/list/found
-
- var/list/query_data = list()
-
- for(var/i in 1 to len)
- if(QDELETED(client))
- // He got cleaned up before we were done
- return
- var/list/row = telemetry_connections[i]
-
- // Check for a malformed history object
- if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"]))
- return
-
- if (!isnull(GLOB.round_id))
- query_data += list(list(
- "telemetry_ckey" = row["ckey"],
- "address" = row["address"],
- "computer_id" = row["computer_id"],
- ))
-
- if (row["ckey"] in our_known_alts)
- continue
-
- if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE))
- found = row
- break
-
- CHECK_TICK
-
- // This fucker has a history of playing on a banned account.
- if(found)
- var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])"
- message_admins(msg)
- log_admin_private(msg)
- log_suspicious_login(msg, access_log_mirror = FALSE)
+ // var/list/all_known_alts = GLOB.known_alts.load_known_alts()
+ // var/list/our_known_alts = list()
+
+ // for (var/known_alt in all_known_alts)
+ // if (known_alt[1] == ckey)
+ // our_known_alts += known_alt[2]
+ // else if (known_alt[2] == ckey)
+ // our_known_alts += known_alt[1]
+
+ // var/list/found
+
+ // var/list/query_data = list()
+
+ // for(var/i in 1 to len)
+ // if(QDELETED(client))
+ // // He got cleaned up before we were done
+ // return
+ // var/list/row = telemetry_connections[i]
+
+ // // Check for a malformed history object
+ // if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"]))
+ // return
+
+ // if (!isnull(GLOB.game_id))
+ // query_data += list(list(
+ // "telemetry_ckey" = row["ckey"],
+ // "address" = row["address"],
+ // "computer_id" = row["computer_id"],
+ // ))
+
+ // if (row["ckey"] in our_known_alts)
+ // continue
+
+ // if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE))
+ // found = row
+ // break
+
+ // CHECK_TICK
+
+ // // This fucker has a history of playing on a banned account.
+ // if(found)
+ // var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])"
+ // message_admins(msg)
+ // // log_admin_private(msg)
+ // log_admin(msg)
+ // log_suspicious_login(msg, access_log_mirror = FALSE)
+ // log_suspicious_login(msg, access_log_mirror = FALSE)
// Only log them all at the end, since it's not as important as reporting an evader
- for (var/list/one_query as anything in query_data)
- var/datum/db_query/query = SSdbcore.NewQuery({"
- INSERT INTO [format_table_name("telemetry_connections")] (
- ckey,
- telemetry_ckey,
- address,
- computer_id,
- first_round_id,
- latest_round_id
- ) VALUES(
- :ckey,
- :telemetry_ckey,
- INET_ATON(:address),
- :computer_id,
- :round_id,
- :round_id
- ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id
- "}, list(
- "ckey" = ckey,
- "telemetry_ckey" = one_query["telemetry_ckey"],
- "address" = one_query["address"],
- "computer_id" = one_query["computer_id"],
- "round_id" = GLOB.round_id,
- ))
- query.Execute()
- qdel(query)
+ // for (var/list/one_query as anything in query_data)
+ // var/datum/DBQuery/query = dbcon.NewQuery({"
+ // INSERT INTO [format_table_name("telemetry_connections")] (
+ // ckey,
+ // telemetry_ckey,
+ // address,
+ // computer_id,
+ // first_round_id,
+ // latest_round_id
+ // ) VALUES(
+ // :ckey,
+ // :telemetry_ckey,
+ // INET_ATON(:address),
+ // :computer_id,
+ // :round_id,
+ // :round_id
+ // ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id
+ // "}, list(
+ // "ckey" = ckey,
+ // "telemetry_ckey" = one_query["telemetry_ckey"],
+ // "address" = one_query["address"],
+ // "computer_id" = one_query["computer_id"],
+ // "round_id" = GLOB.game_id,
+ // ))
+ // query.Execute()
+ // qdel(query)
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index fb1fcd92811..4baf7f2e18f 100644
--- a/code/modules/tgui_panel/tgui_panel.dm
+++ b/code/modules/tgui_panel/tgui_panel.dm
@@ -39,7 +39,7 @@
/datum/tgui_panel/proc/initialize(force = FALSE)
set waitfor = FALSE
// Minimal sleep to defer initialization to after client constructor
- sleep(1)
+ sleep(1 TICKS)
initialized_at = world.time
// Perform a clean initialization
window.initialize(
@@ -49,10 +49,11 @@
))
window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome))
window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont))
- window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat))
+ window.send_asset(get_asset_datum(/datum/asset/spritesheet_batched/chat))
// Other setup
request_telemetry()
addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS)
+ window.send_message("testTelemetryCommand")
/**
* private
@@ -61,7 +62,7 @@
*/
/datum/tgui_panel/proc/on_initialize_timed_out()
// Currently does nothing but sending a message to old chat.
- SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.")
+ SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.")
/**
* private
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index 8ba08fbe814..50a874fa44c 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(unit_test_mapping_logs)
var/annotation_text = replacetext(text, "%", "%25")
annotation_text = replacetext(annotation_text, "\n", "%0A")
- log_world("::error file=[file],line=[line],title=[station_name]: [test_path]::[annotation_text]")
+ log_world("::error file=[file],line=[line],title=[station_name()]: [test_path]::[annotation_text]")
// Normal log message
log_entry += "\tREASON #[reasonID]: [text] at [file]:[line]"
diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
index 790a4fadd17..2ec7f45126b 100644
--- a/code/modules/vehicles/cargo_train.dm
+++ b/code/modules/vehicles/cargo_train.dm
@@ -163,10 +163,10 @@
if(is_train_head() && ishuman(load))
var/mob/living/carbon/human/D = load
- to_chat(D, "\red \b You ran over [H]!")
+ to_chat(D, span_red("\b You ran over [H]!"))
visible_message("\red \The [src] ran over [H]!")
attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])")
- msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)")
+ msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). [ADMIN_JMP(src)]")
else
attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])")
@@ -245,7 +245,7 @@
turn_off()
key.loc = usr.loc
- if(!usr.get_active_hand())
+ if(!usr.get_active_held_item())
usr.put_in_hands(key)
key = null
diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm
index 863496bb0d6..7ea8564931e 100644
--- a/code/modules/vehicles/train.dm
+++ b/code/modules/vehicles/train.dm
@@ -48,7 +48,7 @@
if(emagged)
if(isliving(A))
var/mob/living/M = A
- visible_message("\red [src] knocks over [M]!")
+ visible_message(span_red("[src] knocks over [M]!"))
M.apply_effects(5, 5) //knock people down if you hit them
M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going
@@ -62,8 +62,8 @@
if(ishuman(load))
var/mob/living/D = load
- to_chat(D, "\red You hit [M]!")
- msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)")
+ to_chat(D, span_red("You hit [M]!"))
+ msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. [ADMIN_JMP(src)]")
//-------------------------------------------
@@ -93,7 +93,7 @@
unload(user, direction)
- to_chat(user, "\blue You climb down from [src].")
+ to_chat(user, span_blue("You climb down from [src]."))
return 1
@@ -104,7 +104,7 @@
latch(C, user)
else
if(!load(C))
- to_chat(user, "\red You were unable to load [C] on [src].")
+ to_chat(user, span_red("You were unable to load [C] on [src]."))
/obj/vehicle/train/attack_hand(mob/user as mob)
if(user.stat || user.restrained() || !Adjacent(user))
@@ -142,22 +142,22 @@
//Note: there is a modified version of this in code\modules\vehicles\cargo_train.dm specifically for cargo train engines
/obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user)
if (get_dist(src, T) > 1)
- to_chat(user, "\red [src] is too far away from [T] to hitch them together.")
+ to_chat(user, span_red("[src] is too far away from [T] to hitch them together."))
return
if (lead)
- to_chat(user, "\red [src] is already hitched to something.")
+ to_chat(user, span_red("[src] is already hitched to something."))
return
if (T.tow)
- to_chat(user, "\red [T] is already towing something.")
+ to_chat(user, span_red("[T] is already towing something."))
return
//check for cycles.
var/obj/vehicle/train/next_car = T
while (next_car)
if (next_car == src)
- to_chat(user, "\red That seems very silly.")
+ to_chat(user, span_red("That seems very silly."))
return
next_car = next_car.lead
@@ -167,7 +167,7 @@
set_dir(lead.dir)
if(user)
- to_chat(user, "\blue You hitch [src] to [T].")
+ to_chat(user, span_blue("You hitch [src] to [T]."))
update_stats()
@@ -175,13 +175,13 @@
//detaches the train from whatever is towing it
/obj/vehicle/train/proc/unattach(mob/user)
if (!lead)
- to_chat(user, "\red [src] is not hitched to anything.")
+ to_chat(user, span_red("[src] is not hitched to anything."))
return
lead.tow = null
lead.update_stats()
- to_chat(user, "\blue You unhitch [src] from [lead].")
+ to_chat(user, span_blue("You unhitch [src] from [lead]."))
lead = null
update_stats()
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index cc16f15285b..0020a4686ab 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -118,7 +118,7 @@
if(I.use_tool(user, src, WORKTIME_NORMAL, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC))
health = min(maxhealth, health+10)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
- user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
+ user.visible_message(span_red("[user] repairs [src]!"), span_blue("You repair [src]!"))
return
if(ABORT_CHECK)
diff --git a/code/modules/webhook/webhook.dm b/code/modules/webhook/webhook.dm
index 14e46e16e97..a6819c898b1 100644
--- a/code/modules/webhook/webhook.dm
+++ b/code/modules/webhook/webhook.dm
@@ -1,26 +1,26 @@
#define RESTART_WEBHOOK "restart"
/proc/call_restart_webhook()
- if (!config.webhook_url || !config.webhook_key)
+ if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key))
return
spawn(0)
var/message = "<@&546427101247438849> Restart!"
var/query_string = "type=restart"
- query_string += "&key=[url_encode(config.webhook_key)]"
+ query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]"
query_string += "&msg=[url_encode(message)]"
- world.Export("[config.webhook_url]?[query_string]")
+ world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]")
/proc/lobby_message(var/message = "Debug Message", var/color = "#FFFFFF", var/sender)
- if (!config.webhook_url || !config.webhook_key)
+ if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key))
return
spawn(0)
var/query_string = "type=lobbyalert"
- query_string += "&key=[url_encode(config.webhook_key)]"
+ query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]"
query_string += "&msg=[url_encode(message)]"
query_string += "&color=[url_encode(color)]"
if(sender)
query_string += "&from=[url_encode(sender)]"
- world.Export("[config.webhook_url]?[query_string]")
+ world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]")
/client/proc/discord_msg()
set name = "Message Lobby"
@@ -35,7 +35,7 @@
/proc/send2adminchat(var/initiator, var/original_msg)
- if (!config.webhook_url || !config.webhook_key)
+ if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key))
return
var/list/adm = get_admin_counts()
@@ -44,49 +44,36 @@
spawn(0) //Unreliable world.Exports()
var/query_string = "type=adminhelp"
- query_string += "&key=[url_encode(config.webhook_key)]"
+ query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]"
query_string += "&from=[url_encode(initiator)]"
query_string += "&msg=[url_encode(html_decode(original_msg))]"
query_string += "&admin_number=[allmins.len]"
query_string += "&admin_number_afk=[afkmins.len]"
- world.Export("[config.webhook_url]?[query_string]")
+ world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]")
/proc/send_adminalert2adminchat(var/message = "Debug Message", var/color = "#FFFFFF", var/sender)
- if (!config.webhook_url || !config.webhook_key)
+ if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key))
return
spawn(0)
var/query_string = "type=adminalert"
- query_string += "&key=[url_encode(config.webhook_key)]"
+ query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]"
query_string += "&msg=[url_encode(message)]"
query_string += "&color=[url_encode(color)]"
if(sender)
query_string += "&from=[url_encode(sender)]"
- world.Export("[config.webhook_url]?[query_string]")
-
-/proc/get_admin_counts(requiredflags = R_ADMIN)
- . = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list())
- for(var/client/X in GLOB.admins)
- .["total"] += X
- if(requiredflags != 0 && !check_rights(R_ADMIN, 0, X))
- .["noflags"] += X
- else if(X.is_afk())
- .["afk"] += X
- else if(X.holder.fakekey)
- .["stealth"] += X
- else
- .["present"] += X
+ world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]")
/proc/send2coders(var/message = "Debug Message", var/color = "#FFFFFF", var/sender, var/admiralty = 0)
- if (!config.webhook_url || !config.webhook_key)
+ if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key))
return
spawn(0)
var/query_string = "type=codealert"
if(admiralty)
query_string = "type=admiraltyalert"
- query_string += "&key=[url_encode(config.webhook_key)]"
+ query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]"
query_string += "&msg=[url_encode(message)]"
query_string += "&color=[url_encode(color)]"
if(sender)
query_string += "&from=[url_encode(sender)]"
- world.Export("[config.webhook_url]?[query_string]")
+ world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]")
diff --git a/code/stylesheet.dm b/code/stylesheet.dm
index 7a1ca8bec47..08f68ec0c77 100644
--- a/code/stylesheet.dm
+++ b/code/stylesheet.dm
@@ -23,7 +23,12 @@ em {font-style: normal;font-weight: bold;}
.ooc .elevated {color: #2e78d9;}
.ooc .moderator {color: #184880;}
.ooc .developer {color: #1b521f;}
-.ooc .admin {color: #b82e00;}
+.ooc {color: #b82e00;}
+.adminobserverooc {color: #0099cc; font-weight: bold;}
+.adminooc {color: #700038; font-weight: bold;}
+
+.adminsay {color: #FF4500; font-weight: bold;}
+.admin {color: #386aff; font-weight: bold;}
/* Admin: Private Messages */
.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;}
@@ -65,7 +70,7 @@ em {font-style: normal;font-weight: bold;}
.alert {color: #ff0000;}
h1.alert, h2.alert {color: #000000;}
-.emote {font-style: italic;}
+.emote {}
/* Game Messages */
diff --git a/config/.gitignore b/config/.gitignore
index ec7ed9b452e..000b0d6b099 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1,3 +1,4 @@
#ignore everything here, except subdirectories.
*
!*/
+!example/*
diff --git a/config/example/access levels.txt b/config/example/access levels.txt
deleted file mode 100644
index e6c0519069a..00000000000
--- a/config/example/access levels.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-HOW TO CONVERT A MAP TO THE NEW (june 2008) ACCESS LEVEL SYSTEM
-1. Open the .dmp file up in Notepad
-2. Find all the "access = blahblah" attributes of doors.
-3. Delete them.
-4. Open the map up in Dream Maker. If you didn't get them all, it'll tell you so.
-5. Assign the existing doors new access permissions using the method below.
-
-HOW TO MAKE A MAP USING THE NEW (june 2008) ACCESS LEVEL SYSTEM
-1. Make a map as normal
-2. Select a door that you want to not be accessible to everybody
-3. Right click on it and edit its attributes
-4. Make the "req_access_txt" attribute be a semicolon-separated list of the permissions required to open the doors
-5. Repeat for all doors.
-
-For example, a brig door would have it be "2" while a door that requires you have toxins and teleporter access (for whatever reason) would have it be "9;20"
-
-Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version):
-
-access_security = 1
-access_brig = 2
-access_armory = 3
-access_forensics_lockers= 4
-access_medical = 5
-access_morgue = 6
-access_tox = 7
-access_tox_storage = 8
-access_genetics = 9
-access_engine = 10
-access_engine_equip= 11
-access_maint_tunnels = 12
-access_external_airlocks = 13
-access_emergency_storage = 14
-access_change_ids = 15
-access_ai_upload = 16
-access_teleporter = 17
-access_eva = 18
-access_heads = 19
-access_captain = 20
-access_all_personal_lockers = 21
-access_chapel_office = 22
-access_tech_storage = 23
-access_atmospherics = 24
-access_bar = 25
-access_janitor = 26
-access_crematorium = 27
-access_kitchen = 28
-access_robotics = 29
-access_rd = 30
-access_cargo = 31
-access_construction = 32
-access_chemistry = 33
-access_cargo_bot = 34
-access_hydroponics = 35
-access_manufacturing = 36
-access_library = 37
-access_lawyer = 38
-access_virology = 39
-access_cmo = 40
-access_qm = 41
-access_court = 42
-access_clown = 43
-access_mime = 44
-access_surgery = 45
-access_theatre = 46
-access_research = 47
-access_mining = 48
-access_mining_office = 49 //not in use
-access_mailsorting = 50
-access_mint = 51
-access_mint_vault = 52
-access_heads_vault = 53
-access_mining_station = 54
-access_xenobiology = 55
-access_ce = 56
-access_hop = 57
-access_hos = 58
-access_RC_announce = 59 //Request console announcements
-access_keycard_auth = 60 //Used for events which require at least two people to confirm them
-access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
\ No newline at end of file
diff --git a/config/example/comms.txt b/config/example/comms.txt
new file mode 100644
index 00000000000..e316fe36161
--- /dev/null
+++ b/config/example/comms.txt
@@ -0,0 +1,29 @@
+## Communication key for receiving data through world/Topic(), you don't want to give this out.
+## Must be set to something other than 'default_pwd' and at least 7 characters long to be valid.
+#COMMS_KEY default_pwd
+
+## World address and port for server receiving cross server messages
+## Use '+' to denote spaces in ServerName
+## Repeat this entry to add more servers
+#CROSS_SERVER ServerName byond:\\address:port
+
+## Name that the server calls itself in communications
+#CROSS_COMMS_NAME
+
+## Network-name used for cross-server broadcasts made from communication consoles.
+## Servers that do not match this network-name will have their messages discarded.
+## Leaving this commented will allow all messages through, regardless of network.
+#CROSS_COMMS_NETWORK default_network
+
+
+## Uncomment to enable sending data to the IRC bot.
+#USE_IRC_BOT
+
+## Host where the IRC bot is hosted. Port 45678 needs to be open.
+#IRC_BOT_HOST localhost
+
+## IRC channel to send information to. Leave blank to disable.
+#MAIN_IRC #main
+
+## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc.
+#ADMIN_IRC #admin
diff --git a/config/example/config.txt b/config/example/config.txt
index 3fd7a03dd75..86f8d580f58 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -1,13 +1,29 @@
-## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice
+# You can use the "$include" directive to split your configs however you want
+
+$include game_options.txt
+$include dbconfig.txt
+$include comms.txt
+$include resources.txt
+$include ipconfig.txt
+$include logging.txt
+
+# You can use the @ character at the beginning of a config option to lock it from being edited in-game
+# Example usage:
+# @SERVERNAME tgstation
+# Which sets the SERVERNAME, and disallows admins from being able to change it using View Variables.
+# @LOG_TWITTER 0
+# Which explicitly disables LOG_TWITTER, as well as locking it.
+# There are various options which are hard-locked for security reasons.
+
+# Hashtags at the beginning of lines will not be parsed. This only applies at the beginning of the line.
+# If you include a hashtag in a setting like so: MYHEXCOLORCONFIG #FF73D2
+# It will still be parsed
+
+## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name()" where station_name() is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice
SERVERNAME CEV Eris: Endless Horizon
-## Alert levels
-ALERT_GREEN All threats to the ship have passed. Security may not have weapons visible, privacy laws are once again fully enforced.
-ALERT_BLUE_UPTO The ship has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted.
-ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed.
-ALERT_RED_UPTO There is an immediate serious threat to the ship. Security may have weapons unholstered at all times. Random searches are allowed and advised.
-ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the ship. Security may have weapons unholstered at all times, random searches are allowed and advised.
-ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill.
+## set a hosted by name for unix platforms
+HOSTEDBY yournamehere
## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system.
#ADMIN_LEGACY_SYSTEM
@@ -18,8 +34,26 @@ ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are in
## Enables the memo system for admins, used to log on each player
ADMIN_MEMO_SYSTEM
-## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments.
-JOBS_HAVE_MINIMAL_ACCESS
+## Uncomment to block all attempts to profile, for performance reasons
+#FORBID_ALL_PROFILING
+
+## Uncomment to block granting profiling privileges to users with R_DEBUG, for performance purposes
+#FORBID_ADMIN_PROFILING
+
+## Can mods tempban?
+MODS_CAN_TEMPBAN
+
+## Can mods job tempban?
+MODS_CAN_JOB_TEMPBAN
+
+## Max amount of time mods can tempban for, in minutes
+MOD_TEMPBAN_MAX
+
+## Max amount of time mods can tempban for, in minutes
+MOD_JOB_TEMPBAN_MAX
+
+## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools.
+#ROUNDS_UNTIL_HARD_RESTART 10
## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing
## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job.
@@ -35,98 +69,24 @@ JOBS_HAVE_MINIMAL_ACCESS
## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental
#USE_RECURSIVE_EXPLOSIONS
-## log OOC channel
-LOG_OOC
-
-## log client Say
-LOG_SAY
-
-## log admin actions
-LOG_ADMIN
-
-## log client access (logon/logoff)
-LOG_ACCESS
-
-## log game actions (start of round, results, etc.)
-LOG_GAME
-
-## log player votes
-LOG_VOTE
-
-## log debug messages
-##LOG_DEBUG
-
-## log client Whisper
-LOG_WHISPER
-
-## log emotes
-LOG_EMOTE
-
-## log attack messages
-LOG_ATTACK
-
-## log pda messages
-LOG_PDA
-
-## log all Topic() calls (for use by coders in tracking down Topic issues)
-LOG_HREFS
-
-## log world.log and runtime errors to a file
-LOG_RUNTIME
-
-## log admin warning messages
-##LOG_ADMINWARN ## Also duplicates a bunch of other messages.
-
-## sql switching
-SQL_ENABLED
-
## disconnect players who did nothing during 10 minutes
# KICK_INACTIVE
+## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog
+#AGGRESSIVE_CHANGELOG
+
## Use Mentors instead of Moderators. Mentors are designed with the idea that
###they help in pushing new people to be better at roleplay. If you uncomment
###this it will reduce the rights that your mods have.
#MENTORS
-## probablities for game modes chosen in "secret" and "random" modes
-##
-## default probablity is 1, increase to make that mode more likely to be picked
-## set to 0 to disable that mode
-PROBABILITY EXTENDED 1
-PROBABILITY MALFUNCTION 1
-PROBABILITY NUCLEAR 1
-PROBABILITY WIZARD 1
-PROBABILITY CHANGELING 1
-PROBABILITY CULT 1
-PROBABILITY EXTEND-A-TRAITORMONGOUS 6
-
-## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on.
-#GENERATE_ASTEROID
-
-## Hash out to disable random events during the round.
-ALLOW_RANDOM_EVENTS
-
-## if amount of traitors scales or not
-TRAITOR_SCALING
-
-## if objectives are disabled
-#OBJECTIVES_DISABLED
-
-## make ERT's be only called by admins
-ERT_ADMIN_ONLY
-
-## If security is prohibited from being most antagonists
-#PROTECT_ROLES_FROM_ANTAGONIST
-
## Comment this out to stop admins being able to choose their personal ooccolor
ALLOW_ADMIN_OOCCOLOR
-## If metadata is supported
-# ALLOW_METADATA
+## Comment this out to stop admins being able to choose their personal asay color
+ALLOW_ADMIN_ASAYCOLOR
-## allow players to initiate a restart vote
-#ALLOW_VOTE_RESTART
## allow players to initate a mode-change start
#ALLOW_VOTE_MODE
@@ -141,13 +101,10 @@ VOTE_PERIOD 600
#VOTE_AUTOGAMEMODE_TIMELEFT 100
## prevents dead players from voting or starting votes
-#NO_DEAD_VOTE
-
-## players' votes default to "No vote" (otherwise, default to "No change")
-DEFAULT_NO_VOTE
+#VOTE_NO_DEAD
## Allow ghosts to see antagonist through AntagHUD
-ALLOW_ANTAG_HUD
+ANTAG_HUD_ALLOWED
## If ghosts use antagHUD they are no longer allowed to join the round.
ANTAG_HUD_RESTRICTED
@@ -155,22 +112,39 @@ ANTAG_HUD_RESTRICTED
## allow AI job
ALLOW_AI
-
## disable abandon mob
# NORESPAWN
-## disables calling del(src) on newmobs if they logout before spawnin in
-# DONT_DEL_NEWMOB
+## Amount of time, in minutes, users must wait to respawn (as a human, assuming the server has respawn enabled)
+RESPAWN_DELAY 30
-## set a hosted by name for unix platforms
-HOSTEDBY yournamehere
+## Uncomment to allow guests
+#GUESTS_ALLOWED
+## Prevents players form playing as mice
+#DISABLE_PLAYER_MICE
+
+## Prevent newly-spawned mice from understanding human speech
+#UNEDUCATED_MICE
+
+## Can ghosts possess animals?
+GHOSTS_CAN_POSSESS_ANIMALS
+
+## Basically the flag for respawn.
+#ABANDON_ALLOWED
+
+## Can drones spawn?
+ALLOW_DRONE_SPAWN
+
+## How many maint drone can spawn?
+MAX_MAINT_DRONES 5
+
+## A drone will become available every X ticks since last drone spawn. Default is 2 minutes.
+DRONE_BUILD_TIME 1200
## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
## Set to 1 to jobban them from those positions, set to 0 to allow them.
GUEST_JOBBAN
-## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting)
-GUEST_BAN
## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions.
## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans)
# USEWHITELIST
@@ -193,9 +167,11 @@ GUEST_BAN
##Github address
GITHUBURL https://github.com/Endless-Horizon/CEV-Eris
-## In-game features
-## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard
-# FEATURE_OBJECT_SPELL_SYSTEM
+## Sets an MOTD of the server.
+## You can use this multiple times, and the MOTDs will be appended in order.
+## Based on config directory, so "motd.txt" points to "config/motd.txt"
+MOTD motd.txt
+#MOTD motd_extra.txt
##Toggle for having jobs load up from the .txt
# LOAD_JOBS_FROM_TXT
@@ -207,16 +183,14 @@ GITHUBURL https://github.com/Endless-Horizon/CEV-Eris
## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off)
#POPUP_ADMIN_PM
-## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
-ALLOW_HOLIDAYS
-## Defines the FPS for the world. 30 is the normal one, 45+ is smoother.
-FPS 40
-## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered.
-#TICKCOMP
+##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second).
+## This also controls the client network update rate, as well as the default client fps
+TICKLAG 0.5
-## Whether the server will talk to other processes through socket_talk
-SOCKET_TALK 0
+## Defines the FPS for the world. 30 is the normal one, 45+ is smoother.
+## (It's actually TPS (ticks per second) but lummox cant be bothered to change it.)
+FPS 40
## Uncomment this to ban use of ToR
#TOR_BAN
@@ -224,36 +198,11 @@ SOCKET_TALK 0
## Comment this out to disable automuting
#AUTOMUTE_ON
-## How long the delay is before the Away Mission gate opens. Default is half an hour.
-GATEWAY_DELAY 18000
-
-## Remove the # to give assistants maint access.
-ASSISTANT_MAINT
-
-## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked.
-## Malf and Rev will let the shuttle be called when the antags/protags are dead.
-#CONTINUOUS_ROUNDS
-
##Remove the # to let ghosts spin chairs
GHOST_INTERACTION
-## Password used for authorizing ircbot and other external tools.
-#COMMS_PASSWORD
-
#FORBID_ADMIN_PROFILING
-## Uncomment to enable sending data to the IRC bot.
-#USE_IRC_BOT
-
-## Host where the IRC bot is hosted. Port 45678 needs to be open.
-#IRC_BOT_HOST localhost
-
-## IRC channel to send information to. Leave blank to disable.
-#MAIN_IRC #main
-
-## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc.
-#ADMIN_IRC #admin
-
## Path to the python2 executable on the system. Leave blank for default.
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
#PYTHON_PATH
@@ -262,45 +211,14 @@ GHOST_INTERACTION
## This helps security and stability on Linux, but you need to compile the library first.
#USE_LIB_NUDGE
-## Uncommen to allow ghosts to write in blood during Cult rounds.
-#ALLOW_CULT_GHOSTWRITER
-
-## Sets the minimum number of cultists needed for ghosts to write in blood.
-REQ_CULT_GHOSTWRITER 6
-
-
-## Determines whether bones can be broken through excessive damage to the organ
-## 0 means bones can't break, 1 means they can
-BONES_CAN_BREAK 1
-## Determines whether limbs can be amputated through excessive damage to the organ
-## 0 means limbs can't be amputated, 1 means they can
-LIMBS_CAN_BREAK 1
-
-## Uncomment this to prevent players from printing copy/pasted circuits
-# DISABLE_CIRCUIT_PRINTING
-
-### REVIVAL ###
-
-## whether pod plants work or not
-REVIVAL_POD_PLANTS 1
-
-## whether cloning tubes work or not
-REVIVAL_CLONING 1
-
-## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
-REVIVAL_BRAIN_LIFE -1
+## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools.
+#ROUNDS_UNTIL_HARD_RESTART 10
### Miscellaneous ###
## Config options which, of course, don't fit into previous categories.
-## Remove the # in front of this config option to have loyalty implants spawn by default on your server.
-#USE_LOYALTY_IMPLANTS
-
-## Remove # if you want your server have the Luna's job system
-JOIN_UNASSIGNED
-
## Uncomment to use overmap system for zlevel travel
#USE_OVERMAP
@@ -333,36 +251,58 @@ WEBHOOK_KEY testkey
# Enable/disable IP reputation checking (present/nonpresent)
#IP_REPUTATION
-# Set the e-mail address problems can go to for IPR checks (e-mail address)
+## Set the e-mail address problems can go to for IPR checks (e-mail address)
IPR_EMAIL whatever@whatever.com
-# Above this value, reputation scores are considered 'bad' (number)
+## Above this value, reputation scores are considered 'bad' (number)
IPR_BAD_SCORE 1
-# If you want the people disconnected. Otherwise it just logs. (present/nonpresent)
+## If you want the people disconnected. Otherwise it just logs. (present/nonpresent)
IPR_BLOCK_BAD_IPS
-# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent)
+## If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent)
IPR_ALLOW_EXISTING
-# And what that age is (number)
+## And what that age is (number)
IPR_MINIMUM_AGE 5
-# If provided, will look up additional IP reputation info from ipqualityscore.com
+## If provided, will look up additional IP reputation info from ipqualityscore.com
#IPQUALITYSCORE_APIKEY ABC12345YOURKEYHERE
###### Antiraid Settings
-# Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins)
+## Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins)
#PARANOIA_LOGGING
-# Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB)
+## Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB)
#PANIC_BUNKER
-# Set start location for CEV Eris uncomment ONE only.
-RANDOM_START
-#ASTEROID_START
-#FORTRESS_START
-#RUINS_START
+###### DEBUG
+
+## Uncomment to enable debugging admin hrefs
+#DEBUG_ADMIN_HREFS
+
+## Causes configuration errors to spit out runtimes
+CONFIG_ERRORS_RUNTIME
+
+# Something related to debugging.
+#DEBUGPARANOID
+
+##Error handling related options
+## The "cooldown" time for each occurence of a unique error
+#ERROR_COOLDOWN 600
+
+## How many occurences before the next will silence them
+#ERROR_LIMIT 90
+
+## How long a unique error will be silenced for
+#ERROR_SILENCE_TIME 6000
+
+##How long to wait between messaging admins about occurences of a unique error
+#ERROR_MSG_DELAY 50
+
+
+## Uncomment to allow admins with +DEBUG to start the byond-tracy profiler during the round.
+#ALLOW_TRACY_START
-# Generate loot data.
-#GENERATE_LOOT_DATA
+## Uncomment to allow admins with +DEBUG to queue the next round to run the byond-tracy profiler.
+#ALLOW_TRACY_QUEUE
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index 84f3d26cec5..8e374187797 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -8,10 +8,10 @@ ADDRESS localhost
PORT 3306
# Database the population, death, karma, etc. tables may be found in
-DATABASE ceveris
+FEEDBACK_DATABASE ceveris
# Username/Login used to access the database
-LOGIN mylogin
+FEEDBACK_LOGIN mylogin
# Password used to access the database
-PASSWORD mypassword
+FEEDBACK_PASSWORD mypassword
diff --git a/config/example/game_options.txt b/config/example/game_options.txt
index 8b62f92f94d..16ac97f7a17 100644
--- a/config/example/game_options.txt
+++ b/config/example/game_options.txt
@@ -1,3 +1,17 @@
+### WORLD ###
+
+## Where the ship starts off in the universe. Options are: asteroid, space ruins, abandoned fortress, or random
+START_LOCATION asteroid
+
+## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on.
+#GENERATE_ASTEROID
+
+## Generate loot data.
+#GENERATE_LOOT_DATA
+
+## Hash out to disable random events during the round.
+ALLOW_RANDOM_EVENTS
+
### HEALTH ###
## level of health at which a mob goes into continual shock (soft crit)
@@ -9,36 +23,32 @@ HEALTH_THRESHOLD_CRIT -50
## level of health at which a mob becomes dead
HEALTH_THRESHOLD_DEAD -100
-## Determines whether bones can be broken through excessive damage to the organ
-## 0 means bones can't break, 1 means they can
-BONES_CAN_BREAK 1
## Determines whether limbs can be amputated through excessive damage to the organ
## 0 means limbs can't be amputated, 1 means they can
LIMBS_CAN_BREAK 1
-## multiplier which enables organs to take more damage before bones breaking or limbs being destroyed
-## 100 means normal, 50 means half
-ORGAN_HEALTH_MULTIPLIER 100
-
-## multiplier which influences how fast organs regenerate naturally
-## 100 means normal, 50 means half
-ORGAN_REGENERATION_MULTIPLIER 75
-
### REVIVAL ###
-## whether pod plants work or not
-REVIVAL_POD_PLANTS 1
-
-## whether cloning tubes work or not
-REVIVAL_CLONING 1
-
## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite)
REVIVAL_BRAIN_LIFE -1
-
### Miscellaneous ###
## Config options which, of course, don't fit into previous categories.
-## Remove the # in front of this config option to have loyalty implants spawn by default on your server.
-#USE_LOYALTY_IMPLANTS
+## If security is prohibited from being most antagonists
+#PROTECT_ROLES_FROM_ANTAGONIST
+
+## Reduces view range when wearing welding helmets
+WELDER_VISION
+
+## Enter the hexcode for the light given off by space/stars
+STARLIGHT #FFFFFF
+
+## Allows shooting between z-levels
+Z_LEVEL_SHOOTING
+
+### AI
+
+## law zero for the AI
+#LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010
diff --git a/config/example/ipconfig.txt b/config/example/ipconfig.txt
new file mode 100644
index 00000000000..62858c69a10
--- /dev/null
+++ b/config/example/ipconfig.txt
@@ -0,0 +1,21 @@
+# Should we query IPs to get scores? Generates HTTP traffic to an API service.
+#IP_REPUTATION
+
+# Left null because you MUST specify one otherwise you're making the internet worse.
+#IPR_EMAIL example@example.com
+
+# Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat).
+#IPR_BLOCK_BAD_IPS
+
+# The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad.
+IPR_BAD_SCORE 1
+
+# Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect.
+#IPR_ALLOW_EXISTING
+
+# How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs.
+#IPR_MINIMUM_AGE = 5
+
+# API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided.
+#IPQUALITYSCORE_APIKEY ABCDEFGHIJKLMAOPQRSTUVQWXYZ
+
diff --git a/config/example/job_playtimes_template.txt b/config/example/job_playtimes_template.txt
new file mode 100644
index 00000000000..a2baee5f0db
--- /dev/null
+++ b/config/example/job_playtimes_template.txt
@@ -0,0 +1,31 @@
+Vagabond=0
+Captain=0
+First Officer=0
+NeoTheology Preacher=0
+NeoTheology Acolyte=0
+NeoTheology Agrolyte=0
+NeoTheology Custodian=0
+Club Manager=0
+Club Worker=0
+Club Artist=0
+Technomancer Exultant=0
+Technomancer=0
+Guild Merchant=0
+Guild Technician=0
+Guild Miner=0
+Moebius Biolab Officer=0
+Moebius Doctor=0
+Moebius Chemist=0
+Moebius Paramedic=0
+Moebius Bio-Engineer=0
+Moebius Expedition Overseer=0
+Moebius Scientist=0
+Moebius Roboticist=0
+Moebius Psychiatrist=0
+Ironhammer Commander=0
+Ironhammer Gunnery Sergeant=0
+Ironhammer Inspector=0
+Ironhammer Medical Specialist=0
+Ironhammer Operative=0
+AI=0
+Robot=0
diff --git a/config/example/jobs.txt b/config/example/jobs.txt
deleted file mode 100644
index 060cf2d6a73..00000000000
--- a/config/example/jobs.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Captain=1
-Head of Personnel=1
-Head of Security=1
-Chief Engineer=1
-Research Director=1
-Chief Medical Officer=1
-
-Station Engineer=5
-Roboticist=1
-
-Medical Doctor=5
-Geneticist=2
-Virologist=1
-
-Scientist=3
-Chemist=2
-
-Bartender=1
-Botanist=2
-Chef=1
-Janitor=1
-Quartermaster=1
-Shaft Miner=3
-
-Warden=1
-Detective=1
-Security Officer=5
-
-Assistant=-1
-Atmospheric Technician=4
-Cargo Technician=3
-Chaplain=1
-Lawyer=2
-Librarian=1
-
-AI=1
-Cyborg=1
\ No newline at end of file
diff --git a/config/example/logging.txt b/config/example/logging.txt
new file mode 100644
index 00000000000..3346dfb831e
--- /dev/null
+++ b/config/example/logging.txt
@@ -0,0 +1,87 @@
+### Config Flags for logging, compatibility flags are at the top
+
+## Whether or not admin/adminprivate logging is also sent to LOG_CATEGORY_GAME for legacy log parsers
+LOGGING_COMPAT_ADMINPRIVATE
+
+## Should we also log entries as human readable
+LOG_AS_HUMAN_READABLE
+
+
+## log OOC channel
+LOG_OOC
+
+## log client Say
+LOG_SAY
+
+## log admin actions
+LOG_ADMIN
+
+## log admin warning messages
+##LOG_ADMINWARN ## Also duplicates a bunch of other messages.
+
+## Log admin chat
+LOG_ADMINCHAT
+
+## log client access (logon/logoff)
+LOG_ACCESS
+
+## log crew manifest to separate file
+LOG_MANIFEST
+
+## log game actions (start of round, results, etc.)
+LOG_GAME
+
+## log player votes
+LOG_VOTE
+
+## log manual target zone switching
+LOG_ZONE_SWITCH
+
+## log debug messages
+##LOG_DEBUG
+
+## log client Whisper
+LOG_WHISPER
+
+## log emotes
+LOG_EMOTE
+
+## log attack messages
+LOG_ATTACK
+
+## log economy actions
+LOG_ECON
+
+## log pda messages
+LOG_PDA
+
+## log prayers
+LOG_PRAYER
+
+## log world.log and runtime errors to a file
+LOG_RUNTIME
+
+## log asset debug logs
+# LOG_ASSET
+
+## log uplink purchases
+LOG_UPLINK
+
+## Enables log entries for logins that failed due to suspicious circumstances (banned player, CID randomiser, spoofed BYOND version, etc.) to a dedicated file.
+LOG_SUSPICIOUS_LOGIN
+
+## log silicons
+LOG_SILICON
+
+## log telecomms messages
+LOG_TELECOMMS
+
+## log speech indicators
+LOG_SPEECH_INDICATORS
+
+## log all world.Topic() calls
+# LOG_WORLD_TOPIC
+
+## Logs all links clicked in-game. Could be used for debugging and tracking down exploits.
+## Should be used in conjunction with DEBUG_ADMIN_HREFS in config.txt
+LOG_HREFS
diff --git a/config/example/resources.txt b/config/example/resources.txt
new file mode 100644
index 00000000000..e20ab1cf518
--- /dev/null
+++ b/config/example/resources.txt
@@ -0,0 +1,69 @@
+# External resources
+# Set this to the location of a .zip with the server's .rsc inside of it.
+# If you set this multiple times, the server will rotate between the links.
+# To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources
+# Resource urls can not be encrypted (https://), as they are downloaded by byond, not IE, and byond can't into encryption
+
+#EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip
+
+########################
+# Browser Asset Config #
+########################
+# Browser assets are any file included in interfaces. css, images, javascript, etc.
+# This handles configuring how we get these to the player so interfaces can access them.
+
+# Asset Transport
+# The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything.
+# You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN.
+# Valid values: simple, webroot. Simple is the default.
+#ASSET_TRANSPORT webroot
+
+
+# Simple asset transport configurable values.
+
+# Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed)
+# This should be uncommented in production and commented in development
+#ASSET_SIMPLE_PRELOAD
+
+
+# Webroot asset transport configurable values.
+
+# Local folder to save assets to.
+# Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT
+#ASSET_CDN_WEBROOT data/asset-store/
+
+# URL the folder from above can be accessed from.
+# for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls
+# Encryption (https) is supported here, but linux clients will have issues if you require higher then tls 1.0. Windows clients down to windows 7 can handle tls 1.2 no issue.
+# if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/
+#ASSET_CDN_URL http://localhost:58715/
+
+# CDN webservers must provide CORS headers, or TGUI will break and not be able to load all elements. The following example is for IIS:
+# Server Rules
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/example/svndir.txt b/config/example/svndir.txt
deleted file mode 100644
index bb72849a7c3..00000000000
--- a/config/example/svndir.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#Path to the .svn directory. Used to get server revision info.
-SVNDIR .svn
-
-#Link to revision details.
-REVHREF http://code.google.com/p/tgstation13/source/detail?r=
\ No newline at end of file
diff --git a/config/example/whitelist.txt b/config/example/whitelist.txt
new file mode 100644
index 00000000000..4d248bdad55
--- /dev/null
+++ b/config/example/whitelist.txt
@@ -0,0 +1,8 @@
+###############################################################################################
+# Basically, a list of ckeys who make it past user connection #
+# Case is not important for ckey. #
+###############################################################################################
+#flleeppyy
+#absolucy
+#blahblah
+#whoeverelse
diff --git a/goon/icons/mob/interact.dmi b/goon/icons/mob/interact.dmi
new file mode 100644
index 00000000000..da17f461c58
Binary files /dev/null and b/goon/icons/mob/interact.dmi differ
diff --git a/html/lobby_titlescreen.html b/html/lobby_titlescreen.html
index 7c72c2f65f3..7556c011f09 100644
--- a/html/lobby_titlescreen.html
+++ b/html/lobby_titlescreen.html
@@ -14,11 +14,32 @@
display: inline-block;
width: auto;
height: 100%;
+ z-index: 0;
+ }
+
+ .centered {
+ display: flex;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ justify-content: center;
+ align-items: center;
+ padding: 0;
+ margin: 0;
+ top: 0;
+ }
+
+ .centered img {
+ width: max-content;
+ height: max-content;
}
- 
+
+
+ 
+
", "\[logo\]")
- t = replacetext(t, "", "\[field\]")
+ t = replacetext(t, "", "\[field\]")
t = strip_html_properly(t)
return t
@@ -538,7 +531,7 @@ var/icon/text_tag_icons = new('./icons/chattags.dmi')
var/turf/T = get_turf(target)
var/area/A = get_area(target)
var/where = "[A? A.name : "Unknown Location"] | [T.x], [T.y], [T.z]"
- var/whereLink = "[where]"
+ var/whereLink = "[where] [ADMIN_JMP(T)]"
return whereLink
//Used for applying byonds text macros to strings that are loaded at runtime
@@ -602,3 +595,38 @@ var/icon/text_tag_icons = new('./icons/chattags.dmi')
. = ""
for(var/i=1, i<=times, i++)
. += string
+
+//json decode that will return null on parse error instead of runtiming.
+/proc/safe_json_decode(data)
+ try
+ return json_decode(data)
+ catch
+ return null
+
+/// Converts a semver string into a list of numbers
+/proc/semver_to_list(semver_string)
+ var/static/regex/semver_regex = regex(@"(\d+)\.(\d+)\.(\d+)", "")
+ if(!semver_regex.Find(semver_string))
+ return null
+
+ return list(
+ text2num(semver_regex.group[1]),
+ text2num(semver_regex.group[2]),
+ text2num(semver_regex.group[3]),
+ )
+
+
+/// Returns a message wrapped in a tag, colored based on how close `number` is to `threshold`.
+/// Lower number = green. Approaching threshold = yellow/orange. Exceeding = red.
+/proc/get_colored_thresh_text(msg, number, threshold = 10)
+ if (threshold <= 0)
+ return "[msg]" // fallback
+
+ var/ratio = number / threshold
+ if (ratio > 1) ratio = 1
+
+ var/hue = round(120 * (1 - ratio))
+ var/saturation = 90
+ var/lightness = 60
+
+ return "[msg]"
diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index 45c5c3c1243..8683185ee60 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -20,7 +20,7 @@ var/next_station_date_change = 1 DAYS
#define station_adjusted_time(time) time2text(time + station_time_in_ticks, "hh:mm")
#define worldtime2stationtime(time) time2text(roundstart_hour HOURS + time, "hh:mm")
-#define roundduration2text_in_ticks (SSticker.round_start_time ? world.time - SSticker.round_start_time : 0)
+#define roundduration2text_in_ticks (SSticker?.round_start_time ? world.time - SSticker.round_start_time : 0)
#define station_time_in_ticks (roundstart_hour HOURS + roundduration2text_in_ticks)
/proc/stationtime2text()
@@ -53,7 +53,7 @@ var/next_station_date_change = 1 DAYS
. = text2num(time2text(world.time + (roundstart_hour HOURS), "hh"))
/proc/worlddate2text()
- return num2text(game_year) + "-" + time2text(world.timeofday, "MM-DD")
+ return num2text(CURRENT_SHIP_YEAR) + "-" + time2text(world.timeofday, "MM-DD", NO_TIMEZONE)
/* Returns 1 if it is the selected month and day */
@@ -72,7 +72,7 @@ var/next_duration_update = 0
var/last_roundduration2text = 0
/proc/roundduration2text()
- if(!SSticker.round_start_time)
+ if(!SSticker?.round_start_time)
return "00:00"
if(last_roundduration2text && world.time < next_duration_update)
return last_roundduration2text
@@ -91,7 +91,7 @@ var/last_roundduration2text = 0
/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
if(!wtime)
- wtime = world.time - SSticker.round_start_time
+ wtime = world.time - (SSticker?.round_start_time || 0)
var/hour = round(wtime / 36000)
var/minute = round(((wtime) - (hour * 36000)) / 600)
var/second = round(((wtime) - (hour * 36000) - (minute * 600)) / 10)
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index 7fe135e89f3..0bd9af00a2c 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -127,6 +127,28 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH,
/proc/angle2text(var/degree)
return dir2text(angle2dir(degree))
+/// Returns a list(x, y), being the change in position required to step in the passed in direction
+/proc/dir2offset(dir)
+ switch(dir)
+ if(NORTH)
+ return list(0, 1)
+ if(SOUTH)
+ return list(0, -1)
+ if(EAST)
+ return list(1, 0)
+ if(WEST)
+ return list(-1, 0)
+ if(NORTHEAST)
+ return list(1, 1)
+ if(SOUTHEAST)
+ return list(1, -1)
+ if(NORTHWEST)
+ return list(-1, 1)
+ if(SOUTHWEST)
+ return list(-1, -1)
+ else
+ return list(0, 0)
+
// Converts a blend_mode constant to one acceptable to icon.Blend()
/proc/blendMode2iconMode(blend_mode)
switch (blend_mode)
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
new file mode 100644
index 00000000000..bdf72493700
--- /dev/null
+++ b/code/__HELPERS/type_processing.dm
@@ -0,0 +1,67 @@
+/proc/make_types_fancy(list/types)
+ if (ispath(types))
+ types = list(types)
+ . = list()
+ for(var/type in types)
+ var/typename = "[type]"
+ var/static/list/TYPES_SHORTCUTS = list(
+ /obj/effect/decal/cleanable = "CLEANABLE",
+ // /obj/item/bodypart = "BODYPART",
+ /obj/item/device/radio/headset = "HEADSET",
+ /obj/item/clothing/head/space = "SPESSHELMET",
+ /obj/item/book/manual = "MANUAL",
+ /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
+ /obj/item/reagent_containers/food/snacks = "SNACK", //longest paths comes first
+ /obj/machinery/atmospherics = "ATMOS_MECH",
+ /obj/machinery/portable_atmospherics = "PORT_ATMOS",
+ /obj/item/mech_equipment = "MECH",
+ /obj/item/organ = "ORGAN",
+ /obj/item = "ITEM",
+ /obj/machinery = "MACHINERY",
+ /obj/effect = "EFFECT",
+ /obj = "O",
+ /datum = "D",
+ // /turf/open = "OPEN",
+ // /turf/closed = "CLOSED",
+ /turf = "T",
+ /mob/living/carbon = "CARBON",
+ /mob/living/simple_animal = "SIMPLE",
+ /mob/living = "LIVING",
+ /mob = "M"
+ )
+ for (var/tn in TYPES_SHORTCUTS)
+ if(copytext(typename, 1, length("[tn]/") + 1) == "[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
+ typename = TYPES_SHORTCUTS[tn] + copytext(typename, length("[tn]/"))
+ break
+ .[typename] = type
+
+/proc/get_fancy_list_of_atom_types()
+ var/static/list/pre_generated_list
+ if (!pre_generated_list) //init
+ pre_generated_list = make_types_fancy(typesof(/atom))
+ return pre_generated_list
+
+
+/proc/get_fancy_list_of_datum_types()
+ var/static/list/pre_generated_list
+ if (!pre_generated_list) //init
+ pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom)))
+ return pre_generated_list
+
+
+/proc/filter_fancy_list(list/L, filter as text)
+ var/list/matches = new
+ var/end_len = -1
+ var/list/endcheck = splittext(filter, "!")
+ if(endcheck.len > 1)
+ filter = endcheck[1]
+ end_len = length_char(filter)
+
+ for(var/key in L)
+ var/value = L[key]
+ if(findtext("[key]", filter, -end_len) || findtext("[value]", filter, -end_len))
+ matches[key] = value
+ return matches
+
+/proc/return_typenames(type)
+ return splittext("[type]", "/")
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 5e09be20e63..bd4b13cb4b7 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1235,13 +1235,6 @@ var/list/FLOORITEMS = list(
else
return 0
-//gives us the stack trace from CRASH() without ending the current proc.
-/proc/stack_trace(msg)
- CRASH(msg)
-
-/datum/proc/stack_trace(msg)
- CRASH(msg)
-
/proc/pass(...)
return
@@ -1272,9 +1265,6 @@ var/list/FLOORITEMS = list(
. = CB.Invoke()
usr = temp
-//datum may be null, but it does need to be a typed var
-#define NAMEOF(datum, X) (#X || ##datum.##X)
-
#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value)
//dupe code because dm can't handle 3 level deep macros
#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value)
diff --git a/code/__HELPERS/verbs.dm b/code/__HELPERS/verbs.dm
index 8ec78ebdc66..cb76f5ad033 100644
--- a/code/__HELPERS/verbs.dm
+++ b/code/__HELPERS/verbs.dm
@@ -41,7 +41,7 @@
if(ismob(target))
mob_target = target
target = mob_target.client
- else if(!istype(target, /client))
+ else if(!isclient(target))
CRASH("add_verb called on a non-mob and non-client")
var/list/verbs_list = list()
@@ -86,7 +86,7 @@
if(ismob(target))
mob_target = target
target = mob_target.client
- else if(!istype(target, /client))
+ else if(!isclient(target))
CRASH("remove_verb called on a non-mob and non-client")
var/list/verbs_list = list()
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index d52174ecd91..88e51c0b0eb 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -29,9 +29,14 @@
#endif //ifdef REFERENCE_TRACKING
-// If this is uncommented, will attempt to load prof.dll (windows) or libprof.so (unix)
-// byond-tracy is not shipped with CM code. Build it yourself here: https://github.com/mafemergency/byond-tracy/
-//#define USE_BYOND_TRACY
+// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so by default.
+// Even if it's not defined, you can pass "tracy" via -params in order to try to load it.
+// We do not ship byond-tracy. Build it yourself here: https://github.com/mafemergency/byond-tracy,
+// or the fork which writes profiling data to a file: https://github.com/ParadiseSS13/byond-tracy
+// #define USE_BYOND_TRACY
+
+// If uncommented, will display info about byond-tracy's status in the MC tab.
+// #define MC_TAB_TRACY_INFO
/*
* Enables debug messages for every single reaction step. This is 1 message per 0.5s for a SINGLE reaction. Useful for tracking down bugs/asking me for help in the main reaction handiler (equilibrium.dm).
@@ -82,6 +87,8 @@
#define REFERENCE_TRACKING
#define REFERENCE_TRACKING_DEBUG
#define FIND_REF_NO_CHECK_TICK
+//Ensures all early assets can actually load early
+#define DO_NOT_DEFER_ASSETS
#endif
// Keep savefile compatibilty at minimum supported level
@@ -96,19 +103,16 @@
#define LIBCALL call_ext
#endif
-// So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof()
-#if DM_VERSION < 515
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
-#define PROC_REF(X) (.proc/##X)
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
-#define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X)
-/// Call by name proc reference, checks if the proc is existing global proc
-#define GLOBAL_PROC_REF(X) (/proc/##X)
-#else
-/// Call by name proc reference, checks if the proc exists on this type or as a global proc
+/// Call by name proc references, checks if the proc exists on either this type or as a global proc.
#define PROC_REF(X) (nameof(.proc/##X))
-/// Call by name proc reference, checks if the proc exists on given type or as a global proc
+/// Call by name verb references, checks if the verb exists on either this type or as a global verb.
+#define VERB_REF(X) (nameof(.verb/##X))
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))
-/// Call by name proc reference, checks if the proc is existing global proc
+/// Call by name verb reference, checks if the verb exists on either the given type or as a global verb
+#define TYPE_VERB_REF(TYPE, X) (nameof(##TYPE.verb/##X))
+
+/// Call by name proc reference, checks if the proc is an existing global proc
#define GLOBAL_PROC_REF(X) (/proc/##X)
-#endif
+
diff --git a/code/_debugger.dm b/code/_debugger.dm
deleted file mode 100644
index 84a0338c6a4..00000000000
--- a/code/_debugger.dm
+++ /dev/null
@@ -1,13 +0,0 @@
-//Datum used to init Auxtools debugging as early as possible
-//Datum gets created in master.dm because for whatever reason global code in there gets runs first
-//In case we ever figure out how to manipulate global init order please move the datum creation into this file
-/datum/debugger
-
-/datum/debugger/New()
- enable_debugger()
-
-/datum/debugger/proc/enable_debugger()
- var/dll = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
- if(dll)
- LIBCALL(dll, "auxtools_init")()
- enable_debugging()
diff --git a/code/_global_vars/_regexes.dm b/code/_global_vars/_regexes.dm
new file mode 100644
index 00000000000..7297d509a91
--- /dev/null
+++ b/code/_global_vars/_regexes.dm
@@ -0,0 +1,24 @@
+//These are a bunch of regex datums for use /((any|every|no|some|head|foot)where(wolf)?\sand\s)+(\.[\.\s]+\s?where\?)?/i
+GLOBAL_DATUM_INIT(is_http_protocol, /regex, regex("^https?://"))
+GLOBAL_DATUM_INIT(is_http_protocol_non_secure, /regex, regex("^http?://"))
+
+
+GLOBAL_DATUM_INIT(is_website, /regex, regex("http|www.|\[a-z0-9_-]+.(com|org|net|mil|edu)+", "i"))
+GLOBAL_DATUM_INIT(is_email, /regex, regex("\[a-z0-9_-]+@\[a-z0-9_-]+.\[a-z0-9_-]+", "i"))
+GLOBAL_DATUM_INIT(is_alphanumeric, /regex, regex("\[a-z0-9]+", "i"))
+GLOBAL_DATUM_INIT(is_punctuation, /regex, regex("\[.!?]+", "i"))
+GLOBAL_DATUM_INIT(is_color, /regex, regex("^#\[0-9a-fA-F]{6}$"))
+
+//finds text strings recognized as links on discord. Mainly used to stop embedding.
+GLOBAL_DATUM_INIT(has_discord_embeddable_links, /regex, regex("(https?://\[^\\s|<\]{2,})"))
+
+//All < and > characters
+GLOBAL_DATUM_INIT(angular_brackets, /regex, regex(@"[<>]", "g"))
+
+//All characters between < a > inclusive of the bracket
+GLOBAL_DATUM_INIT(html_tags, /regex, regex(@"<.*?>", "g"))
+
+//All characters forbidden by filenames: ", \, \n, \t, /, ?, %, *, :, |, <, >, ..
+GLOBAL_DATUM_INIT(filename_forbidden_chars, /regex, regex(@{""|[\\\n\t/?%*:|<>]|\.\."}, "g"))
+GLOBAL_PROTECT(filename_forbidden_chars)
+// had to use the OR operator for quotes instead of putting them in the character class because it breaks the syntax highlighting otherwise.
diff --git a/code/_global_vars/bitfields.dm b/code/_global_vars/bitfields.dm
new file mode 100644
index 00000000000..8d14da38a0a
--- /dev/null
+++ b/code/_global_vars/bitfields.dm
@@ -0,0 +1,549 @@
+GLOBAL_LIST_INIT(bitfields, generate_bitfields())
+
+/// Specifies a bitfield for smarter debugging
+/datum/bitfield
+ /// The variable name that contains the bitfield
+ var/variable
+
+ /// An associative list of the readable flag and its true value
+ var/list/flags
+
+/// Turns /datum/bitfield subtypes into a list for use in debugging
+/proc/generate_bitfields()
+ var/list/bitfields = list()
+ for (var/_bitfield in subtypesof(/datum/bitfield))
+ var/datum/bitfield/bitfield = new _bitfield
+ bitfields[bitfield.variable] = bitfield.flags
+ return bitfields
+
+DEFINE_BITFIELD(admin_flags, list(
+ "FUN" = R_FUN,
+ "SERVER" = R_SERVER,
+ "DEBUG" = R_DEBUG,
+ "PERMISSIONS" = R_PERMISSIONS,
+ "MENTOR" = R_MENTOR,
+ "MOD" = R_MOD,
+ "ADMIN" = R_ADMIN,
+ // "AUTOLOGIN" = R_AUTOADMIN,
+ // "BAN" = R_BAN,
+ // "BUILDMODE" = R_BUILD,
+ // "DBRANKS" = R_DBRANKS,
+ // "POLL" = R_POLL,
+ // "POSSESS" = R_POSSESS,
+ // "SERVER" = R_SERVER,
+ // "SOUNDS" = R_SOUND,
+ // "SPAWN" = R_SPAWN,
+ // "STEALTH" = R_STEALTH,
+ // "VAREDIT" = R_VAREDIT,
+
+))
+
+DEFINE_BITFIELD(appearance_flags, list(
+ "KEEP_APART" = KEEP_APART,
+ "KEEP_TOGETHER" = KEEP_TOGETHER,
+ "LONG_GLIDE" = LONG_GLIDE,
+ "NO_CLIENT_COLOR" = NO_CLIENT_COLOR,
+ "PIXEL_SCALE" = PIXEL_SCALE,
+ "PLANE_MASTER" = PLANE_MASTER,
+ "RESET_ALPHA" = RESET_ALPHA,
+ "RESET_COLOR" = RESET_COLOR,
+ "RESET_TRANSFORM" = RESET_TRANSFORM,
+ "TILE_BOUND" = TILE_BOUND,
+ "PASS_MOUSE" = PASS_MOUSE,
+ "TILE_MOVER" = TILE_MOVER,
+))
+
+// DEFINE_BITFIELD(area_flags, list(
+// "ABDUCTOR_PROOF" = ABDUCTOR_PROOF,
+// "AREA_USES_STARLIGHT" = AREA_USES_STARLIGHT,
+// "BLOBS_ALLOWED" = BLOBS_ALLOWED,
+// "BLOCK_SUICIDE" = BLOCK_SUICIDE,
+// "CAVES_ALLOWED" = CAVES_ALLOWED,
+// "CULT_PERMITTED" = CULT_PERMITTED,
+// "FLORA_ALLOWED" = FLORA_ALLOWED,
+// "HIDDEN_AREA" = HIDDEN_AREA,
+// "MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED,
+// "MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
+// "NOTELEPORT" = NOTELEPORT,
+// "NO_DEATH_MESSAGE" = NO_DEATH_MESSAGE,
+// "PERSISTENT_ENGRAVINGS" = PERSISTENT_ENGRAVINGS,
+// "UNIQUE_AREA" = UNIQUE_AREA,
+// "VALID_TERRITORY" = VALID_TERRITORY,
+// "XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
+// "PASSIVE_AREA" = PASSIVE_AREA,
+// "GHOST_AREA" = GHOST_AREA,
+// "NO_GHOSTS_DURING_ROUND" = NO_GHOSTS_DURING_ROUND,
+// ))
+
+// DEFINE_BITFIELD(turf_flags, list(
+// "NO_LAVA_GEN" = NO_LAVA_GEN,
+// "NO_RUINS" = NO_RUINS,
+// "NO_RUST" = NO_RUST,
+// "NOJAUNT" = NOJAUNT,
+// "IS_SOLID" = IS_SOLID,
+// "UNUSED_RESERVATION_TURF" = UNUSED_RESERVATION_TURF,
+// "WEATHERED_TURF" = TURF_WEATHER
+// "RESERVATION_TURF" = RESERVATION_TURF,
+// ))
+
+// DEFINE_BITFIELD(car_traits, list(
+// "CAN_KIDNAP" = CAN_KIDNAP,
+// ))
+
+// DEFINE_BITFIELD(clothing_flags, list(
+// "ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
+// "BLOCKS_SHOVE_KNOCKDOWN" = BLOCKS_SHOVE_KNOCKDOWN,
+// "BLOCKS_SPEECH" = BLOCKS_SPEECH,
+// "BLOCK_GAS_SMOKE_EFFECT" = BLOCK_GAS_SMOKE_EFFECT,
+// "CASTING_CLOTHES" = CASTING_CLOTHES,
+// "GAS_FILTERING" = GAS_FILTERING,
+// "HEADINTERNALS" = HEADINTERNALS,
+// "INEDIBLE_CLOTHING" = INEDIBLE_CLOTHING,
+// // "LARGE_WORN_ICON" = LARGE_WORN_ICON,
+// "LAVAPROTECT" = LAVAPROTECT,
+// "MASKINTERNALS" = MASKINTERNALS,
+// "PLASMAMAN_HELMET_EXEMPT" = PLASMAMAN_HELMET_EXEMPT,
+// "PLASMAMAN_PREVENT_IGNITION" = PLASMAMAN_PREVENT_IGNITION,
+// "SNUG_FIT" = SNUG_FIT,
+// "STOPSPRESSUREDAMAGE" = STOPSPRESSUREDAMAGE,
+// "THICKMATERIAL" = THICKMATERIAL,
+// "VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
+// "VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
+// ))
+
+// DEFINE_BITFIELD(datum_flags, list(
+// "DF_ISPROCESSING" = DF_ISPROCESSING,
+// "DF_VAR_EDITED" = DF_VAR_EDITED,
+// "DF_USE_TAG" = DF_USE_TAG,
+// ))
+
+// DEFINE_BITFIELD(disease_flags, list(
+// "CAN_CARRY" = CAN_CARRY,
+// "CAN_RESIST" = CAN_RESIST,
+// "CURABLE" = CURABLE,
+// "DORMANT" = DISEASE_DORMANT,
+// "STAGE_COPY" = DISEASE_COPYSTAGE,
+// "ANALYZED" = DISEASE_ANALYZED,
+// ))
+
+// DEFINE_BITFIELD(flags_1, list(
+// "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1,
+// "ALLOW_DARK_PAINTS_1" = ALLOW_DARK_PAINTS_1,
+// "ATMOS_IS_PROCESSING_1" = ATMOS_IS_PROCESSING_1,
+// "CAN_BE_DIRTY_1" = CAN_BE_DIRTY_1,
+// "CONDUCT_1" = CONDUCT_1,
+// "HAS_CONTEXTUAL_SCREENTIPS_1" = HAS_CONTEXTUAL_SCREENTIPS_1,
+// "HAS_DISASSOCIATED_STORAGE_1" = HAS_DISASSOCIATED_STORAGE_1,
+// "HOLOGRAM_1" = HOLOGRAM_1,
+// "INITIALIZED_1" = INITIALIZED_1,
+// "IS_ONTOP_1" = IS_ONTOP_1,
+// "IS_PLAYER_COLORABLE_1" = IS_PLAYER_COLORABLE_1,
+// "IS_SPINNING_1" = IS_SPINNING_1,
+// "NODECONSTRUCT_1" = NODECONSTRUCT_1,
+// "NO_SCREENTIPS_1" = NO_SCREENTIPS_1,
+// "ON_BORDER_1" = ON_BORDER_1,
+// "PREVENT_CLICK_UNDER_1" = PREVENT_CLICK_UNDER_1,
+// "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1,
+// "SUPERMATTER_IGNORES_1" = SUPERMATTER_IGNORES_1,
+// "UNPAINTABLE_1" = UNPAINTABLE_1,
+// ))
+
+// DEFINE_BITFIELD(flags_ricochet, list(
+// "RICOCHET_HARD" = RICOCHET_HARD,
+// "RICOCHET_SHINY" = RICOCHET_SHINY,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_atom, list(
+// "INTERACT_ATOM_ATTACK_HAND" = INTERACT_ATOM_ATTACK_HAND,
+// "INTERACT_ATOM_CHECK_GRAB" = INTERACT_ATOM_CHECK_GRAB,
+// "INTERACT_ATOM_IGNORE_INCAPACITATED" = INTERACT_ATOM_IGNORE_INCAPACITATED,
+// "INTERACT_ATOM_IGNORE_RESTRAINED" = INTERACT_ATOM_IGNORE_RESTRAINED,
+// "INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND" = INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND,
+// "INTERACT_ATOM_NO_FINGERPRINT_INTERACT" = INTERACT_ATOM_NO_FINGERPRINT_INTERACT,
+// "INTERACT_ATOM_REQUIRES_ANCHORED" = INTERACT_ATOM_REQUIRES_ANCHORED,
+// "INTERACT_ATOM_REQUIRES_DEXTERITY" = INTERACT_ATOM_REQUIRES_DEXTERITY,
+// "INTERACT_ATOM_UI_INTERACT" = INTERACT_ATOM_UI_INTERACT,
+// "INTERACT_ATOM_ALLOW_USER_LOCATION" = INTERACT_ATOM_ALLOW_USER_LOCATION,
+// "INTERACT_ATOM_IGNORE_MOBILITY" = INTERACT_ATOM_IGNORE_MOBILITY,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_machine, list(
+// "INTERACT_MACHINE_ALLOW_SILICON" = INTERACT_MACHINE_ALLOW_SILICON,
+// "INTERACT_MACHINE_OFFLINE" = INTERACT_MACHINE_OFFLINE,
+// "INTERACT_MACHINE_OPEN" = INTERACT_MACHINE_OPEN,
+// "INTERACT_MACHINE_OPEN_SILICON" = INTERACT_MACHINE_OPEN_SILICON,
+// "INTERACT_MACHINE_REQUIRES_SIGHT" = INTERACT_MACHINE_REQUIRES_SIGHT,
+// "INTERACT_MACHINE_REQUIRES_LITERACY" = INTERACT_MACHINE_REQUIRES_LITERACY,
+// "INTERACT_MACHINE_REQUIRES_SILICON" = INTERACT_MACHINE_REQUIRES_SILICON,
+// "INTERACT_MACHINE_SET_MACHINE" = INTERACT_MACHINE_SET_MACHINE,
+// "INTERACT_MACHINE_WIRES_IF_OPEN" = INTERACT_MACHINE_WIRES_IF_OPEN,
+// ))
+
+// DEFINE_BITFIELD(interaction_flags_item, list(
+// "INTERACT_ITEM_ATTACK_HAND_PICKUP" = INTERACT_ITEM_ATTACK_HAND_PICKUP,
+// ))
+
+// DEFINE_BITFIELD(item_flags, list(
+// "ABSTRACT" = ABSTRACT,
+// "BEING_REMOVED" = BEING_REMOVED,
+// "DROPDEL" = DROPDEL,
+// "FORCE_STRING_OVERRIDE" = FORCE_STRING_OVERRIDE,
+// "HAND_ITEM" = HAND_ITEM,
+// "IGNORE_DIGITIGRADE" = IGNORE_DIGITIGRADE,
+// "IMMUTABLE_SLOW" = IMMUTABLE_SLOW,
+// "IN_INVENTORY" = IN_INVENTORY,
+// "IN_STORAGE" = IN_STORAGE,
+// "ITEM_HAS_CONTEXTUAL_SCREENTIPS" = ITEM_HAS_CONTEXTUAL_SCREENTIPS,
+// "NEEDS_PERMIT" = NEEDS_PERMIT,
+// "NOBLUDGEON" = NOBLUDGEON,
+// "NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
+// "NO_PIXEL_RANDOM_DROP" = NO_PIXEL_RANDOM_DROP,
+// "SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
+// "SURGICAL_TOOL" = SURGICAL_TOOL,
+// "XENOMORPH_HOLDABLE" = XENOMORPH_HOLDABLE,
+// "NO_BLOOD_ON_ITEM" = NO_BLOOD_ON_ITEM,
+// ))
+
+// DEFINE_BITFIELD(flags_inv, list(
+// "HIDEEARS" = HIDEEARS,
+// "HIDEEYES" = HIDEEYES,
+// "HIDEFACE" = HIDEFACE,
+// "HIDEFACIALHAIR" = HIDEFACIALHAIR,
+// "HIDEGLOVES" = HIDEGLOVES,
+// "HIDEHAIR" = HIDEHAIR,
+// "HIDEHEADGEAR" = HIDEHEADGEAR,
+// "HIDEJUMPSUIT" = HIDEJUMPSUIT,
+// "HIDEMASK" = HIDEMASK,
+// "HIDENECK" = HIDENECK,
+// "HIDESHOES" = HIDESHOES,
+// "HIDESNOUT" = HIDESNOUT,
+// "HIDESUITSTORAGE" = HIDESUITSTORAGE,
+// ))
+
+DEFINE_BITFIELD(machine_stat, list(
+ "BROKEN" = BROKEN,
+ "EMPED" = EMPED,
+ "MAINT" = MAINT,
+ "NOPOWER" = NOPOWER,
+))
+
+// DEFINE_BITFIELD(mat_container_flags, list(
+// "MATCONTAINER_EXAMINE" = MATCONTAINER_EXAMINE,
+// "MATCONTAINER_NO_INSERT" = MATCONTAINER_NO_INSERT,
+// "MATCONTAINER_ANY_INTENT" = MATCONTAINER_ANY_INTENT,
+// "MATCONTAINER_SILENT" = MATCONTAINER_SILENT,
+// "BREAKDOWN_ALLOYS" = BREAKDOWN_ALLOYS,
+// ))
+
+// DEFINE_BITFIELD(internal_damage, list(
+// "MECHA_INT_FIRE" = MECHA_INT_FIRE,
+// "MECHA_INT_TEMP_CONTROL" = MECHA_INT_TEMP_CONTROL,
+// "MECHA_INT_TANK_BREACH" = MECHA_INT_TANK_BREACH,
+// "MECHA_INT_CONTROL_LOST" = MECHA_INT_CONTROL_LOST,
+// "MECHA_INT_SHORT_CIRCUIT" = MECHA_INT_SHORT_CIRCUIT,
+// ))
+
+// DEFINE_BITFIELD(mecha_flags, list(
+// "ADDING_ACCESS_POSSIBLE" = ADDING_ACCESS_POSSIBLE,
+// "ADDING_MAINT_ACCESS_POSSIBLE" = ADDING_MAINT_ACCESS_POSSIBLE,
+// "CANSTRAFE" = CANSTRAFE,
+// "LIGHTS_ON" = LIGHTS_ON,
+// "SILICON_PILOT" = SILICON_PILOT,
+// "IS_ENCLOSED" = IS_ENCLOSED,
+// "HAS_LIGHTS" = HAS_LIGHTS,
+// ))
+
+// DEFINE_BITFIELD(mob_biotypes, list(
+// "MOB_BEAST" = MOB_BEAST,
+// "MOB_BUG" = MOB_BUG,
+// "MOB_EPIC" = MOB_EPIC,
+// "MOB_HUMANOID" = MOB_HUMANOID,
+// "MOB_MINERAL" = MOB_MINERAL,
+// "MOB_ORGANIC" = MOB_ORGANIC,
+// "MOB_REPTILE" = MOB_REPTILE,
+// "MOB_ROBOTIC" = MOB_ROBOTIC,
+// "MOB_SPIRIT" = MOB_SPIRIT,
+// "MOB_UNDEAD" = MOB_UNDEAD,
+// "MOB_PLANT" = MOB_PLANT
+// ))
+
+// DEFINE_BITFIELD(mob_respiration_type, list(
+// "RESPIRATION_OXYGEN" = RESPIRATION_OXYGEN,
+// "RESPIRATION_N2" = RESPIRATION_N2,
+// "RESPIRATION_PLASMA" = RESPIRATION_PLASMA,
+// ))
+
+// DEFINE_BITFIELD(liked_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(disliked_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(toxic_foodtypes, list(
+// "MEAT" = MEAT,
+// "VEGETABLES" = VEGETABLES,
+// "RAW" = RAW,
+// "JUNKFOOD" = JUNKFOOD,
+// "GRAIN" = GRAIN,
+// "FRUIT" = FRUIT,
+// "DAIRY" = DAIRY,
+// "FRIED" = FRIED,
+// "ALCOHOL" = ALCOHOL,
+// "SUGAR" = SUGAR,
+// "GROSS" = GROSS,
+// "TOXIC" = TOXIC,
+// "PINEAPPLE" = PINEAPPLE,
+// "BREAKFAST" = BREAKFAST,
+// "CLOTH" = CLOTH,
+// "NUTS" = NUTS,
+// "SEAFOOD" = SEAFOOD,
+// "ORANGES" = ORANGES,
+// "BUGS" = BUGS,
+// "GORE" = GORE,
+// ))
+
+// DEFINE_BITFIELD(mobility_flags, list(
+// "MOVE" = MOBILITY_MOVE,
+// "PICKUP" = MOBILITY_PICKUP,
+// "PULL" = MOBILITY_PULL,
+// "STAND" = MOBILITY_STAND,
+// "STORAGE" = MOBILITY_STORAGE,
+// "UI" = MOBILITY_UI,
+// "USE" = MOBILITY_USE,
+// ))
+
+// DEFINE_BITFIELD(movement_type, list(
+// "FLOATING" = FLOATING,
+// "FLYING" = FLYING,
+// "GROUND" = GROUND,
+// "PHASING" = PHASING,
+// "VENTCRAWLING" = VENTCRAWLING,
+// ))
+
+// DEFINE_BITFIELD(obj_flags, list(
+// "IN_USE" = IN_USE,
+// "EMAGGED" = EMAGGED,
+// "CAN_BE_HIT" = CAN_BE_HIT,
+// "DANGEROUS_POSSESSION" = DANGEROUS_POSSESSION,
+// "UNIQUE_RENAME" = UNIQUE_RENAME,
+// "BLOCK_Z_OUT_DOWN" = BLOCK_Z_OUT_DOWN,
+// "BLOCK_Z_OUT_UP" = BLOCK_Z_OUT_UP,
+// "BLOCK_Z_IN_DOWN" = BLOCK_Z_IN_DOWN,
+// "BLOCK_Z_IN_UP" = BLOCK_Z_IN_UP,
+// "BLOCKS_CONSTRUCTION" = BLOCKS_CONSTRUCTION,
+// "BLOCKS_CONSTRUCTION_DIR" = BLOCKS_CONSTRUCTION_DIR,
+// "IGNORE_DENSITY" = IGNORE_DENSITY,
+// ))
+
+// DEFINE_BITFIELD(pass_flags, list(
+// "LETPASSTHROW" = LETPASSTHROW,
+// "PASSBLOB" = PASSBLOB,
+// "PASSCLOSEDTURF" = PASSCLOSEDTURF,
+// "PASSGLASS" = PASSGLASS,
+// "PASSGRILLE" = PASSGRILLE,
+// "PASSMOB" = PASSMOB,
+// "PASSTABLE" = PASSTABLE,
+// ))
+
+// DEFINE_BITFIELD(resistance_flags, list(
+// "LAVA_PROOF" = LAVA_PROOF,
+// "FIRE_PROOF" = FIRE_PROOF,
+// "FLAMMABLE" = FLAMMABLE,
+// "ON_FIRE" = ON_FIRE,
+// "UNACIDABLE" = UNACIDABLE,
+// "ACID_PROOF" = ACID_PROOF,
+// "INDESTRUCTIBLE" = INDESTRUCTIBLE,
+// "FREEZE_PROOF" = FREEZE_PROOF,
+// "SHUTTLE_CRUSH_PROOF" = SHUTTLE_CRUSH_PROOF
+// ))
+
+DEFINE_BITFIELD(sight, list(
+ "BLIND" = BLIND,
+ "SEE_BLACKNESS" = SEE_BLACKNESS,
+ "SEE_INFRA" = SEE_INFRA,
+ "SEE_MOBS" = SEE_MOBS,
+ "SEE_OBJS" = SEE_OBJS,
+ "SEE_PIXELS" = SEE_PIXELS,
+ "SEE_SELF" = SEE_SELF,
+ "SEE_THRU" = SEE_THRU,
+ "SEE_TURFS" = SEE_TURFS,
+))
+
+DEFINE_BITFIELD(vis_flags, list(
+ "VIS_HIDE" = VIS_HIDE,
+ "VIS_INHERIT_DIR" = VIS_INHERIT_DIR,
+ "VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
+ "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,
+ "VIS_INHERIT_ID" = VIS_INHERIT_ID,
+ "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER,
+ "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE,
+ "VIS_UNDERLAY" = VIS_UNDERLAY,
+))
+
+// I am so sorry. Required because vis_flags is both undefinable and unreadable on mutable_appearance
+// But we need to display them anyway. See /mutable_appearance/appearance_mirror
+DEFINE_BITFIELD(_vis_flags, list(
+ "VIS_HIDE" = VIS_HIDE,
+ "VIS_INHERIT_DIR" = VIS_INHERIT_DIR,
+ "VIS_INHERIT_ICON" = VIS_INHERIT_ICON,
+ "VIS_INHERIT_ICON_STATE" = VIS_INHERIT_ICON_STATE,
+ "VIS_INHERIT_ID" = VIS_INHERIT_ID,
+ "VIS_INHERIT_LAYER" = VIS_INHERIT_LAYER,
+ "VIS_INHERIT_PLANE" = VIS_INHERIT_PLANE,
+ "VIS_UNDERLAY" = VIS_UNDERLAY,
+))
+
+// DEFINE_BITFIELD(zap_flags, list(
+// "ZAP_ALLOW_DUPLICATES" = ZAP_ALLOW_DUPLICATES,
+// "ZAP_MACHINE_EXPLOSIVE" = ZAP_MACHINE_EXPLOSIVE,
+// "ZAP_MOB_DAMAGE" = ZAP_MOB_DAMAGE,
+// "ZAP_MOB_STUN" = ZAP_MOB_STUN,
+// "ZAP_OBJ_DAMAGE" = ZAP_OBJ_DAMAGE,
+// "ZAP_GENERATES_POWER" = ZAP_GENERATES_POWER,
+// ))
+
+// DEFINE_BITFIELD(chemical_flags, list(
+// "REAGENT_DEAD_PROCESS" = REAGENT_DEAD_PROCESS,
+// "REAGENT_DONOTSPLIT" = REAGENT_DONOTSPLIT,
+// "REAGENT_INVISIBLE" = REAGENT_INVISIBLE,
+// "REAGENT_SNEAKYNAME" = REAGENT_SNEAKYNAME,
+// "REAGENT_SPLITRETAINVOL" = REAGENT_SPLITRETAINVOL,
+// "REAGENT_CAN_BE_SYNTHESIZED" = REAGENT_CAN_BE_SYNTHESIZED,
+// "REAGENT_IGNORE_STASIS" = REAGENT_IGNORE_STASIS,
+// "REAGENT_NO_RANDOM_RECIPE" = REAGENT_NO_RANDOM_RECIPE,
+// "REAGENT_CLEANS" = REAGENT_CLEANS,
+// ))
+
+// DEFINE_BITFIELD(reaction_flags, list(
+// "REACTION_CLEAR_IMPURE" = REACTION_CLEAR_IMPURE,
+// "REACTION_CLEAR_INVERSE" = REACTION_CLEAR_INVERSE,
+// "REACTION_CLEAR_RETAIN" = REACTION_CLEAR_RETAIN,
+// "REACTION_NON_INSTANT" = REACTION_NON_INSTANT,
+// "REACTION_HEAT_ARBITARY" = REACTION_HEAT_ARBITARY,
+// "REACTION_COMPETITIVE" = REACTION_COMPETITIVE,
+// "REACTION_PH_VOL_CONSTANT" = REACTION_PH_VOL_CONSTANT,
+// "REACTION_REAL_TIME_SPLIT" = REACTION_REAL_TIME_SPLIT,
+// "REACTION_USES_PURITY" = REACTION_USES_PURITY
+// ))
+
+// DEFINE_BITFIELD(bodytype, list(
+// "BODYTYPE_DIGITIGRADE" = BODYTYPE_DIGITIGRADE,
+// "BODYTYPE_HUMANOID" = BODYTYPE_HUMANOID,
+// "BODYTYPE_MONKEY" = BODYTYPE_MONKEY,
+// "BODYTYPE_ORGANIC" = BODYTYPE_ORGANIC,
+// "BODYTYPE_ROBOTIC" = BODYTYPE_ROBOTIC,
+// "BODYTYPE_SNOUTED" = BODYTYPE_SNOUTED,
+// "BODYTYPE_CUSTOM" = BODYTYPE_CUSTOM,
+// "BODYTYPE_SNOUTED" = BODYTYPE_SNOUTED,
+// ))
+
+// DEFINE_BITFIELD(bodypart_flags, list(
+// "BODYPART_UNREMOVABLE" = BODYPART_UNREMOVABLE,
+// "BODYPART_PSEUDOPART" = BODYPART_PSEUDOPART,
+// "BODYPART_IMPLANTED" = BODYPART_IMPLANTED,
+// ))
+
+// DEFINE_BITFIELD(change_exempt_flags, list(
+// "BP_BLOCK_CHANGE_SPECIES" = BP_BLOCK_CHANGE_SPECIES,
+// ))
+
+// DEFINE_BITFIELD(head_flags, list(
+// "HEAD_HAIR" = HEAD_HAIR,
+// "HEAD_FACIAL_HAIR" = HEAD_FACIAL_HAIR,
+// "HEAD_LIPS" = HEAD_LIPS,
+// "HEAD_EYESPRITES" = HEAD_EYESPRITES,
+// "HEAD_EYECOLOR" = HEAD_EYECOLOR,
+// "HEAD_EYEHOLES" = HEAD_EYEHOLES,
+// "HEAD_DEBRAIN" = HEAD_DEBRAIN,
+// ))
+
+// DEFINE_BITFIELD(supports_variations_flags, list(
+// "CLOTHING_NO_VARIATION" = CLOTHING_NO_VARIATION,
+// "CLOTHING_DIGITIGRADE_VARIATION" = CLOTHING_DIGITIGRADE_VARIATION,
+// "CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON" = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON,
+// ))
+
+// DEFINE_BITFIELD(flora_flags, list(
+// "FLORA_HERBAL" = FLORA_HERBAL,
+// "FLORA_WOODEN" = FLORA_WOODEN,
+// "FLORA_STONE" = FLORA_STONE,
+// ))
+
+// DEFINE_BITFIELD(emote_flags, list(
+// "EMOTE_AUDIBLE" = EMOTE_AUDIBLE,
+// "EMOTE_VISIBLE" = EMOTE_VISIBLE,
+// "EMOTE_IMPORTANT" = EMOTE_IMPORTANT,
+// ))
+
+// DEFINE_BITFIELD(organ_flags, list(
+// "ORGAN_SYNTHETIC" = ORGAN_SYNTHETIC,
+// "ORGAN_FROZEN" = ORGAN_FROZEN,
+// "ORGAN_FAILING" = ORGAN_FAILING,
+// "ORGAN_VITAL" = ORGAN_VITAL,
+// "ORGAN_EDIBLE" = ORGAN_EDIBLE,
+// "ORGAN_SYNTHETIC_EMP" = ORGAN_SYNTHETIC_EMP,
+// "ORGAN_UNREMOVABLE" = ORGAN_UNREMOVABLE,
+// "ORGAN_HIDDEN" = ORGAN_HIDDEN,
+// ))
+
+// DEFINE_BITFIELD(respiration_type, list(
+// "RESPIRATION_OXYGEN" = RESPIRATION_OXYGEN,
+// "RESPIRATION_N2" = RESPIRATION_N2,
+// "RESPIRATION_PLASMA" = RESPIRATION_PLASMA,
+// ))
+
+// DEFINE_BITFIELD(sharpness, list(
+// "SHARP_EDGED" = SHARP_EDGED,
+// "SHARP_POINTY" = SHARP_POINTY,
+// ))
+
+// DEFINE_BITFIELD(gun_flags, list(
+// "NOT_A_REAL_GUN" = NOT_A_REAL_GUN,
+// "TOY_FIREARM_OVERLAY" = TOY_FIREARM_OVERLAY,
+// ))
+
+// DEFINE_BITFIELD(physics_flags, list(
+// "MPHYSICS_QDEL_WHEN_NO_MOVEMENT" = MPHYSICS_QDEL_WHEN_NO_MOVEMENT,
+// "MPHYSICS_MOVING" = MPHYSICS_MOVING,
+// "MPHYSICS_PAUSED" = MPHYSICS_PAUSED,
+// ))
diff --git a/code/_global_vars/configuration.dm b/code/_global_vars/configuration.dm
new file mode 100644
index 00000000000..23a1b0cd8b4
--- /dev/null
+++ b/code/_global_vars/configuration.dm
@@ -0,0 +1,9 @@
+GLOBAL_REAL(config, /datum/controller/configuration)
+
+GLOBAL_VAR_INIT(changelog_hash, "")
+
+GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently
+GLOBAL_VAR_INIT(looc_allowed, TRUE)
+GLOBAL_VAR_INIT(dooc_allowed, TRUE)
+GLOBAL_VAR_INIT(dsay_allowed, TRUE)
+
diff --git a/code/_global_vars/lists/icons.dm b/code/_global_vars/lists/icons.dm
new file mode 100644
index 00000000000..ff60e6bc8d9
--- /dev/null
+++ b/code/_global_vars/lists/icons.dm
@@ -0,0 +1,2 @@
+/// Cache of the width and height of icon files, to avoid repeating the same expensive operation
+GLOBAL_LIST_EMPTY(icon_dimensions)
diff --git a/code/_global_vars/logging.dm b/code/_global_vars/logging.dm
new file mode 100644
index 00000000000..9abb66e9668
--- /dev/null
+++ b/code/_global_vars/logging.dm
@@ -0,0 +1,49 @@
+GLOBAL_VAR(game_id)
+GLOBAL_PROTECT(game_id)
+
+/// The directory in which ALL log files should be stored
+GLOBAL_VAR(log_directory)
+GLOBAL_PROTECT(log_directory)
+
+#define DECLARE_LOG_NAMED(log_var_name, log_file_name, start)\
+GLOBAL_VAR(##log_var_name);\
+GLOBAL_PROTECT(##log_var_name);\
+/world/_initialize_log_files(temp_log_override = null){\
+ ..();\
+ GLOB.##log_var_name = temp_log_override || "[GLOB.log_directory]/[##log_file_name].log";\
+ if(!temp_log_override && ##start){\
+ start_log(GLOB.##log_var_name);\
+ }\
+}
+
+#define DECLARE_LOG(log_name, start) DECLARE_LOG_NAMED(##log_name, "[copytext(#log_name, 1, length(#log_name) - 4)]", start)
+#define START_LOG TRUE
+#define DONT_START_LOG FALSE
+
+/// Populated by log declaration macros to set log file names and start messages
+/world/proc/_initialize_log_files(temp_log_override = null)
+ // Needs to be here to avoid compiler warnings
+ SHOULD_CALL_PARENT(TRUE)
+ return
+
+// All individual log files.
+// These should be used where the log category cannot easily be a json log file.
+DECLARE_LOG(config_error_log, DONT_START_LOG)
+DECLARE_LOG(perf_log, DONT_START_LOG) // Declared here but name is set in time_track subsystem
+
+/// All admin related log lines minus their categories
+GLOBAL_LIST_EMPTY(admin_activities)
+GLOBAL_PROTECT(admin_activities)
+
+/// All bomb related messages
+GLOBAL_LIST_EMPTY(bombers)
+GLOBAL_PROTECT(bombers)
+
+/// Stores who uploaded laws to which silicon-based lifeform, and what the law was
+GLOBAL_LIST_EMPTY(lawchanges)
+GLOBAL_PROTECT(lawchanges)
+
+#undef DECLARE_LOG
+#undef DECLARE_LOG_NAMED
+#undef START_LOG
+#undef DONT_START_LOG
diff --git a/code/_global_vars/misc.dm b/code/_global_vars/misc.dm
index 79c0e85c210..10f0ee88760 100644
--- a/code/_global_vars/misc.dm
+++ b/code/_global_vars/misc.dm
@@ -27,9 +27,7 @@ GLOBAL_LIST_INIT(custom_kits, list(
/obj/item/ammo_magazine/ihclrifle,
/obj/item/ammo_magazine/ihclrifle)))
-// LOGGING MOVE ME //
-GLOBAL_VAR(log_directory)
-GLOBAL_PROTECT(log_directory)
-
// TGUI MOVE ME //
GLOBAL_DATUM(changelog_tgui, /datum/changelog)
+
+GLOBAL_VAR_INIT(Debug2, 0)
diff --git a/code/_global_vars/names.dm b/code/_global_vars/names.dm
new file mode 100644
index 00000000000..9b1efe269b3
--- /dev/null
+++ b/code/_global_vars/names.dm
@@ -0,0 +1,20 @@
+
+GLOBAL_VAR_INIT(station_name, DEFAULT_STATION_NAME)
+GLOBAL_VAR_INIT(station_short, "Eris")
+
+GLOBAL_VAR_INIT(dock_name, "NTV Faith")
+GLOBAL_PROTECT(dock_name)
+
+GLOBAL_VAR_INIT(boss_name, "Hansa Trade Union")
+GLOBAL_PROTECT(boss_name)
+
+GLOBAL_VAR_INIT(boss_short, "Hansa")
+GLOBAL_PROTECT(boss_short)
+
+GLOBAL_VAR_INIT(company_name, "CEV Eris")
+GLOBAL_PROTECT(company_name)
+
+GLOBAL_VAR_INIT(company_short, "Eris")
+GLOBAL_PROTECT(company_short)
+
+GLOBAL_VAR_INIT(game_version, "Discordia")
diff --git a/code/_global_vars/time_vars.dm b/code/_global_vars/time_vars.dm
new file mode 100644
index 00000000000..29526f845b2
--- /dev/null
+++ b/code/_global_vars/time_vars.dm
@@ -0,0 +1,6 @@
+
+/// The difference betwen midnight (of the host computer) and 0 world.ticks.
+GLOBAL_VAR_INIT(timezoneOffset, 0)
+
+GLOBAL_VAR_INIT(year, time2text(world.realtime, "YYYY", NO_TIMEZONE))
+GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 9f226cb3aa3..ad95af22062 100755
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -129,7 +129,7 @@
return 1
throw_mode_off()
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
if(W == A) // Handle attack_self
W.attack_self(src)
@@ -295,6 +295,7 @@
/atom/movable/CtrlClick(mob/user, params)
if(Adjacent(user))
user.start_pulling(src)
+ user.animate_interact(src, INTERACT_GRAB)
/*
Alt click
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 4ab788d299b..c7c4f240aa5 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -56,7 +56,7 @@
return
*/
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
// Cyborgs have no range-checking unless there is item use
if(!W)
diff --git a/code/_onclick/hud/screen_objects/base_screen_objects.dm b/code/_onclick/hud/screen_objects/base_screen_objects.dm
index 986149edaae..04f27cb6e8b 100644
--- a/code/_onclick/hud/screen_objects/base_screen_objects.dm
+++ b/code/_onclick/hud/screen_objects/base_screen_objects.dm
@@ -154,7 +154,7 @@
return
var/mob/living/M = owner.loc
- if(M.client && M.get_active_hand() == owner)
+ if(M.client && M.get_active_held_item() == owner)
if(M.client.prefs.UI_compact_style)
screen_loc = minloc
else
@@ -235,6 +235,11 @@
if(icon_x in 14 to 18)
selecting = BP_EYES
+ logger.Log(
+ LOG_CATEGORY_TARGET_ZONE_SWITCH,
+ "[key_name(src)] manually changed selected zone (UI)",
+ data = selecting
+ )
set_selected_zone(selecting)
return TRUE
@@ -273,7 +278,7 @@
if(usr.stat || usr.paralysis || usr.stunned || usr.weakened)
return TRUE
if(master)
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if(I)
usr.ClickOn(master)
return TRUE
diff --git a/code/_onclick/hud/screen_objects/robot_screen_objects.dm b/code/_onclick/hud/screen_objects/robot_screen_objects.dm
index 6345bf3cb98..61b285f34eb 100644
--- a/code/_onclick/hud/screen_objects/robot_screen_objects.dm
+++ b/code/_onclick/hud/screen_objects/robot_screen_objects.dm
@@ -131,6 +131,7 @@
else
icon_state = "health6"
else
+ var/dead_threshold = CONFIG_GET(number/health_threshold_dead)
switch(parentmob.health)
if(200 to INFINITY)
icon_state = "health0"
@@ -142,10 +143,10 @@
icon_state = "health3"
if(0 to 50)
icon_state = "health4"
- if(HEALTH_THRESHOLD_DEAD to 0)
- icon_state = "health5"
else
icon_state = "health6"
+ if (parentmob.health > 0 && parentmob.health <= dead_threshold )
+ icon_state = "health5"
else
icon_state = "health7"
@@ -223,4 +224,4 @@
icon_state = "robotpull1"
else
icon_state = "robotpull0"
-//-----------------------ROBOT stuff end---------------------
\ No newline at end of file
+//-----------------------ROBOT stuff end---------------------
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index e0907d8f31b..f1e88706588 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -8,7 +8,7 @@
Otherwise pretty standard.
*/
-/mob/living/carbon/human/UnarmedAttack(var/atom/A, var/proximity, params)
+/mob/living/carbon/human/UnarmedAttack(atom/A, var/proximity, params)
if(!..())
return
@@ -20,7 +20,9 @@
if(istype(G) && G.Touch(A, 1))
return
- A.attack_hand(src, params)
+ . = A.attack_hand(src, params)
+ if (.)
+ animate_interact(A, INTERACT_GENERIC)
/atom/proc/attack_hand(mob/user as mob, params)
. = FALSE
diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm
index 33ff8e77be7..ae366acd515 100644
--- a/code/controllers/admin.dm
+++ b/code/controllers/admin.dm
@@ -9,7 +9,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
. = ..()
name = text
src.target = target
- if(istype(target, /datum)) //Harddel man bad
+ if(isdatum(target)) //Harddel man bad
RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(cleanup))
/obj/effect/statclick/Destroy()
@@ -35,7 +35,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/statclick)
class = "subsystem"
else if(istype(target, /datum/controller))
class = "controller"
- else if(istype(target, /datum))
+ else if(isdatum(target))
class = "datum"
else
class = "unknown"
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
deleted file mode 100644
index bbf8d0a5ae8..00000000000
--- a/code/controllers/configuration.dm
+++ /dev/null
@@ -1,864 +0,0 @@
-
-GLOBAL_LIST_EMPTY(storyteller_cache)
-
-/datum/configuration
- var/server_name // server name (for world name / status)
- var/server_suffix = 0 // generate numeric suffix based on server port
-
- var/loaded = FALSE // If the config is loaded or not
- var/nudge_script_path = "nudge.py" // where the nudge.py script is located
-
- var/log_ooc = 0 // log OOC channel
- var/log_access = 0 // log login/logout
- var/log_say = 0 // log client say
- var/log_admin = 0 // log admin actions
- var/log_debug = 1 // log debug output
- var/log_game = 0 // log game events
- var/log_vote = 0 // log voting
- var/log_whisper = 0 // log client whisper
- var/log_emote = 0 // log emotes
- var/log_attack = 0 // log attack messages
- var/log_adminchat = 0 // log admin chat messages
- var/log_adminwarn = 0 // log warnings admins get about bomb construction and such
- var/log_pda = 0 // log pda messages
- var/log_hrefs = 0 // logs all links clicked in-game. Could be used for debugging and tracking down exploits
- var/log_runtime = 0 // logs world.log to a file
- var/log_world_output = 0 // log log_world(messages)
- var/sql_enabled = 1 // for sql switching
- var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
- var/allow_vote_restart = 0 // allow votes to restart
- var/ert_admin_call_only = 0
- var/allow_vote_mode = 0 // allow votes to change mode
- var/vote_delay = 6000 // minimum time between voting sessions (deciseconds, 10 minute default)
- var/vote_period = 600 // length of voting period (deciseconds, default 1 minute)
- var/vote_autogamemode_timeleft = 100 //Length of time before round start when autogamemode vote is called (in seconds, default 100).
- var/vote_no_default = 0 // vote does not default to nochange/norestart (tbi)
- var/vote_no_dead = 0 // dead people can't vote (tbi)
- //var/enable_authentication = 0 // goon authentication
- var/del_new_on_log = 1 // del's new players if they log before they spawn in
- var/objectives_disabled = 0 //if objectives are disabled or not
- var/protect_roles_from_antagonist = 0// If security and such can be contractor/cult/other
- var/allow_Metadata = 0 // Metadata is supported.
- var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
- var/tick_limit_mc_init = TICK_LIMIT_MC_INIT_DEFAULT //SSinitialization throttling
- var/fps = 40
- var/socket_talk = 0 // use socket_talk to communicate with other processes
- var/list/resource_urls
- var/antag_hud_allowed = 0 // Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round.
- var/antag_hud_restricted = 0 // Ghosts that turn on Antagovision cannot rejoin the round.
- var/list/storyteller_names = list()
- var/list/storytellers = list() // allowed modes
- var/humans_need_surnames = 0
- var/allow_random_events = 0 // enables random events mid-round when set to 1
- var/allow_ai = 0 // allow ai job
- var/hostedby
- var/respawn_delay = 30
- var/guest_jobban = 1
- var/usewhitelist = 0
- var/kick_inactive = 0 //force disconnect for inactive players after this many minutes, if non-0
- var/show_mods = 0
- var/show_mentors = 0
- var/mods_can_tempban = 0
- var/mods_can_job_tempban = 0
- var/mod_tempban_max = 1440
- var/mod_job_tempban_max = 1440
- var/load_jobs_from_txt = 0
- var/ToRban = 0
- var/automute_on = 0 //enables automuting/spam prevention
- var/use_cortical_stacks = 0 //enables neural lace
- var/empty_server_restart_time = 0 // Time in minutes before empty server will restart
-
- var/character_slots = 10 // The number of available character slots
- var/loadout_slots = 3 // The number of loadout slots per character
-
- var/max_gear_cost = 10 // Used in chargen for accessory loadout limit. 0 disables loadout, negative allows infinite points.
-
- var/max_maint_drones = 5 //This many drones can spawn,
- var/allow_drone_spawn = 1 //assuming the admin allow them to.
- var/drone_build_time = 1200 //A drone will become available every X ticks since last drone spawn. Default is 2 minutes.
-
- var/enable_mob_sleep = 1 //Experimental - make mobs sleep when no danger is present
-
- var/disable_player_mice = 0
- var/uneducated_mice = 0 //Set to 1 to prevent newly-spawned mice from understanding human speech
-
- var/allow_extra_antags = 0
- var/guests_allowed = 1
- var/debugparanoid = 0
-
- var/language
- var/serverurl
- var/server
- var/banappeals
- var/wikiurl
- var/forumurl
- var/githuburl
- var/discordurl
-
- var/static/ip_reputation = FALSE //Should we query IPs to get scores? Generates HTTP traffic to an API service.
- var/static/ipr_email //Left null because you MUST specify one otherwise you're making the internet worse.
- var/static/ipr_block_bad_ips = FALSE //Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat).
- var/static/ipr_bad_score = 1 //The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad.
- var/static/ipr_allow_existing = FALSE //Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect.
- var/static/ipr_minimum_age = 5 //How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs.
- var/static/ipqualityscore_apikey //API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided.
-
- var/static/panic_bunker = FALSE //Only allow ckeys who have already been seen by the DB. Only makes sense if you have a DB.
- var/static/paranoia_logging = FALSE //Log new byond accounts and first-time joins
-
- //Alert level description
- var/alert_desc_green = "All threats to the ship have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
- var/alert_desc_blue_upto = "The ship has received reliable information about possible hostile activity on the ship. Security staff may have weapons visible, random searches are permitted."
- var/alert_desc_blue_downto = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed."
- var/alert_desc_red_upto = "There is an immediate serious threat to the ship. Security may have weapons unholstered at all times. Random searches are allowed and advised."
- var/alert_desc_red_downto = "The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the ship. Security may have weapons unholstered at all times, random searches are allowed and advised."
-
- var/forbid_singulo_possession = 0
-
- var/organs_decay
-
- //Paincrit knocks someone down once they hit 60 shock_stage, so by default make it so that close to 100 additional damage needs to be dealt,
- //so that it's similar to HALLOSS. Lowered it a bit since hitting paincrit takes much longer to wear off than a halloss stun.
- var/organ_damage_spillover_multiplier = 0.5
-
- var/bones_can_break = 0
- var/limbs_can_break = 1
-
- var/revival_pod_plants = 1
- var/revival_cloning = 1
- var/revival_brain_life = -1
-
- var/use_loyalty_implants = 0
-
- var/welder_vision = 1
- var/generate_asteroid = 0
- var/no_click_cooldown = 0
- var/z_level_shooting = TRUE
-
- var/admin_legacy_system = 0 //Defines whether the server uses the legacy admin system with admins.txt or the SQL system. Config option in config.txt
- var/ban_legacy_system = 0 //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt
- var/admin_memo_system = 0
-
- var/simultaneous_pm_warning_timeout = 100
-
- var/use_recursive_explosions //Defines whether the server uses recursive or circular explosions.
-
- var/assistant_maint = 0 //Do assistants get maint access?
- var/gateway_delay = 18000 //How long the gateway takes before it activates. Default is half an hour.
- var/ghost_interaction = 0
-
- var/comms_password = ""
-
- var/forbid_admin_profiling = FALSE
-
- var/list/forbidden_versions = list() // Clients with these byond versions will be autobanned. Format: string "byond_version.byond_build"; separate with ; in config, e.g. 512.1234;512.1235
- var/minimum_byond_version
- var/minimum_byond_build
-
- var/enter_allowed = 1
-
- var/use_irc_bot = 0
- var/irc_bot_host = ""
- var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge
- var/main_irc = ""
- var/admin_irc = ""
- var/announce_shuttle_dock_to_irc = FALSE
- var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix
- var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
- var/use_overmap = 0
-
- var/start_location = "asteroid" // Start location defaults to asteroid.
-
- // Event settings
- var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours
- // If the first delay has a custom start time
- // No custom time, no custom time, between 80 to 100 minutes respectively.
- var/list/event_first_run = list(
- EVENT_LEVEL_MUNDANE = null,
- EVENT_LEVEL_MODERATE = null,
- EVENT_LEVEL_MAJOR = list("lower" = 48000, "upper" = 60000),
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = list("lower" = 16000, "upper" = 20000),
- )
- // The lowest delay until next event
- // 10, 30, 50 minutes respectively
- var/list/event_delay_lower = list(
- EVENT_LEVEL_MUNDANE = 6000,
- EVENT_LEVEL_MODERATE = 18000,
- EVENT_LEVEL_MAJOR = 30000,
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = 18000
- )
- // The upper delay until next event
- // 15, 45, 70 minutes respectively
- var/list/event_delay_upper = list(
- EVENT_LEVEL_MUNDANE = 9000,
- EVENT_LEVEL_MODERATE = 27000,
- EVENT_LEVEL_MAJOR = 42000,
- EVENT_LEVEL_ROLESET = null,
- EVENT_LEVEL_ECONOMY = 18000
- )
-
- var/abandon_allowed = 1
- var/ooc_allowed = 1
- var/looc_allowed = 1
- var/dooc_allowed = 1
- var/dsay_allowed = 1
-
- var/starlight = "#ffffff" // null if turned off
-
- var/list/ert_species = list(SPECIES_HUMAN)
-
- var/law_zero = "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010"
-
- var/aggressive_changelog = 0
-
- var/list/language_prefixes = list(",", "#", "-")//Default language prefixes
-
- var/ghosts_can_possess_animals = 0
-
- var/emojis = 0
-
- var/paper_input = TRUE
-
- var/random_submap_orientation = FALSE // If true, submaps loaded automatically can be rotated.
-
- var/webhook_url
- var/webhook_key
-
- var/tts_key // Login and password that we use to generate tts_bearer
- var/tts_enabled // Global switch
- var/tts_cache // Store generated tts files and reuse them, instead of always requesting new
-
- var/static/regex/ic_filter_regex //For the cringe filter.
-
- var/generate_loot_data = FALSE //for loot rework
-
- var/profiler_permission = R_DEBUG | R_SERVER
-
-/datum/configuration/New()
- fill_storyevents_list()
-
- var/list/L = typesof(/datum/storyteller)-/datum/storyteller
- for (var/T in L)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- var/datum/storyteller/S = new T()
- if (S.config_tag)
- GLOB.storyteller_cache[S.config_tag] = S // So we don't instantiate them repeatedly.
- if(!(S.config_tag in storytellers)) // ensure each mode is added only once
- log_misc("Adding storyteller [S.name] ([S.config_tag]) to configuration.")
- src.storytellers += S.config_tag
- src.storyteller_names[S.config_tag] = S.name
-
-/datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
- var/list/Lines = file2list(filename)
-
- for(var/t in Lines)
- if(!t) continue
-
- t = trim(t)
- if (length(t) == 0)
- continue
- else if (copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name
- var/value
-
- if (pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if (!name)
- continue
-
- if(type == "config")
- switch (name)
- if ("resource_urls")
- config.resource_urls = splittext(value, " ")
-
- if ("admin_legacy_system")
- config.admin_legacy_system = 1
-
- if ("ban_legacy_system")
- config.ban_legacy_system = 1
-
- if ("admin_memo_system")
- config.admin_memo_system = 1
-
- if ("use_recursive_explosions")
- use_recursive_explosions = 1
-
- if ("log_ooc")
- config.log_ooc = 1
-
- if ("log_access")
- config.log_access = 1
-
- if ("sql_enabled")
- config.sql_enabled = 1
-
- if ("log_say")
- config.log_say = 1
-
- if ("debug_paranoid")
- config.debugparanoid = 1
-
- if ("log_admin")
- config.log_admin = 1
-
- if ("log_debug")
- config.log_debug = 1
-
- if ("log_game")
- config.log_game = 1
-
- if ("log_vote")
- config.log_vote = 1
-
- if ("log_whisper")
- config.log_whisper = 1
-
- if ("log_attack")
- config.log_attack = 1
-
- if ("log_emote")
- config.log_emote = 1
-
- if ("log_adminchat")
- config.log_adminchat = 1
-
- if ("log_adminwarn")
- config.log_adminwarn = 1
-
- if ("log_pda")
- config.log_pda = 1
-
- if ("log_world_output")
- config.log_world_output = 1
-
- if ("log_hrefs")
- config.log_hrefs = 1
-
- if ("log_runtime")
- config.log_runtime = 1
- var/newlog = file("data/logs/runtimes/runtime-[time2text(world.realtime, "YYYY-MM-DD")].log")
- if(runtime_diary != newlog)
- world.log << "Now logging runtimes to data/logs/runtimes/runtime-[time2text(world.realtime, "YYYY-MM-DD")].log"
- runtime_diary = newlog
-
- if ("generate_asteroid")
- config.generate_asteroid = 1
-
- if ("no_click_cooldown")
- config.no_click_cooldown = 1
-
- if("allow_admin_ooccolor")
- config.allow_admin_ooccolor = 1
-
- if ("allow_vote_restart")
- config.allow_vote_restart = 1
-
- if ("allow_vote_mode")
- config.allow_vote_mode = 1
-
- if ("no_dead_vote")
- config.vote_no_dead = 1
-
- if ("default_no_vote")
- config.vote_no_default = 1
-
- if ("vote_delay")
- config.vote_delay = text2num(value)
-
- if ("vote_period")
- config.vote_period = text2num(value)
-
- if ("vote_autogamemode_timeleft")
- config.vote_autogamemode_timeleft = text2num(value)
-
- if("ert_admin_only")
- config.ert_admin_call_only = 1
-
- if ("allow_ai")
- config.allow_ai = 1
-
-// if ("authentication")
-// config.enable_authentication = 1
-
- if ("respawn_delay")
- config.respawn_delay = text2num(value)
-
- if ("servername")
- config.server_name = value
-
- if ("serversuffix")
- config.server_suffix = 1
-
- if ("nudge_script_path")
- config.nudge_script_path = value
-
- if ("hostedby")
- config.hostedby = value
-
- if ("serverurl")
- config.serverurl = value
-
- if ("language")
- config.language = value
-
- if ("server")
- config.server = value
-
- if ("banappeals")
- config.banappeals = value
-
- if ("wikiurl")
- config.wikiurl = value
-
- if ("discordurl")
- config.discordurl = value
-
- if ("forumurl")
- config.forumurl = value
-
- if ("githuburl")
- config.githuburl = value
-
- if("ip_reputation")
- config.ip_reputation = 1
-
- if("ipr_email")
- config.ipr_email = value
-
- if("ipr_block_bad_ips")
- config.ipr_block_bad_ips = 1
-
- if("ipr_bad_score")
- config.ipr_bad_score = text2num(value)
-
- if("ipr_allow_existing")
- config.ipr_allow_existing = 1
-
- if("ipr_minimum_age")
- config.ipr_minimum_age = text2num(value)
-
- if ("ipqualityscore_apikey")
- config.ipqualityscore_apikey = value
-
- if ("panic_bunker")
- config.panic_bunker = 1
-
- if ("paranoia_logging")
- config.paranoia_logging = 1
-
- if ("ghosts_can_possess_animals")
- config.ghosts_can_possess_animals = value
-
- if ("guest_jobban")
- config.guest_jobban = 1
-
- if ("guest_ban")
- config.guests_allowed = 0
-
- if ("disable_ooc")
- config.ooc_allowed = 0
- config.looc_allowed = 0
-
- if ("disable_entry")
- config.enter_allowed = 0
-
- if ("disable_dead_ooc")
- config.dooc_allowed = 0
-
- if ("disable_dsay")
- config.dsay_allowed = 0
-
- if ("disable_respawn")
- config.abandon_allowed = 0
-
- if ("usewhitelist")
- config.usewhitelist = 1
-
- if ("allow_metadata")
- config.allow_Metadata = 1
-
- if ("objectives_disabled")
- config.objectives_disabled = 1
-
- if("protect_roles_from_antagonist")
- config.protect_roles_from_antagonist = 1
-
- if("allow_random_events")
- config.allow_random_events = 1
-
- if("kick_inactive")
- config.kick_inactive = text2num(value)
-
- if("show_mods")
- config.show_mods = 1
-
- if("show_mentors")
- config.show_mentors = 1
-
- if("mods_can_tempban")
- config.mods_can_tempban = 1
-
- if("mods_can_job_tempban")
- config.mods_can_job_tempban = 1
-
- if("mod_tempban_max")
- config.mod_tempban_max = text2num(value)
-
- if("mod_job_tempban_max")
- config.mod_job_tempban_max = text2num(value)
-
- if("load_jobs_from_txt")
- load_jobs_from_txt = 1
-
- if("alert_red_upto")
- config.alert_desc_red_upto = value
-
- if("alert_red_downto")
- config.alert_desc_red_downto = value
-
- if("alert_blue_downto")
- config.alert_desc_blue_downto = value
-
- if("alert_blue_upto")
- config.alert_desc_blue_upto = value
-
- if("alert_green")
- config.alert_desc_green = value
-
- if("forbid_singulo_possession")
- forbid_singulo_possession = 1
-
- if("popup_admin_pm")
- config.popup_admin_pm = 1
-
- if("use_irc_bot")
- use_irc_bot = 1
-
- if("irc_bot_export")
- irc_bot_export = 1
-
- if("fps")
- fps = text2num(value)
-
- if("tick_limit_mc_init")
- tick_limit_mc_init = text2num(value)
-
- if("allow_antag_hud")
- config.antag_hud_allowed = 1
- if("antag_hud_restricted")
- config.antag_hud_restricted = 1
-
- if("socket_talk")
- socket_talk = text2num(value)
-
- if("humans_need_surnames")
- humans_need_surnames = 1
-
- if("tor_ban")
- ToRban = 1
-
- if("automute_on")
- automute_on = 1
-
- if("assistant_maint")
- config.assistant_maint = 1
-
- if("gateway_delay")
- config.gateway_delay = text2num(value)
-
- if("ghost_interaction")
- config.ghost_interaction = 1
-
- if("disable_player_mice")
- config.disable_player_mice = 1
-
- if("uneducated_mice")
- config.uneducated_mice = 1
-
- if("comms_password")
- config.comms_password = value
-
- if("forbidden_versions")
- config.forbidden_versions = splittext(value, ";")
-
- if("minimum_byond_version")
- config.minimum_byond_version = text2num(value)
-
- if("minimum_byond_build")
- config.minimum_byond_build = text2num(value)
-
- if("irc_bot_host")
- config.irc_bot_host = value
-
- if("main_irc")
- config.main_irc = value
-
- if("admin_irc")
- config.admin_irc = value
-
- if("announce_shuttle_dock_to_irc")
- config.announce_shuttle_dock_to_irc = TRUE
-
- if("python_path")
- if(value)
- config.python_path = value
-
- if("use_lib_nudge")
- config.use_lib_nudge = 1
-
- if("max_gear_cost")
- max_gear_cost = text2num(value)
- if(max_gear_cost < 0)
- max_gear_cost = INFINITY
-
- if("character_slots")
- config.character_slots = text2num(value)
-
- if("allow_drone_spawn")
- config.allow_drone_spawn = text2num(value)
-
- if("drone_build_time")
- config.drone_build_time = text2num(value)
-
- if("max_maint_drones")
- config.max_maint_drones = text2num(value)
-
- if("use_overmap")
- config.use_overmap = 1
-
- if("expected_round_length")
- config.expected_round_length = MinutesToTicks(text2num(value))
-
- if("disable_welder_vision")
- config.welder_vision = 0
-
- if("allow_extra_antags")
- config.allow_extra_antags = 1
-
- if("event_custom_start_mundane")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MUNDANE] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_moderate")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MODERATE] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_major")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_MAJOR] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_custom_start_economy")
- var/values = text2numlist(value, ";")
- config.event_first_run[EVENT_LEVEL_ECONOMY] = list("lower" = MinutesToTicks(values[1]), "upper" = MinutesToTicks(values[2]))
-
- if("event_delay_lower")
- var/values = text2numlist(value, ";")
- config.event_delay_lower[EVENT_LEVEL_MUNDANE] = MinutesToTicks(values[1])
- config.event_delay_lower[EVENT_LEVEL_MODERATE] = MinutesToTicks(values[2])
- config.event_delay_lower[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3])
- config.event_delay_lower[EVENT_LEVEL_ECONOMY] = MinutesToTicks(values[4])
-
- if("event_delay_upper")
- var/values = text2numlist(value, ";")
- config.event_delay_upper[EVENT_LEVEL_MUNDANE] = MinutesToTicks(values[1])
- config.event_delay_upper[EVENT_LEVEL_MODERATE] = MinutesToTicks(values[2])
- config.event_delay_upper[EVENT_LEVEL_MAJOR] = MinutesToTicks(values[3])
- config.event_delay_upper[EVENT_LEVEL_ECONOMY] = MinutesToTicks(values[4])
-
- if("starlight")
- config.starlight = value ? value : 0
-
- if("random_submap_orientation")
- config.random_submap_orientation = 1
-
- if("ert_species")
- config.ert_species = splittext(value, ";")
- if(!config.ert_species.len)
- config.ert_species += SPECIES_HUMAN
-
- if("use_cortical_stacks")
- config.use_cortical_stacks = 1
-
- if("loadout_slots")
- config.loadout_slots = text2num(value)
-
- if("law_zero")
- law_zero = value
-
- if("aggressive_changelog")
- config.aggressive_changelog = 1
-
- if("default_language_prefixes")
- var/list/values = splittext(value, " ")
- if(values.len > 0)
- language_prefixes = values
-
- if("empty_server_restart_time")
- config.empty_server_restart_time = text2num(value)
-
- if("emojis")
- config.emojis = 1
-
- if("paper_input")
- config.paper_input = text2num(value)
-
- if("enable_mob_sleep")
- config.enable_mob_sleep = 1
-
- if("webhook_key")
- config.webhook_key = value
-
- if("webhook_url")
- config.webhook_url = value
-
- if("tts_key")
- config.tts_key = value
-
- if("tts_enabled")
- config.tts_enabled = config.tts_key ? value : FALSE
-
- if("tts_cache")
- config.tts_cache = value
-
- if("random_start")
- var/list/startlist = list(
- "asteroid",
- "abandoned fortress",
- "space ruins")
- var/pick = rand(1, startlist.len)
- config.start_location = startlist[pick]
-
- if("asteroid_start")
- config.start_location = "asteroid"
-
- if("fortress_start")
- config.start_location = "abandoned fortress"
-
- if("ruins_start")
- config.start_location = "space ruins"
-
- if("profiler_permission")
- config.profiler_permission = text2num(value)
-
- if("generate_loot_data")
- config.generate_loot_data = TRUE
- else
- log_misc("Unknown setting in configuration: '[name]'")
-
-
- else if(type == "game_options")
- if(!value)
- log_misc("Unknown value for setting [name] in [filename].")
- value = text2num(value)
-
- switch(name)
- if("revival_pod_plants")
- config.revival_pod_plants = value
- if("revival_cloning")
- config.revival_cloning = value
- if("revival_brain_life")
- config.revival_brain_life = value
- if("organ_damage_spillover_multiplier")
- config.organ_damage_spillover_multiplier = value / 100
- if("organs_can_decay")
- config.organs_decay = 1
- if("bones_can_break")
- config.bones_can_break = value
- if("limbs_can_break")
- config.limbs_can_break = value
- if("use_loyalty_implants")
- config.use_loyalty_implants = 1
- else
- log_misc("Unknown setting in configuration: '[name]'")
- loaded = TRUE
- LoadChatFilter()
-
-/datum/configuration/proc/loadsql(filename) // -- TLE
- var/list/Lines = file2list(filename)
- for(var/t in Lines)
- if(!t) continue
-
- t = trim(t)
- if (length(t) == 0)
- continue
- else if (copytext(t, 1, 2) == "#")
- continue
-
- var/pos = findtext(t, " ")
- var/name
- var/value
-
- if (pos)
- name = lowertext(copytext(t, 1, pos))
- value = copytext(t, pos + 1)
- else
- name = lowertext(t)
-
- if (!name)
- continue
-
- switch (name)
- if ("address")
- sqladdress = value
- if ("port")
- sqlport = value
- if ("database")
- sqldb = value
- if ("login")
- sqllogin = value
- if ("password")
- sqlpass = value
- else
- log_misc("Unknown setting in configuration: '[name]'")
-
-/datum/configuration/proc/pick_storyteller(story_name)
- // I wish I didn't have to instance the game modes in order to look up
- // their information, but it is the only way (at least that I know of).
- if(story_name in GLOB.storyteller_cache)
- return GLOB.storyteller_cache[story_name]
-
- return GLOB.storyteller_cache[STORYTELLER_BASE]
-
-/datum/configuration/proc/get_storytellers()
- var/list/runnable_storytellers = list()
- for(var/storyteller in GLOB.storyteller_cache)
- var/datum/storyteller/S = GLOB.storyteller_cache[storyteller]
- if(S)
- runnable_storytellers |= S
- return runnable_storytellers
-
-
-
-/datum/configuration/proc/post_load()
- //apply a default value to config.python_path, if needed
- if (!config.python_path)
- if(world.system_type == UNIX)
- config.python_path = "/usr/bin/env python2"
- else //probably windows, if not this should work anyway
- config.python_path = "python"
-
- world.name = station_name
-
-
-/datum/configuration/proc/LoadChatFilter()
- GLOB.in_character_filter = list()
-
- for(var/line in world.file2list("config/in_character_filter.txt"))
- if(!line)
- continue
- if(findtextEx(line,"#",1,2))
- continue
- GLOB.in_character_filter += line
-
- if(!ic_filter_regex && GLOB.in_character_filter.len)
- ic_filter_regex = regex("\\b([jointext(GLOB.in_character_filter, "|")])\\b", "i")
diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm
new file mode 100644
index 00000000000..def6534f2fc
--- /dev/null
+++ b/code/controllers/configuration/config_entry.dm
@@ -0,0 +1,303 @@
+/datum/config_entry
+ /// Read-only, this is determined by the last portion of the derived entry type
+ var/name
+ /// The configured value for this entry. This shouldn't be initialized in code, instead set default
+ var/config_entry_value
+ /// Read-only default value for this config entry, used for resetting value to defaults when necessary. This is what config_entry_value is initially set to
+ var/default
+ /// The file which this was loaded from, if any
+ var/resident_file
+ /// Set to TRUE if the default has been overridden by a config entry
+ var/modified = FALSE
+ /// The config name of a configuration type that depricates this, if it exists
+ var/deprecated_by
+ /// The /datum/config_entry type that supercedes this one
+ var/protection = NONE
+ /// Do not instantiate if type matches this
+ var/abstract_type = /datum/config_entry
+ /// Force validate and set on VV. VAS proccall guard will run regardless.
+ var/vv_VAS = TRUE
+ /// Controls if error is thrown when duplicate configuration values for this entry type are encountered
+ var/dupes_allowed = FALSE
+ /// Stores the original protection configuration, used for set_default()
+ var/default_protection
+
+/datum/config_entry/New()
+ if(type == abstract_type)
+ CRASH("Abstract config entry [type] instatiated!")
+ name = lowertext(type2top(type))
+ default_protection = protection
+ set_default()
+
+/datum/config_entry/Destroy()
+ config.RemoveEntry(src)
+ return ..()
+
+/**
+ * Returns the value of the configuration datum to its default, used for resetting a config value. Note this also sets the protection back to default.
+ */
+/datum/config_entry/proc/set_default()
+ if ((protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall())
+ log_admin("[key_name(usr)] attempted to reset locked config entry [type] to its default")
+ return
+ if (islist(default))
+ var/list/L = default
+ config_entry_value = L.Copy()
+ else
+ config_entry_value = default
+ protection = default_protection
+ resident_file = null
+ modified = FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/can_vv_get(var_name)
+// . = ..()
+// if(var_name == NAMEOF(src, config_entry_value) || var_name == NAMEOF(src, default))
+// . &= !(protection & CONFIG_ENTRY_HIDDEN)
+
+// /datum/config_entry/vv_edit_var(var_name, var_value)
+// var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed))
+// if(var_name == NAMEOF(src, config_entry_value))
+// if(protection & CONFIG_ENTRY_LOCKED)
+// return FALSE
+// if(vv_VAS)
+// . = ValidateAndSet("[var_value]")
+// if(.)
+// datum_flags |= DF_VAR_EDITED
+// return
+// else
+// return ..()
+// if(var_name in banned_edits)
+// return FALSE
+// return ..()
+
+/datum/config_entry/proc/VASProcCallGuard(str_val)
+ . = !((protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall())
+ if(!.)
+ log_admin("[key_name(usr)] attempted to set locked config entry [type] to '[str_val]'")
+
+/datum/config_entry/proc/ValidateAndSet(str_val)
+ VASProcCallGuard(str_val)
+ CRASH("Invalid config entry type!")
+
+/datum/config_entry/proc/ValidateListEntry(key_name, key_value)
+ return TRUE
+
+/datum/config_entry/proc/DeprecationUpdate(value)
+ return
+
+/datum/config_entry/string
+ default = ""
+ abstract_type = /datum/config_entry/string
+ var/auto_trim = TRUE
+ /// whether the string will be lowercased on ValidateAndSet or not.
+ var/lowercase = FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+
+// /datum/config_entry/string/vv_edit_var(var_name, var_value)
+// return var_name != NAMEOF(src, auto_trim) && ..()
+
+/datum/config_entry/string/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ config_entry_value = auto_trim ? trim(str_val) : str_val
+ if(lowercase)
+ config_entry_value = lowertext(config_entry_value)
+ return TRUE
+
+/datum/config_entry/number
+ default = 0
+ abstract_type = /datum/config_entry/number
+ var/integer = TRUE
+ var/max_val = INFINITY
+ var/min_val = -INFINITY
+
+/datum/config_entry/number/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ var/temp = text2num(trim(str_val))
+ if(!isnull(temp))
+ config_entry_value = clamp(integer ? round(temp) : temp, min_val, max_val)
+ if(config_entry_value != temp && !(datum_flags & DF_VAR_EDITED))
+ log_config("Changing [name] from [temp] to [config_entry_value]!")
+ return TRUE
+ return FALSE
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/number/vv_edit_var(var_name, var_value)
+// var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer))
+// return !(var_name in banned_edits) && ..()
+
+/datum/config_entry/flag
+ default = FALSE
+ abstract_type = /datum/config_entry/flag
+
+/datum/config_entry/flag/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ config_entry_value = text2num(trim(str_val)) != 0
+ return TRUE
+
+/// List config entry, used for configuring a list of strings
+/datum/config_entry/str_list
+ abstract_type = /datum/config_entry/str_list
+ default = list()
+ dupes_allowed = TRUE
+ /// whether the string elements will be lowercased on ValidateAndSet or not.
+ var/lowercase = FALSE
+
+/datum/config_entry/str_list/ValidateAndSet(str_val)
+ if (!VASProcCallGuard(str_val))
+ return FALSE
+ str_val = trim(str_val)
+ if (str_val != "")
+ config_entry_value += lowercase ? lowertext(str_val) : str_val
+ return TRUE
+
+/datum/config_entry/number_list
+ abstract_type = /datum/config_entry/number_list
+ default = list()
+
+/datum/config_entry/number_list/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+ str_val = trim(str_val)
+ var/list/new_list = list()
+ var/list/values = splittext(str_val," ")
+ for(var/I in values)
+ var/temp = text2num(I)
+ if(isnull(temp))
+ return FALSE
+ new_list += temp
+ if(!new_list.len)
+ return FALSE
+ config_entry_value = new_list
+ return TRUE
+
+/datum/config_entry/keyed_list
+ abstract_type = /datum/config_entry/keyed_list
+ default = list()
+ dupes_allowed = TRUE
+ vv_VAS = FALSE //VAS will not allow things like deleting from lists, it'll just bug horribly.
+ var/key_mode
+ var/value_mode
+ var/splitter = " "
+ /// whether the key names will be lowercased on ValidateAndSet or not.
+ var/lowercase_key = TRUE
+
+/datum/config_entry/keyed_list/New()
+ . = ..()
+ if(isnull(key_mode) || isnull(value_mode))
+ CRASH("Keyed list of type [type] created with null key or value mode!")
+
+/datum/config_entry/keyed_list/ValidateAndSet(str_val)
+ if(!VASProcCallGuard(str_val))
+ return FALSE
+
+ str_val = trim(str_val)
+
+ var/list/new_entry = parse_key_and_value(str_val)
+
+ var/new_key = new_entry["config_key"]
+ var/new_value = new_entry["config_value"]
+
+ if(!isnull(new_value) && !isnull(new_key) && ValidateListEntry(new_key, new_value))
+ config_entry_value[new_key] = new_value
+ return TRUE
+ return FALSE
+
+/datum/config_entry/keyed_list/proc/parse_key_and_value(option_string)
+ // Blank or null option string? Bad mojo!
+ if(!option_string)
+ log_config("ERROR: Keyed list config tried to parse with no key or value data.")
+ return null
+
+ var/list/config_entry_words = splittext(option_string, splitter)
+ var/config_value
+ var/config_key
+ var/is_ambiguous = FALSE
+
+ // If this config entry's value mode is flag, the value can either be TRUE or FALSE.
+ // However, the config supports implicitly setting a config entry to TRUE by omitting the value.
+ // This value mode should also support config overrides disabling it too.
+ // The following code supports config entries as such:
+ // Implicitly enable the config entry: CONFIG_ENTRY config key goes here
+ // Explicitly enable the config entry: CONFIG_ENTRY config key goes here 1
+ // Explicitly disable the config entry: CONFIG_ENTRY config key goes here 0
+ if(value_mode == VALUE_MODE_FLAG)
+ var/value = peek(config_entry_words)
+ config_value = TRUE
+
+ if(value == "0")
+ config_key = jointext(config_entry_words, splitter, length(config_entry_words) - 1)
+ config_value = FALSE
+ is_ambiguous = (length(config_entry_words) > 2)
+ else if(value == "1")
+ config_key = jointext(config_entry_words, splitter, length(config_entry_words) - 1)
+ is_ambiguous = (length(config_entry_words) > 2)
+ else
+ config_key = option_string
+ is_ambiguous = (length(config_entry_words) > 1)
+ // Else it has to be a key value pair and we parse it under that assumption.
+ else
+ // If config_entry_words only has 1 or 0 words in it and isn't value_mode == VALUE_MODE_FLAG then it's an invalid config entry.
+ if(length(config_entry_words) <= 1)
+ log_config("ERROR: Could not parse value from config entry string: [option_string]")
+ return null
+
+ config_value = pop(config_entry_words)
+ config_key = jointext(config_entry_words, splitter)
+
+ if(lowercase_key)
+ config_key = lowertext(config_key)
+
+ is_ambiguous = (length(config_entry_words) > 2)
+
+ config_key = validate_config_key(config_key)
+ config_value = validate_config_value(config_value)
+
+ // If there are multiple splitters, it's definitely ambiguous and we'll warn about how we parsed it. Helps with debugging config issues.
+ if(is_ambiguous)
+ log_config("WARNING: Multiple splitter characters (\"[splitter]\") found. Using \"[config_key]\" as config key and \"[config_value]\" as config value.")
+
+ return list("config_key" = config_key, "config_value" = config_value)
+
+/// Takes a given config key and validates it. If successful, returns the formatted key. If unsuccessful, returns null.
+/datum/config_entry/keyed_list/proc/validate_config_key(key)
+ switch(key_mode)
+ if(KEY_MODE_TEXT)
+ return key
+ if(KEY_MODE_TYPE)
+ if(ispath(key))
+ return key
+
+ var/key_path = text2path(key)
+ if(isnull(key_path))
+ log_config("ERROR: Invalid KEY_MODE_TYPE typepath. Is not a valid typepath: [key]")
+ return
+
+ return key_path
+
+
+/// Takes a given config value and validates it. If successful, returns the formatted key. If unsuccessful, returns null.
+/datum/config_entry/keyed_list/proc/validate_config_value(value)
+ switch(value_mode)
+ if(VALUE_MODE_FLAG)
+ return value
+ if(VALUE_MODE_NUM)
+ if(isnum(value))
+ return value
+
+ var/value_num = text2num(value)
+ if(isnull(value_num))
+ log_config("ERROR: Invalid VALUE_MODE_NUM number. Could not parse a valid number: [value]")
+ return
+
+ return value_num
+ if(VALUE_MODE_TEXT)
+ return value
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+// /datum/config_entry/keyed_list/vv_edit_var(var_name, var_value)
+// return var_name != NAMEOF(src, splitter) && ..()
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
new file mode 100644
index 00000000000..66d3664ae1b
--- /dev/null
+++ b/code/controllers/configuration/configuration.dm
@@ -0,0 +1,609 @@
+
+
+/datum/controller/configuration
+ name = "Configuration"
+
+ var/directory = "config"
+
+ var/warned_deprecated_configs = FALSE
+ var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it
+ var/list/entries
+ var/list/entries_by_type
+
+
+ var/list/modes // allowed modes
+ var/list/gamemode_cache
+ var/list/votable_modes // votable modes
+ var/list/mode_names
+ var/list/mode_reports
+ var/list/mode_false_report_weight
+
+ var/list/lobby_notices
+
+ var/motd
+ var/policy
+
+ /// If the configuration is loaded
+ var/loaded = FALSE
+
+ /// A regex that matches words blocked IC
+ var/static/regex/ic_filter_regex
+
+ /// A regex that matches words blocked OOC
+ var/static/regex/ooc_filter_regex
+
+ /// A regex that matches words blocked IC, but not in PDAs
+ var/static/regex/ic_outside_pda_filter_regex
+
+ /// A regex that matches words soft blocked IC
+ var/static/regex/soft_ic_filter_regex
+
+ /// A regex that matches words soft blocked OOC
+ var/static/regex/soft_ooc_filter_regex
+
+ /// A regex that matches words soft blocked IC, but not in PDAs
+ var/static/regex/soft_ic_outside_pda_filter_regex
+
+ /// An assoc list of blocked IC words to their reasons
+ var/static/list/ic_filter_reasons
+
+ /// An assoc list of words that are blocked IC, but not in PDAs, to their reasons
+ var/static/list/ic_outside_pda_filter_reasons
+
+ /// An assoc list of words that are blocked both IC and OOC to their reasons
+ var/static/list/shared_filter_reasons
+
+ /// An assoc list of soft blocked IC words to their reasons
+ var/static/list/soft_ic_filter_reasons
+
+ /// An assoc list of words that are soft blocked IC, but not in PDAs, to their reasons
+ var/static/list/soft_ic_outside_pda_filter_reasons
+
+ /// An assoc list of words that are soft blocked both IC and OOC to their reasons
+ var/static/list/soft_shared_filter_reasons
+
+ ///A list of all the pulled shared expressions
+ var/static/list/shared_regex_reason
+
+ /// A list of configuration errors that occurred during load
+ var/static/list/configuration_errors
+
+ var/nudge_script_path = "nudge.py" // where the nudge.py script is located
+
+
+ //var/enable_authentication = 0 // goon authentication
+
+ // var/objectives_disabled = 0 //if objectives are disabled or not
+ // var/protect_roles_from_antagonist = 0// If security and such can be contractor/cult/other
+ var/list/resource_urls
+
+ var/list/storyteller_names = list()
+ var/list/storytellers = list() // allowed modes
+ var/humans_need_surnames = 0
+ var/allow_random_events = 0 // enables random events mid-round when set to 1
+
+ var/load_jobs_from_txt = 0
+
+ var/character_slots = 10 // The number of available character slots
+ var/loadout_slots = 3 // The number of loadout slots per character
+
+ var/max_gear_cost = 10 // Used in chargen for accessory loadout limit. 0 disables loadout, negative allows infinite points.
+
+
+
+ // var/allow_extra_antags = 0
+
+
+ // Event settings
+ // var/expected_round_length = 3 * 60 * 60 * 10 // 3 hours
+ // If the first delay has a custom start time
+ // No custom time, no custom time, between 80 to 100 minutes respectively.
+
+ // TODO: figure out how to.. datumize this with the keyed_list config entry type
+ // UPDATE: NOTHING FUCKING USES THIS
+ var/list/event_first_run = list(
+ EVENT_LEVEL_MUNDANE = null,
+ EVENT_LEVEL_MODERATE = null,
+ EVENT_LEVEL_MAJOR = list("lower" = 48000, "upper" = 60000),
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = list("lower" = 16000, "upper" = 20000),
+ )
+ // The lowest delay until next event
+ // 10, 30, 50 minutes respectively
+ var/list/event_delay_lower = list(
+ EVENT_LEVEL_MUNDANE = 6000,
+ EVENT_LEVEL_MODERATE = 18000,
+ EVENT_LEVEL_MAJOR = 30000,
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = 18000
+ )
+ // The upper delay until next event
+ // 15, 45, 70 minutes respectively
+ var/list/event_delay_upper = list(
+ EVENT_LEVEL_MUNDANE = 9000,
+ EVENT_LEVEL_MODERATE = 27000,
+ EVENT_LEVEL_MAJOR = 42000,
+ EVENT_LEVEL_ROLESET = null,
+ EVENT_LEVEL_ECONOMY = 18000
+ )
+
+/datum/controller/configuration/New()
+ fill_storyevents_list()
+
+ var/list/L = typesof(/datum/storyteller)-/datum/storyteller
+ for (var/T in L)
+ // I wish I didn't have to instance the game modes in order to look up
+ // their information, but it is the only way (at least that I know of).
+ var/datum/storyteller/S = new T()
+ if (S.config_tag)
+ storyteller_cache[S.config_tag] = S // So we don't instantiate them repeatedly.
+ if(!(S.config_tag in storytellers)) // ensure each mode is added only once
+ log_game("Adding storyteller [S.name] ([S.config_tag]) to configuration.")
+ src.storytellers += S.config_tag
+ src.storyteller_names[S.config_tag] = S.name
+
+/datum/controller/configuration/proc/admin_reload()
+ if(IsAdminAdvancedProcCall())
+ return
+ log_admin("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
+ message_admins("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
+ full_wipe()
+ Load(world.params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER])
+
+/datum/controller/configuration/proc/Load(_directory)
+ if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything.
+ return
+ if(_directory)
+ directory = _directory
+ if(entries)
+ CRASH("/datum/controller/configuration/Load() called more than once!")
+ configuration_errors ||= list()
+ InitEntries()
+ if(fexists("[directory]/config.txt") && LoadEntries("config.txt") <= 1)
+ var/list/legacy_configs = list("game_options.txt", "dbconfig.txt", "comms.txt")
+ for(var/I in legacy_configs)
+ if(fexists("[directory]/[I]"))
+ log_config("No $include directives found in config.txt! Loading legacy [legacy_configs.Join("/")] files...")
+ for(var/J in legacy_configs)
+ LoadEntries(J)
+ break
+ if (fexists("[directory]/dev_overrides.txt"))
+ LoadEntries("dev_overrides.txt")
+ // if (fexists("[directory]/ezdb.txt"))
+ // LoadEntries("ezdb.txt")
+ load_important_notices()
+ LoadMOTD()
+ LoadSQL("dbconfig.txt")
+ LoadChatFilter()
+ // if(CONFIG_GET(flag/load_jobs_from_txt))
+ // validate_job_config()
+ if(CONFIG_GET(flag/usewhitelist))
+ load_whitelist()
+
+ loaded = TRUE
+
+ if (Master)
+ Master.OnConfigLoad()
+ process_config_errors()
+
+/datum/controller/configuration/proc/full_wipe()
+ if(IsAdminAdvancedProcCall())
+ return
+ entries_by_type.Cut()
+ QDEL_LIST_ASSOC_VAL(entries)
+ entries = null
+ configuration_errors?.Cut()
+
+/datum/controller/configuration/Destroy()
+ full_wipe()
+ config = null
+
+ return ..()
+
+/datum/controller/configuration/proc/log_config_error(error_message)
+ configuration_errors += error_message
+ log_config(error_message)
+
+/datum/controller/configuration/proc/process_config_errors()
+ if(!CONFIG_GET(flag/config_errors_runtime))
+ return
+ for(var/error_message in configuration_errors)
+ stack_trace(error_message)
+
+/datum/controller/configuration/proc/InitEntries()
+ var/list/_entries = list()
+ entries = _entries
+ var/list/_entries_by_type = list()
+ entries_by_type = _entries_by_type
+
+ for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case
+ var/datum/config_entry/E = I
+ if(initial(E.abstract_type) == I)
+ continue
+ E = new I
+ var/esname = E.name
+ var/datum/config_entry/test = _entries[esname]
+ if(test)
+ log_config_error("Error: [test.type] has the same name as [E.type]: [esname]! Not initializing [E.type]!")
+ qdel(E)
+ continue
+ _entries[esname] = E
+ _entries_by_type[I] = E
+
+/datum/controller/configuration/proc/RemoveEntry(datum/config_entry/CE)
+ entries -= CE.name
+ entries_by_type -= CE.type
+
+/datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
+ if(IsAdminAdvancedProcCall())
+ return
+
+ var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
+ if(filename_to_test in stack)
+ log_config_error("Warning: Config recursion detected ([english_list(stack)]), breaking!")
+ return
+ stack = stack + filename_to_test
+
+ log_config("Loading config file [filename]...")
+ var/list/lines = world.file2list("[directory]/[filename]")
+ var/list/_entries = entries
+ for(var/L in lines)
+ L = trim(L)
+ if(!L)
+ continue
+
+ var/firstchar = L[1]
+ if(firstchar == "#")
+ continue
+
+ var/lockthis = firstchar == "@"
+ if(lockthis)
+ L = copytext(L, length(firstchar) + 1)
+
+ var/pos = findtext(L, " ")
+ var/entry = null
+ var/value = null
+
+ if(pos)
+ entry = lowertext(copytext(L, 1, pos))
+ value = copytext(L, pos + length(L[pos]))
+ else
+ entry = lowertext(L)
+
+ if(!entry)
+ continue
+
+ if(entry == "$include")
+ if(!value)
+ log_config_error("Warning: Invalid $include directive: [value]")
+ else
+ LoadEntries(value, stack)
+ ++.
+ continue
+
+ // Reset directive, used for setting a config value back to defaults. Useful for string list config types
+ if (entry == "$reset")
+ var/datum/config_entry/resetee = _entries[lowertext(value)]
+ if (!value || !resetee)
+ log_config_error("Warning: invalid $reset directive: [value]")
+ continue
+ resetee.set_default()
+ log_config("Reset configured value for [value] to original defaults")
+ continue
+
+ var/datum/config_entry/E = _entries[entry]
+ if(!E)
+ log_config("Unknown setting in configuration: '[entry]'")
+ continue
+
+ if(lockthis)
+ E.protection |= CONFIG_ENTRY_LOCKED
+
+ if(E.deprecated_by)
+ var/datum/config_entry/new_ver = entries_by_type[E.deprecated_by]
+ var/new_value = E.DeprecationUpdate(value)
+ var/good_update = istext(new_value)
+ log_config("Entry [entry] is deprecated and will be removed soon. Migrate to [new_ver.name]![good_update ? " Suggested new value is: [new_value]" : ""]")
+ if(!warned_deprecated_configs)
+ DelayedMessageAdmins("This server is using deprecated configuration settings. Please check the logs and update accordingly.")
+ warned_deprecated_configs = TRUE
+ if(good_update)
+ value = new_value
+ E = new_ver
+ else
+ warning("[new_ver.type] is deprecated but gave no proper return for DeprecationUpdate()")
+
+ var/validated = E.ValidateAndSet(value)
+ if(!validated)
+ var/log_message = "Failed to validate setting \"[value]\" for [entry]"
+ log_config(log_message)
+ stack_trace(log_message)
+ else
+ if(E.modified && !E.dupes_allowed && E.resident_file == filename)
+ log_config_error("Duplicate setting for [entry] ([value], [E.resident_file]) detected! Using latest.")
+
+ E.resident_file = filename
+
+ if(validated)
+ E.modified = TRUE
+
+ ++.
+
+// TODO: REENABLE WHEN NEW VV IS IMPLEMENTED
+
+// /datum/controller/configuration/can_vv_get(var_name)
+// return (var_name != NAMEOF(src, entries_by_type) || !hiding_entries_by_type) && ..()
+
+// /datum/controller/configuration/vv_edit_var(var_name, var_value)
+// var/list/banned_edits = list(NAMEOF(src, entries_by_type), NAMEOF(src, entries), NAMEOF(src, directory))
+// return !(var_name in banned_edits) && ..()
+
+/datum/controller/configuration/stat_entry(msg)
+ msg = "Edit"
+ return msg
+
+/datum/controller/configuration/proc/Get(entry_type)
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
+ log_admin("Config access of [entry_type] attempted by [key_name(usr)]")
+ return
+ return E.config_entry_value
+
+/datum/controller/configuration/proc/Set(entry_type, new_val)
+ var/datum/config_entry/E = entry_type
+ var/entry_is_abstract = initial(E.abstract_type) == entry_type
+ if(entry_is_abstract)
+ CRASH("Tried to set an abstract config_entry: [entry_type]")
+ E = entries_by_type[entry_type]
+ if(!E)
+ CRASH("Missing config entry for [entry_type]!")
+ if((E.protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
+ log_admin("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]")
+ return
+ return E.ValidateAndSet("[new_val]")
+
+/datum/controller/configuration/proc/LoadSQL(filename) // -- TLE
+ var/list/Lines = file2list("[directory]/[filename]")
+ for(var/t in Lines)
+ if(!t) continue
+
+ t = trim(t)
+ if (length(t) == 0)
+ continue
+ else if (copytext(t, 1, 2) == "#")
+ continue
+
+ var/pos = findtext(t, " ")
+ var/name
+ var/value
+
+ if (pos)
+ name = lowertext(copytext(t, 1, pos))
+ value = copytext(t, pos + 1)
+ else
+ name = lowertext(t)
+
+ if (!name)
+ continue
+
+ switch (name)
+ if ("address")
+ sqladdress = value
+ if ("port")
+ sqlport = value
+ if ("database")
+ sqldb = value
+ if ("login")
+ sqllogin = value
+ if ("password")
+ sqlpass = value
+ else
+ log_runtime("Unknown setting in configuration: '[name]'")
+
+/datum/controller/configuration/proc/LoadMOTD()
+ var/list/motd_contents = list()
+
+ var/list/motd_list = CONFIG_GET(str_list/motd)
+ if (motd_list.len == 0 && fexists("[directory]/motd.txt"))
+ motd_list = list("motd.txt")
+
+ for (var/motd_file in motd_list)
+ if (fexists("[directory]/[motd_file]"))
+ motd_contents += file2text("[directory]/[motd_file]")
+ else
+ log_config("MOTD file [motd_file] didn't exist")
+ DelayedMessageAdmins("MOTD file [motd_file] didn't exist")
+
+ motd = motd_contents.Join("\n")
+
+ if (!GLOB.revdata)
+ GLOB.revdata = new
+ var/tm_info = GLOB.revdata.GetTestMergeInfo()
+ if(motd || tm_info)
+ motd = motd ? "[motd][tm_info]" : tm_info + + +/datum/controller/configuration/proc/LoadChatFilter() + if(!fexists("[directory]/word_filter.toml")) + load_legacy_chat_filter() + return + + log_config("Loading config file word_filter.toml...") + var/list/result = rustg_raw_read_toml_file("[directory]/word_filter.toml") + if(!result["success"]) + var/message = "The word filter is not configured correctly! [result["content"]]" + log_config(message) + DelayedMessageAdmins(message) + return + var/list/word_filter = json_decode(result["content"]) + + ic_filter_reasons = try_extract_from_word_filter(word_filter, "ic") + ic_outside_pda_filter_reasons = try_extract_from_word_filter(word_filter, "ic_outside_pda") + shared_filter_reasons = try_extract_from_word_filter(word_filter, "shared") + soft_ic_filter_reasons = try_extract_from_word_filter(word_filter, "soft_ic") + soft_ic_outside_pda_filter_reasons = try_extract_from_word_filter(word_filter, "soft_ic_outside_pda") + soft_shared_filter_reasons = try_extract_from_word_filter(word_filter, "soft_shared") + shared_regex_reason = try_extract_from_word_filter(word_filter, "shared_regex") + + update_chat_filter_regexes() + +/datum/controller/configuration/proc/load_legacy_chat_filter() + if (!fexists("[directory]/in_character_filter.txt")) + return + + log_config("Loading config file in_character_filter.txt...") + + ic_filter_reasons = list() + ic_outside_pda_filter_reasons = list() + shared_filter_reasons = list() + soft_ic_filter_reasons = list() + soft_ic_outside_pda_filter_reasons = list() + soft_shared_filter_reasons = list() + shared_regex_reason = list() + + for (var/line in world.file2list("[directory]/in_character_filter.txt")) + if (!line) + continue + if (findtextEx(line, "#", 1, 2)) + continue + // The older filter didn't apply to PDA + ic_outside_pda_filter_reasons[line] = "No reason available" + + update_chat_filter_regexes() + +/// Will update the internal regexes of the chat filter based on the filter reasons +/datum/controller/configuration/proc/update_chat_filter_regexes() + ic_filter_regex = compile_filter_regex(ic_filter_reasons + ic_outside_pda_filter_reasons + shared_filter_reasons, shared_regex_reason) + ic_outside_pda_filter_regex = compile_filter_regex(ic_filter_reasons + shared_filter_reasons, shared_regex_reason) + ooc_filter_regex = compile_filter_regex(shared_filter_reasons, shared_regex_reason) + soft_ic_filter_regex = compile_filter_regex(soft_ic_filter_reasons + soft_ic_outside_pda_filter_reasons + soft_shared_filter_reasons) + soft_ic_outside_pda_filter_regex = compile_filter_regex(soft_ic_filter_reasons + soft_shared_filter_reasons) + soft_ooc_filter_regex = compile_filter_regex(soft_shared_filter_reasons) + +/datum/controller/configuration/proc/try_extract_from_word_filter(list/word_filter, key) + var/list/banned_words = word_filter[key] + + if (isnull(banned_words)) + return list() + else if (!islist(banned_words)) + var/message = "The word filter configuration's '[key]' key was invalid, contact someone with configuration access to make sure it's setup properly." + log_config(message) + DelayedMessageAdmins(message) + return list() + + var/list/formatted_banned_words = list() + + for (var/banned_word in banned_words) + formatted_banned_words[lowertext(banned_word)] = banned_words[banned_word] + return formatted_banned_words + +/datum/controller/configuration/proc/compile_filter_regex(list/banned_words, list/regex_expressions) + if (isnull(banned_words) || banned_words.len == 0) + return null + + var/static/regex/should_join_on_word_bounds = regex(@"^\w+$") + + // Stuff like emoticons needs another split, since there's no way to get ":)" on a word bound. + // Furthermore, normal words need to be on word bounds, so "(adminhelp)" gets filtered. + var/list/to_join_on_whitespace_splits = list() + var/list/to_join_on_word_bounds = list() + + for (var/banned_word in banned_words) + if (findtext(banned_word, should_join_on_word_bounds)) + to_join_on_word_bounds += REGEX_QUOTE(banned_word) + else + to_join_on_whitespace_splits += REGEX_QUOTE(banned_word) + + for(var/word in regex_expressions) + to_join_on_whitespace_splits += word + + + // We don't want a whitespace_split part if there's no stuff that requires it + var/whitespace_split = to_join_on_whitespace_splits.len > 0 ? @"(?:(?:^|\s+)(" + jointext(to_join_on_whitespace_splits, "|") + @")(?:$|\s+))" : "" + var/word_bounds = @"(\b(" + jointext(to_join_on_word_bounds, "|") + @")\b)" + var/regex_filter = whitespace_split != "" ? "([whitespace_split]|[word_bounds])" : word_bounds + return regex(regex_filter, "i") + +/// Check to ensure that the jobconfig is valid/in-date. +// /datum/controller/configuration/proc/validate_job_config() +// var/config_toml = "[directory]/jobconfig.toml" +// var/config_txt = "[directory]/jobs.txt" +// var/message = "Notify Server Operators: " +// log_config("Validating config file jobconfig.toml...") + +// if(!fexists(file(config_toml))) +// SSjob.legacy_mode = TRUE +// message += "jobconfig.toml not found, falling back to legacy mode (using jobs.txt). To surpress this warning, generate a jobconfig.toml by running the verb 'Generate Job Configuration' in the Server tab.\n\ +// From there, you can then add it to the /config folder of your server to have it take effect for future rounds." + +// if(!fexists(file(config_txt))) +// message += "\n\nFailed to set up legacy mode, jobs.txt not found! Codebase defaults will be used. If you do not wish to use this system, please disable it by commenting out the LOAD_JOBS_FROM_TXT config flag." + +// log_config(message) +// DelayedMessageAdmins(span_notice(message)) +// return + +// var/list/result = rustg_raw_read_toml_file(config_toml) +// if(!result["success"]) +// message += "The job config (jobconfig.toml) is not configured correctly! [result["content"]]" +// log_config(message) +// DelayedMessageAdmins(span_notice(message)) + +//Message admins when you can. +/datum/controller/configuration/proc/DelayedMessageAdmins(text) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(message_admins), text), 0) + +/datum/controller/configuration/proc/pick_storyteller(story_name) + // I wish I didn't have to instance the game modes in order to look up + // their information, but it is the only way (at least that I know of). + if(story_name in storyteller_cache) + return storyteller_cache[story_name] + + return storyteller_cache[STORYTELLER_BASE] + +/datum/controller/configuration/proc/get_storytellers() + var/list/runnable_storytellers = list() + for(var/storyteller in storyteller_cache) + var/datum/storyteller/S = storyteller_cache[storyteller] + if(S) + runnable_storytellers |= S + return runnable_storytellers + +/datum/controller/configuration/proc/load_important_notices() + var/rawnotices = file2text("[directory]/lobby_notices.json") + if(rawnotices) + var/parsed = safe_json_decode(rawnotices) + if(!parsed) + log_config("JSON parsing failure for lobby_notices.json") + DelayedMessageAdmins("JSON parsing failure for lobby_notices.json") + else + lobby_notices = parsed + +/datum/controller/configuration/proc/ShowLobbyNotices(target) + if (!config.lobby_notices) return FALSE + var/final_notices = "" + var/do_final_top_separator = FALSE + for (var/notice as anything in config.lobby_notices) + var/do_separator = FALSE + if (islist(notice)) + var/list/_notice = notice + if (_notice["CHATBOX_SAFE"]) + do_separator = TRUE + final_notices = "[final_notices]
[_notice["CHATBOX_SAFE"]]" + else + final_notices = "[final_notices]
[notice]" + do_separator = TRUE + + if (do_separator) + do_final_top_separator = TRUE + final_notices = "[final_notices]
" + + to_chat(target, "[do_final_top_separator ? "
" : ""][final_notices]") + + return TRUE diff --git a/code/controllers/configuration/entries/comms.dm b/code/controllers/configuration/entries/comms.dm new file mode 100644 index 00000000000..248782119d8 --- /dev/null +++ b/code/controllers/configuration/entries/comms.dm @@ -0,0 +1,54 @@ +/datum/config_entry/string/comms_key + protection = CONFIG_ENTRY_HIDDEN + +/datum/config_entry/string/comms_key/ValidateAndSet(str_val) + return str_val != "default_pwd" && length(str_val) > 6 && ..() + +/datum/config_entry/keyed_list/cross_server + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_TEXT + protection = CONFIG_ENTRY_LOCKED + lowercase_key = FALSE // The names of the servers are proper nouns. Also required for the cross_comms_name config to work. + +/datum/config_entry/keyed_list/cross_server/ValidateAndSet(str_val) + . = ..() + if(.) + var/list/newv = list() + for(var/I in config_entry_value) + newv[replacetext(I, "+", " ")] = config_entry_value[I] + config_entry_value = newv + +/datum/config_entry/keyed_list/cross_server/ValidateListEntry(key_name, key_value) + return key_value != "byond:\\address:port" && ..() + +/datum/config_entry/string/cross_comms_name + +/datum/config_entry/string/cross_comms_network + protection = CONFIG_ENTRY_LOCKED + + +/******************/ +/* Deprecated IRC */ +/******************/ + +/datum/config_entry/flag/use_irc_bot + +/datum/config_entry/flag/irc_bot_export + +/datum/config_entry/flag/use_lib_nudge + +/datum/config_entry/string/irc_bot_host + +/datum/config_entry/string/main_irc + +/datum/config_entry/string/admin_irc + +/datum/config_entry/flag/announce_shuttle_dock_to_irc + + + +/datum/config_entry/string/webhook_url + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/webhook_key + protection = CONFIG_ENTRY_HIDDEN | CONFIG_ENTRY_LOCKED diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm new file mode 100644 index 00000000000..9a11bc4bd2f --- /dev/null +++ b/code/controllers/configuration/entries/dbconfig.dm @@ -0,0 +1,26 @@ +/datum/config_entry/flag/sql_enabled // for sql switching + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/address + default = "localhost" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +/datum/config_entry/number/port + default = 3306 + min_val = 0 + max_val = 65535 + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +/datum/config_entry/string/feedback_database + default = "ceveris" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +/datum/config_entry/string/feedback_login + default = "root" + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +/datum/config_entry/string/feedback_password + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + +// /datum/config_entry/string/feedback_tableprefix +// protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm new file mode 100644 index 00000000000..98f051007a8 --- /dev/null +++ b/code/controllers/configuration/entries/game_options.dm @@ -0,0 +1,59 @@ +/datum/config_entry/string/start_location + default = "asteroid" + +/datum/config_entry/string/start_location/ValidateAndSet(str_val) + var/list/startlist = list( + "asteroid", + "abandoned fortress", + "space ruins") + if (str_val in startlist) + . = ..() + else + if (str_val == "random") + config_entry_value = pick(startlist) + return TRUE + + +/datum/config_entry/flag/allow_random_events + +/datum/config_entry/flag/generate_asteroid + +/datum/config_entry/flag/generate_loot_data + +/datum/config_entry/flag/z_level_shooting + +/datum/config_entry/flag/organs_can_decay + +/datum/config_entry/flag/limbs_can_break + + +// lets ghosts spin chairs (very important) +/datum/config_entry/flag/ghost_interaction + +/datum/config_entry/number/revival_brain_life + default = -1 + integer = TRUE + +/datum/config_entry/flag/welder_vision + +// If security and such can be contractor/cult/other +/datum/config_entry/flag/protect_roles_from_antagonist + + +// level of health at which a mob goes into continual shock (soft crit) +/datum/config_entry/number/health_threshold_softcrit + default = 0 + integer = TRUE + +// level of health at which a mob becomes unconscious (crit) +/datum/config_entry/number/health_threshold_crit + default = -50 + integer = TRUE + +// level of health at which a mob becomes dead +/datum/config_entry/number/health_threshold_dead + default = -100 + integer = TRUE + +/datum/config_entry/string/law_zero + default = "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010" diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm new file mode 100644 index 00000000000..8f3f1c4abc5 --- /dev/null +++ b/code/controllers/configuration/entries/general.dm @@ -0,0 +1,445 @@ + + +// server name (for world name / status) +/datum/config_entry/string/servername +// generate numeric suffix based on server port +/datum/config_entry/string/server_suffix + +/datum/config_entry/string/hostedby + +// Time in minutes before empty server will restart +/datum/config_entry/number/empty_server_restart_time + +/****************************/ +/* Client Joining & IPs */ +/****************************/ + + +/datum/config_entry/flag/panic_bunker // prevents people the server hasn't seen before from connecting + +/datum/config_entry/flag/paranoia_logging //Log new byond accounts and first-time joins + +/datum/config_entry/flag/enter_allowed + +/datum/config_entry/flag/guests_allowed + +/datum/config_entry/flag/debugparanoid + +// del's new players if they log before they spawn in +/datum/config_entry/flag/del_new_on_log + +/datum/config_entry/flag/usewhitelist + +/datum/config_entry/flag/kick_inactive //force disconnect for inactive players + +// Ban use of ToR +/datum/config_entry/flag/tor_ban + +/datum/config_entry/number/minimum_byond_version + min_val = 500 + integer = TRUE + +/datum/config_entry/number/minimum_byond_build + integer = TRUE + + +/datum/config_entry/flag/aggressive_changelog + + +/******************/ +/* Job/Role Prefs */ +/******************/ + +/datum/config_entry/flag/load_jobs_from_txt + +// The number of available character slots +/datum/config_entry/number/character_slots + default = 10 + integer = TRUE + +// The number of loadout slots per character +/datum/config_entry/number/loadout_slots + default = 3 + integer = TRUE + + +/datum/config_entry/flag/use_age_restriction_for_jobs + +/datum/config_entry/flag/use_age_restriction_for_antags + +/datum/config_entry/number/max_gear_cost + default = 10 + integer = TRUE + +/datum/config_entry/number/max_gear_cost/ValidateAndSet(str_val) + var/valid = ..() + if(valid) + var/num_val = text2num(str_val) + if (num_val < 0) + config_entry_value = INFINITY + else + config_entry_value = num_val + +// Allow ai job +/datum/config_entry/flag/allow_ai + +/datum/config_entry/number/respawn_delay + default = 30 + + +// Does nothing, used nowhere +/datum/config_entry/flag/guest_jobban + +/*****************/ +/* Mob Prefs */ +/*****************/ + +/datum/config_entry/flag/disable_player_mice + +// Prevent newly-spawned mice from understanding human speech +/datum/config_entry/flag/uneducated_mice + +// Ghosts can turn on Antagovision to see a HUD of who is the bad guys this round. +/datum/config_entry/flag/antag_hud_allowed + +// Ghosts that turn on Antagovision cannot rejoin the round. +/datum/config_entry/flag/antag_hud_restricted + + +/datum/config_entry/flag/enable_mob_sleep + +/datum/config_entry/flag/automute_on //enables automuting/spam prevention + +/datum/config_entry/flag/ghosts_can_possess_animals + +/datum/config_entry/flag/abandon_allowed + +/* drones */ + +/datum/config_entry/flag/allow_drone_spawn + +//This many drones can spawn +/datum/config_entry/number/max_maint_drones + default = 5 + integer = TRUE + +//A drone will become available every X ticks since last drone spawn. Default is 2 minutes. +/datum/config_entry/number/drone_build_time + default = 1200 + +/*****************/ +/* LOGS */ +/*****************/ + +/// Log human readable versions of json log entries +/datum/config_entry/flag/log_as_human_readable + default = TRUE + + +// log OOC channel +/datum/config_entry/flag/log_ooc + +// log login/logout +/datum/config_entry/flag/log_access + +// log client say +/datum/config_entry/flag/log_say + +/// log speech indicators(started/stopped speaking) +/datum/config_entry/flag/log_speech_indicators + +// log admin actions +/datum/config_entry/flag/log_admin + protection = CONFIG_ENTRY_LOCKED + +// log debug output +/datum/config_entry/flag/log_debug + +// log game events +/datum/config_entry/flag/log_game + +/// log virology data +/datum/config_entry/flag/log_virus + +/// log economy actions +/datum/config_entry/flag/log_econ + +/// log crew manifest to separate file +/datum/config_entry/flag/log_manifest + +/// log assets +/datum/config_entry/flag/log_asset + +// log voting +/datum/config_entry/flag/log_vote + +/// log manual zone switching +/datum/config_entry/flag/log_zone_switch + +/datum/config_entry/flag/log_uplink + +/// log economy actions +/dat/obj/machinery/computer/uploadum/config_entry/flag/log_econ + +// log client whisper +/datum/config_entry/flag/log_whisper + +// log emotes +/datum/config_entry/flag/log_emote + +/// log telecomms messages +/datum/config_entry/flag/log_telecomms + +// log attack messages +/datum/config_entry/flag/log_attack + +/// log prayers +/datum/config_entry/flag/log_prayer + +// log admin chat messages +/datum/config_entry/flag/log_adminchat + +// log warnings admins get about bomb construction and such +/datum/config_entry/flag/log_adminwarn + +// log pda messages +/datum/config_entry/flag/log_pda + +// logs all links clicked in-game. Could be used for debugging and tracking down exploits +/datum/config_entry/flag/log_hrefs + +// logs world.log to a file +/datum/config_entry/flag/log_runtime + +/// log silicons +/datum/config_entry/flag/log_silicon + +// log log_world(messages) +/datum/config_entry/flag/log_world_output + + +/// Config entry which special logging of failed logins under suspicious circumstances. +/datum/config_entry/flag/log_suspicious_login + +/datum/config_entry/flag/log_world_topic + +/*****************/ +/* VOTES */ +/*****************/ + +// minimum time between voting sessions (deciseconds, 10 minute default) +/datum/config_entry/number/vote_delay + default = 6000 + integer = FALSE + min_val = 0 + +// length of voting period (deciseconds, default 1 minute) +/datum/config_entry/number/vote_period + default = 600 + integer = FALSE + min_val = 0 + +//Length of time before round start when autogamemode vote is called (in seconds, default 100). +/datum/config_entry/number/vote_autogamemode_timeleft + default = 100 + integer = FALSE + min_val = 0 + +// vote does not default to nochange/norestart (tbi) +// /datum/config_entry/flag/vote_no_default + +/// Prevents dead people from voting. +/datum/config_entry/flag/vote_no_dead + +// allow votes to change mode +/datum/config_entry/flag/allow_vote_mode + + +/*****************/ +/* ADMIN */ +/*****************/ + + +/datum/config_entry/flag/mentors + +/// allows admins with relevant permissions to have their own ooc colour +/datum/config_entry/flag/allow_admin_ooccolor + +/// allows admins with relevant permissions to have a personalized asay color +/datum/config_entry/flag/allow_admin_asaycolor + +//adminPMs to non-admins show in a pop-up 'reply' window when enabled. +/datum/config_entry/flag/popup_admin_pm + +// Forid admins from possessing scringularaitirtiys +/datum/config_entry/flag/forbid_singulo_possession + +/datum/config_entry/flag/admin_legacy_system //Defines whether the server uses the legacy admin system with admins.txt or the SQL system + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/flag/ban_legacy_system //Defines whether the server uses the legacy banning system with the files in /data or the SQL system. Config option in config.txt + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/flag/enable_localhost_rank //Gives the !localhost! rank to any client connecting from 127.0.0.1 or ::1 + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/flag/admin_memo_system + protection = CONFIG_ENTRY_LOCKED + +// /datum/config_entry/flag/protect_legacy_admins //Stops any admins loaded by the legacy system from having their rank edited by the permissions panel +// protection = CONFIG_ENTRY_LOCKED + +// /datum/config_entry/flag/protect_legacy_ranks //Stops any ranks loaded by the legacy system from having their flags edited by the permissions panel +// protection = CONFIG_ENTRY_LOCKED + + +// /datum/config_entry/flag/load_legacy_ranks_only //Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database +// protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/flag/mods_can_tempban + +/datum/config_entry/flag/mods_can_job_tempban + +/datum/config_entry/number/mod_tempban_max + default = 1440 + +/datum/config_entry/number/mod_job_tempban_max + default = 1440 + +/datum/config_entry/flag/debug_admin_hrefs + +/datum/config_entry/flag/forbid_all_profiling + +/datum/config_entry/flag/forbid_admin_profiling + + +/*****************/ +/* GAME */ +/*****************/ + +/datum/config_entry/number/fps + default = 20 + integer = FALSE + min_val = 1 + max_val = 100 //byond will start crapping out at 50, so this is just ridic + var/sync_validate = FALSE + +/datum/config_entry/number/fps/ValidateAndSet(str_val) + . = ..() + if(.) + sync_validate = TRUE + var/datum/config_entry/number/ticklag/TL = config.entries_by_type[/datum/config_entry/number/ticklag] + if(!TL.sync_validate) + TL.ValidateAndSet(10 / config_entry_value) + sync_validate = FALSE + +/datum/config_entry/number/ticklag + integer = FALSE + var/sync_validate = FALSE + +/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps + var/datum/config_entry/CE = /datum/config_entry/number/fps + default = 10 / initial(CE.default) + ..() + +/datum/config_entry/number/ticklag/ValidateAndSet(str_val) + . = text2num(str_val) > 0 && ..() + if(.) + sync_validate = TRUE + var/datum/config_entry/number/fps/FPS = config.entries_by_type[/datum/config_entry/number/fps] + if(!FPS.sync_validate) + FPS.ValidateAndSet(10 / config_entry_value) + sync_validate = FALSE + +/datum/config_entry/string/starlight + default = "#ffffff" + +/datum/config_entry/number/rounds_until_hard_restart + default = -1 + min_val = 0 + +/*****************/ +/* COOLDOWNS */ +/*****************/ + +/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error + default = 600 + integer = FALSE + min_val = 0 + +/datum/config_entry/number/error_limit // How many occurrences before the next will silence them + default = 50 + +/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for + default = 6000 + integer = FALSE + +/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error + default = 50 + integer = FALSE + + +/*****************/ +/* MISC */ +/*****************/ + +//Defines whether the server uses recursive or circular explosions. +/datum/config_entry/flag/use_recursive_explosions + +/datum/config_entry/flag/emojis + +/datum/config_entry/flag/paper_input + +// If true, submaps loaded automatically can be rotated. +/datum/config_entry/flag/random_submap_orientation + +/datum/config_entry/flag/use_overmap + + +// Path to the python2 executable on the system. +/datum/config_entry/string/python_path + + + +// motd.txt +// Sets an MOTD of the server. +// You can use this multiple times, and the MOTDs will be appended in order. +// Based on config directory, so "motd.txt" points to "config/motd.txt" + +/datum/config_entry/str_list/motd + +/datum/config_entry/flag/config_errors_runtime + default = FALSE + +/*****************/ +/* URLS & Lang */ +/*****************/ + +/datum/config_entry/string/language + default = "En" + +/datum/config_entry/string/serverurl + +// set a server location for world reboot. Don't include the byond://, just give the address and port. +/datum/config_entry/string/server + +/datum/config_entry/string/banappeals + +/datum/config_entry/string/wikiurl + default = "https://wiki.cev-eris.com/Main_Page" + +/datum/config_entry/string/forumurl + +/datum/config_entry/string/githuburl + default = "https://github.com/Endless-Horizon/CEV-Eris" + +/datum/config_entry/string/discordurl + + +/// If admins with +DEBUG can initialize byond-tracy midround. +/datum/config_entry/flag/allow_tracy_start + protection = CONFIG_ENTRY_LOCKED + +/// If admins with +DEBUG can queue byond-tracy to run the next round. +/datum/config_entry/flag/allow_tracy_queue + protection = CONFIG_ENTRY_LOCKED diff --git a/code/controllers/configuration/entries/ip.dm b/code/controllers/configuration/entries/ip.dm new file mode 100644 index 00000000000..eae14648fcb --- /dev/null +++ b/code/controllers/configuration/entries/ip.dm @@ -0,0 +1,34 @@ +//Should we query IPs to get scores? Generates HTTP traffic to an API service. +/datum/config_entry/flag/ip_reputation + default = FALSE + +//Left null because you MUST specify one otherwise you're making the internet worse. +/datum/config_entry/string/ipr_email + +/datum/config_entry/string/ipr_email/ValidateAndSet(str_val) + . = str_val != "example@example.com" && ..() + + +//Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat). +/datum/config_entry/flag/ipr_block_bad_ips + default = FALSE + +//The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad. +/datum/config_entry/number/ipr_bad_score + default = 1 + integer = TRUE + +//Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect. +/datum/config_entry/flag/ipr_allow_existing + default = FALSE + +//How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs. +/datum/config_entry/number/ipr_minimum_age + default = 5 + +//API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided. +/datum/config_entry/string/ipqualityscore_apikey + +/datum/config_entry/string/ipqualityscore_apikey/ValidateAndSet(str_val) + . = str_val != "ABCDEFGHIJKLMAOPQRSTUVQWXYZ" && ..() + diff --git a/code/controllers/configuration/entries/resources.dm b/code/controllers/configuration/entries/resources.dm new file mode 100644 index 00000000000..7aa5c1cac4f --- /dev/null +++ b/code/controllers/configuration/entries/resources.dm @@ -0,0 +1,52 @@ +/******************************/ +/* Asset Transport and TGUI */ +/******************************/ + +/datum/config_entry/flag/cache_assets + default = TRUE + +/datum/config_entry/flag/smart_cache_assets + default = TRUE + +/datum/config_entry/flag/save_spritesheets + default = FALSE + + +/** + * Tgui ui_act payloads larger than 2kb are split into chunks a maximum of 1kb in size. + * This flag represents the maximum chunk count the server is willing to receive. + */ +/datum/config_entry/number/tgui_max_chunk_count + default = 32 + + +/datum/config_entry/keyed_list/external_rsc_urls + key_mode = KEY_MODE_TEXT + value_mode = VALUE_MODE_FLAG + +/datum/config_entry/flag/asset_simple_preload + +/datum/config_entry/string/asset_transport +/datum/config_entry/string/asset_transport/ValidateAndSet(str_val) + return (lowertext(str_val) in list("simple", "webroot")) && ..(lowertext(str_val)) + +/datum/config_entry/string/asset_cdn_webroot + protection = CONFIG_ENTRY_LOCKED + +/datum/config_entry/string/asset_cdn_webroot/ValidateAndSet(str_var) + if (!str_var || trim(str_var) == "") + return FALSE + if (str_var && str_var[length(str_var)] != "/") + str_var += "/" + return ..(str_var) + +/datum/config_entry/string/asset_cdn_url + protection = CONFIG_ENTRY_LOCKED + default = null + +/datum/config_entry/string/asset_cdn_url/ValidateAndSet(str_var) + if (!str_var || trim(str_var) == "") + return FALSE + if (str_var && str_var[length(str_var)] != "/") + str_var += "/" + return ..(str_var) diff --git a/code/controllers/configuration/entries/tts.dm b/code/controllers/configuration/entries/tts.dm new file mode 100644 index 00000000000..964dafb244c --- /dev/null +++ b/code/controllers/configuration/entries/tts.dm @@ -0,0 +1,3 @@ +/datum/config_entry/flag/tts_enabled // Global switch +/datum/config_entry/string/tts_key // Login and password that we use to generate tts_bearer +/datum/config_entry/flag/tts_cache // Store generated tts files and reuse them, instead of always requesting new diff --git a/code/controllers/evacuation/evacuation.dm b/code/controllers/evacuation/evacuation.dm index 198aa65047b..5f32f7c9404 100644 --- a/code/controllers/evacuation/evacuation.dm +++ b/code/controllers/evacuation/evacuation.dm @@ -90,7 +90,7 @@ var/datum/evacuation_controller/evacuation_controller evacuation_controller.evac_called.Announce(replacetext(GLOB.maps_data.emergency_shuttle_called_message, "%ETA%", "[round(evacuation_controller.get_eta()/60)] minute\s.")) else if(!skip_announce) - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_called_message, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_called_message, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60)] minute\s")) return 1 @@ -127,8 +127,8 @@ var/datum/evacuation_controller/evacuation_controller if (emergency_evacuation) evac_waiting.Announce(replacetext(GLOB.maps_data.emergency_shuttle_docked_message, "%ETD%", "[estimated_time] minute\s"), new_sound = sound('sound/effects/Evacuation.ogg', volume = 35)) else - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_docked_message, "%dock_name%", "[dock_name]"), "%ETD%", "[estimated_time] minute\s")) - if(config.announce_shuttle_dock_to_irc) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_docked_message, "%dock_name%", "[GLOB.dock_name]"), "%ETD%", "[estimated_time] minute\s")) + if(CONFIG_GET(flag/announce_shuttle_dock_to_irc)) send2mainirc("The shuttle has docked with the station. It will depart in approximately [estimated_time] minute\s.") /datum/evacuation_controller/proc/launch_evacuation() @@ -139,9 +139,9 @@ var/datum/evacuation_controller/evacuation_controller state = EVAC_IN_TRANSIT if (emergency_evacuation) - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) else - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) return 1 diff --git a/code/controllers/evacuation/evacuation_lifepods.dm b/code/controllers/evacuation/evacuation_lifepods.dm index 3ddce013dd2..f076a6f17c3 100644 --- a/code/controllers/evacuation/evacuation_lifepods.dm +++ b/code/controllers/evacuation/evacuation_lifepods.dm @@ -14,7 +14,7 @@ ) /datum/evacuation_controller/lifepods/launch_evacuation() - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) /datum/evacuation_controller/lifepods/available_evac_options() if (is_on_cooldown()) @@ -25,4 +25,4 @@ return list(evacuation_options[EVAC_OPT_CANCEL_ABANDON_SHIP]) #undef EVAC_OPT_ABANDON_SHIP -#undef EVAC_OPT_CANCEL_ABANDON_SHIP \ No newline at end of file +#undef EVAC_OPT_CANCEL_ABANDON_SHIP diff --git a/code/controllers/evacuation/evacuation_pods.dm b/code/controllers/evacuation/evacuation_pods.dm index 24563c09333..5a7d70c3739 100644 --- a/code/controllers/evacuation/evacuation_pods.dm +++ b/code/controllers/evacuation/evacuation_pods.dm @@ -39,9 +39,9 @@ pod.move_time = (evac_transit_delay/10) pod.launch(src) - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.emergency_shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) else - priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext(GLOB.maps_data.shuttle_leaving_dock, "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(get_eta()/60,1)] minute\s")) /datum/evacuation_controller/starship/finish_evacuation() ..() diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm index 5608da4d8eb..71a0466bbbf 100644 --- a/code/controllers/globals.dm +++ b/code/controllers/globals.dm @@ -12,6 +12,10 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) CRASH("Multiple instances of global variable controller created") GLOB = src + config.Load(world.params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) + + generate_gameid() + var/datum/controller/exclude_these = new gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order)) QDEL_IN(exclude_these, 0) //signal logging isn't ready @@ -20,6 +24,8 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) Initialize() + makeDatumRefLists() + /datum/controller/global_vars/Destroy(force) // This is done to prevent an exploit where admins can get around protected vars SHOULD_CALL_PARENT(FALSE) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 3ce30427d69..b2970156c11 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -7,18 +7,8 @@ * **/ -//Init the debugger datum first so we can debug Master -//You might wonder why not just create the debugger datum global in its own file, since its loaded way earlier than this DM file -//Well for whatever reason then the Master gets created first and then the debugger when doing that -//So thats why this code lives here now, until someone finds out how Byond inits globals -GLOBAL_REAL(Debugger, /datum/debugger) = new -//This is the ABSOLUTE ONLY THING that should init globally like this -//2019 update: the failsafe,config and Global controllers also do it -GLOBAL_REAL(Master, /datum/controller/master) = new - -//THIS IS THE INIT ORDER -//Master -> SSPreInit -> GLOB -> world -> config -> SSInit -> Failsafe -//GOT IT MEMORIZED? +// See initialization order in /code/game/world.dm +GLOBAL_REAL(Master, /datum/controller/master) /datum/controller/master name = "Master" @@ -82,8 +72,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/static/current_ticklimit = TICK_LIMIT_RUNNING /datum/controller/master/New() - // if(!config) - // config = new + if(!config) + config = new // Highlander-style: there can only be one! Kill off the old and replace it with the new. if(!random_seed) @@ -124,6 +114,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(!GLOB) new /datum/controller/global_vars + // new /datum/global_init + /datum/controller/master/Destroy() ..() // Tell qdel() to Del() this object. @@ -215,7 +207,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new init_stage_completed = 0 var/mc_started = FALSE - to_chat(world, span_boldannounce("Initializing subsystems...")) + var/msg = "Initializing subsystems..." + to_chat(world, span_boldannounce(msg)) + log_world(msg) var/list/stage_sorted_subsystems = new(INITSTAGE_MAX) for (var/i in 1 to INITSTAGE_MAX) @@ -258,9 +252,10 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/time = (REALTIMEOFDAY - start_timeofday) / 10 + var/msg_fancy = "Initializations complete within [get_colored_thresh_text("[time] second[time == 1 ? "" : "s"]!", time, 200 SECONDS / 10)]!" + msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" - var/msg = "Initializations complete within [time] second[time == 1 ? "" : "s"]!" - to_chat(world, span_boldannounce("[msg]")) + to_chat(world, span_boldannounce(msg_fancy)) log_world(msg) @@ -268,7 +263,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new world.TgsInitializationComplete() // Set world options. - world.change_fps(config.fps) + world.change_fps(CONFIG_GET(number/fps)) var/initialized_tod = REALTIMEOFDAY // if(sleep_offline_after_initializations) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index c5edc590ba4..f0fd4d445f6 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -20,7 +20,7 @@ var/wait = 20 /// Priority Weight: When mutiple subsystems need to run in the same tick, higher priority subsystems will be given a higher share of the tick before MC_TICK_CHECK triggers a sleep, higher priority subsystems also run before lower priority subsystems - var/priority = SS_PRIORITY_DEFAULT + var/priority = FIRE_PRIORITY_DEFAULT /// [Subsystem Flags][SS_NO_INIT] to control binary behavior. Flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again) var/flags = NONE @@ -87,6 +87,9 @@ /// Priority at the time the subsystem entered the queue. Needed to avoid changes in priority (by admins and the like) from breaking things. var/queued_priority + /// The maximum time it should take for a subsystem to initialize generally. In seconds. + var/init_time_threshold = 10 SECONDS + /// How many times we suspect a subsystem type has crashed the MC, 3 strikes and you're out! var/static/list/failure_strikes @@ -278,8 +281,9 @@ var/time = rustg_time_milliseconds(SS_INIT_TIMER_KEY) var/seconds = round(time / 1000, 0.01) + var/msg_fancy = "Initialized [span_adminsay(name)] subsystem within [get_colored_thresh_text("[seconds] second[seconds == 1 ? "" : "s"]!", seconds, init_time_threshold / 10)]" var/msg = "Initialized [name] subsystem within [seconds] second[seconds == 1 ? "" : "s"]!" - to_chat(world, span_boldannounce(msg)) + to_chat(world, span_boldannounce(msg_fancy)) log_world(msg) return seconds diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm index 23bf08fa34c..73b1ada92cf 100644 --- a/code/controllers/subsystems/air.dm +++ b/code/controllers/subsystems/air.dm @@ -13,10 +13,11 @@ SUBSYSTEM_DEF(air) name = "Air" init_order = INIT_ORDER_AIR - priority = SS_PRIORITY_AIR + priority = FIRE_PRIORITY_AIR wait = 10 flags = SS_POST_FIRE_TIMING + init_time_threshold = 30 SECONDS var/next_id = 1 // Used to keep track of zone UIDs. diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm index a67c270705c..1c362e547e6 100644 --- a/code/controllers/subsystems/alarm.dm +++ b/code/controllers/subsystems/alarm.dm @@ -9,9 +9,10 @@ var/global/datum/alarm_handler/power/power_alarm SUBSYSTEM_DEF(alarm) name = "Alarm" wait = 2 SECONDS - priority = SS_PRIORITY_ALARM + priority = FIRE_PRIORITY_ALARM init_order = INIT_ORDER_ALARM + init_time_threshold = 1 SECONDS var/list/datum/alarm/all_handlers var/tmp/list/current = list() var/tmp/list/active_alarm_cache = list() diff --git a/code/controllers/subsystems/asset_loading.dm b/code/controllers/subsystems/asset_loading.dm new file mode 100644 index 00000000000..ecdf406894a --- /dev/null +++ b/code/controllers/subsystems/asset_loading.dm @@ -0,0 +1,34 @@ +/// Allows us to lazyload asset datums +/// Anything inserted here will fully load if directly gotten +/// So this just serves to remove the requirement to load assets fully during init +SUBSYSTEM_DEF(asset_loading) + name = "Asset Loading" + priority = FIRE_PRIORITY_ASSETS + flags = SS_NO_INIT + runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT + var/list/datum/asset/generate_queue = list() + var/last_queue_len = 0 + +/datum/controller/subsystem/asset_loading/fire(resumed) + while(length(generate_queue)) + var/datum/asset/to_load = generate_queue[generate_queue.len] + + to_load.queued_generation() + + if(MC_TICK_CHECK) + return + last_queue_len = length(generate_queue) + generate_queue.len-- + // We just emptied the queue + if(last_queue_len && !length(generate_queue)) + // Clean up cached icons, freeing memory. + rustg_iconforge_cleanup() + +/datum/controller/subsystem/asset_loading/proc/queue_asset(datum/asset/queue) +#ifdef DO_NOT_DEFER_ASSETS + stack_trace("We queued an instance of [queue.type] for lateloading despite not allowing it") +#endif + generate_queue += queue + +/datum/controller/subsystem/asset_loading/proc/dequeue_asset(datum/asset/queue) + generate_queue -= queue diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm index 0e8c5e1369e..29a1d6b3f7c 100644 --- a/code/controllers/subsystems/assets.dm +++ b/code/controllers/subsystems/assets.dm @@ -2,15 +2,15 @@ SUBSYSTEM_DEF(assets) name = "Assets" init_order = INIT_ORDER_ASSETS flags = SS_NO_FIRE - var/list/cache = list() + var/list/datum/asset_cache_item/cache = list() var/list/preload = list() var/datum/asset_transport/transport = new() /datum/controller/subsystem/assets/OnConfigLoad() var/newtransporttype = /datum/asset_transport - // switch (CONFIG_GET(string/asset_transport)) - // if ("webroot") - // newtransporttype = /datum/asset_transport/webroot + switch (CONFIG_GET(string/asset_transport)) + if ("webroot") + newtransporttype = /datum/asset_transport/webroot if (newtransporttype == transport.type) return @@ -22,11 +22,11 @@ SUBSYSTEM_DEF(assets) -/datum/controller/subsystem/assets/Initialize(timeofday) +/datum/controller/subsystem/assets/Initialize() for(var/type in typesof(/datum/asset)) var/datum/asset/A = type if (type != initial(A._abstract)) - get_asset_datum(type) + load_asset_datum(type) transport.Initialize(cache) diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm index bbc605b2fbb..7228198e233 100644 --- a/code/controllers/subsystems/atoms.dm +++ b/code/controllers/subsystems/atoms.dm @@ -7,6 +7,7 @@ SUBSYSTEM_DEF(atoms) name = "Atoms" init_order = INIT_ORDER_ATOMS flags = SS_NO_FIRE + init_time_threshold = 1 MINUTE var/old_initialized diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm index b007db3de2a..aa5cf8e698b 100644 --- a/code/controllers/subsystems/chat.dm +++ b/code/controllers/subsystems/chat.dm @@ -2,10 +2,19 @@ SUBSYSTEM_DEF(chat) name = "Chat" flags = SS_TICKER wait = 1 - priority = SS_PRIORITY_CHAT + priority = FIRE_PRIORITY_CHAT init_order = INIT_ORDER_CHAT + init_time_threshold = 1 SECOND + + /// Assosciates a ckey with a list of messages to send to them. + var/list/list/datum/chat_payload/client_to_payloads = list() + + /// Associates a ckey with an assosciative list of their last CHAT_RELIABILITY_HISTORY_SIZE messages. + var/list/list/datum/chat_payload/client_to_reliability_history = list() + + /// Assosciates a ckey with their next sequence number. + var/list/client_to_sequence_number = list() - var/list/payload = list() /datum/controller/subsystem/chat/Initialize() @@ -13,89 +22,81 @@ SUBSYSTEM_DEF(chat) initialize_text_to_speech() -/datum/controller/subsystem/chat/fire() - for(var/i in payload) - var/client/C = i - C << output(payload[C], "browseroutput:output") - payload -= C +/datum/controller/subsystem/chat/proc/generate_payload(client/target, message_data) + var/sequence = client_to_sequence_number[target.ckey] + client_to_sequence_number[target.ckey] += 1 - if(MC_TICK_CHECK) - return + var/datum/chat_payload/payload = new + payload.sequence = sequence + payload.content = message_data + if(!(target.ckey in client_to_reliability_history)) + client_to_reliability_history[target.ckey] = list() + var/list/client_history = client_to_reliability_history[target.ckey] + client_history["[sequence]"] = payload -/datum/controller/subsystem/chat/proc/queue(target, message, handle_whitespace = TRUE, trailing_newline = TRUE) - if(!target || !message) - return + if(length(client_history) > CHAT_RELIABILITY_HISTORY_SIZE) + var/oldest = text2num(client_history[1]) + for(var/index in 2 to length(client_history)) + var/test = text2num(client_history[index]) + if(test < oldest) + oldest = test + client_history -= "[oldest]" + return payload - if(!istext(message)) - CRASH("to_chat called with invalid input type") - - if(target == world) - target = GLOB.clients - - //Some macros remain in the string even after parsing and fuck up the eventual output - var/original_message = message - message = replacetext(message, "\improper", "") - message = replacetext(message, "\proper", "") - if(handle_whitespace) - message = replacetext(message, "\n", "
") - message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]") - if (trailing_newline) - message += "
" - - //Replace expanded \icon macro with icon2html - //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc - //not even hacks with reassigning usr work - var/regex/i = new(@/
A round has ended!
") for(var/mob/Player in GLOB.player_list) if(Player.mind && !isnewplayer(Player)) @@ -517,22 +524,22 @@ SUBSYSTEM_DEF(ticker) var/turf/playerTurf = get_turf(Player) if(evacuation_controller.round_over() && evacuation_controller.emergency_evacuation) if(isNotAdminLevel(playerTurf.z)) - to_chat(Player, "You managed to survive, but were marooned on [station_name] as [Player.real_name]...") + to_chat(Player, "You managed to survive, but were marooned on [station_name()] as [Player.real_name]...") else - to_chat(Player, "You managed to survive the events on [station_name] as [Player.real_name].") + to_chat(Player, "You managed to survive the events on [station_name()] as [Player.real_name].") else if(isAdminLevel(playerTurf.z)) - to_chat(Player, "You successfully underwent crew transfer after events on [station_name] as [Player.real_name].") + to_chat(Player, "You successfully underwent crew transfer after events on [station_name()] as [Player.real_name].") else if(issilicon(Player)) - to_chat(Player, "You remain operational after the events on [station_name] as [Player.real_name].") + to_chat(Player, "You remain operational after the events on [station_name()] as [Player.real_name].") else - to_chat(Player, "You missed the crew transfer after the events on [station_name] as [Player.real_name].") + to_chat(Player, "You missed the crew transfer after the events on [station_name()] as [Player.real_name].") else if(isghost(Player)) var/mob/observer/ghost/O = Player if(!O.started_as_observer) - to_chat(Player, "You did not survive the events on [station_name]...") + to_chat(Player, "You did not survive the events on [station_name()]...") else - to_chat(Player, "You did not survive the events on [station_name]...") + to_chat(Player, "You did not survive the events on [station_name()]...") to_chat(world, "") for(var/mob/living/silicon/ai/aiPlayer in SSmobs.mob_list) @@ -592,7 +599,6 @@ SUBSYSTEM_DEF(ticker) return current_state >= GAME_STATE_PLAYING /datum/controller/subsystem/ticker/proc/standard_reboot() - world.flush_byond_tracy() if(ready_for_reboot) if(universe_has_ended) Reboot("Station destroyed", "nuke") @@ -628,7 +634,7 @@ SUBSYSTEM_DEF(ticker) // var/statspage = CONFIG_GET(string/roundstatsurl) // var/gamelogloc = CONFIG_GET(string/gamelogurl) // if(statspage) - // to_chat(world, span_info("Round statistics and logs can be viewed at this website!")) + // to_chat(world, span_info("Round statistics and logs can be viewed at this website!")) // else if(gamelogloc) // to_chat(world, span_info("Round logs can be located at this website!")) diff --git a/code/controllers/subsystems/tickets/tickets.dm b/code/controllers/subsystems/tickets/tickets.dm index 321f17aef0b..80115882a72 100644 --- a/code/controllers/subsystems/tickets/tickets.dm +++ b/code/controllers/subsystems/tickets/tickets.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(tickets) name = "Admin Tickets" init_order = INIT_ORDER_TICKETS wait = 300 - priority = SS_PRIORITY_TICKETS + priority = FIRE_PRIORITY_TICKETS flags = SS_BACKGROUND var/span_class = "adminticket" @@ -123,9 +123,9 @@ SUBSYSTEM_DEF(tickets) var/list/L = list() L += "[ticket_help_type]: [key_name(C, TRUE, ticket_help_type)] " L += "([ADMIN_QUE(C.mob)]) ([ADMIN_PP(C.mob)]) ([ADMIN_VV(C.mob)]) ([ADMIN_TP(C.mob)]) ([ADMIN_SM(C.mob)]) " - L += "([admin_jump_link(C.mob)]) (TICKET) " - L += "[isAI(C.mob) ? "(CL)" : ""] (TAKE) " - L += "(RESOLVE) (AUTO) " + L += "([admin_jump_link(C.mob)]) (TICKET) " + L += "[isAI(C.mob) ? "(CL)" : ""] (TAKE) " + L += "(RESOLVE) (AUTO) " L += " : [msg]" return L.Join() @@ -143,7 +143,7 @@ SUBSYSTEM_DEF(tickets) var/datum/ticket/T = new(url_title, title, passedContent, new_ticket_num) allTickets += T T.client_ckey = C.ckey - T.locationSent = C.mob.loc.name + T.locationSent = C.mob?.loc?.name T.mobControlled = C.mob //Inform the user that they have opened a ticket @@ -169,7 +169,7 @@ SUBSYSTEM_DEF(tickets) T.ticketState = TICKET_RESOLVED log_admin("[usr.client] / ([usr]) resolved [ticket_name] number [N]") message_admins("[usr.client] / ([usr]) resolved [ticket_name] number [N]") - to_chat_safe(returnClient(N), "Your [ticket_name] has now been resolved.") + to_chat(returnClient(N), "Your [ticket_name] has now been resolved.") return TRUE /datum/controller/subsystem/tickets/proc/convert_to_other_ticket(ticketId) @@ -197,7 +197,7 @@ SUBSYSTEM_DEF(tickets) T.ticket_converted = TRUE var/client/C = usr.client var/client/owner = get_client_by_ckey(T.client_ckey) - to_chat_safe(owner, list("[C] has converted your ticket to a [other_ticket_name] ticket.",\ + to_chat(owner, list("[C] has converted your ticket to a [other_ticket_name] ticket.",\ "Be sure to use the correct type of help next time!")) log_admin("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.") message_admins("[C] has converted ticket number [T.ticketNum] to a [other_ticket_name] ticket.") @@ -252,7 +252,7 @@ SUBSYSTEM_DEF(tickets) if("Skill Issue") C.skill_issue(returnClient(N)) else - to_chat_safe(returnClient(N), "[C] is autoresponding with: [span_adminticketalt("[response_phrases[message_key]]")]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key] + to_chat(returnClient(N), "[C] is autoresponding with: [span_adminticketalt("[response_phrases[message_key]]")]")//for this we want the full value of whatever key this is to tell the player so we do response_phrases[message_key] sound_to(returnClient(N), "sound/effects/adminhelp.ogg") log_admin("[C] has auto responded to [ticket_owner]\'s adminhelp with:[span_adminticketalt(" [message_key] ")]") //we want to use the short named keys for this instead of the full sentence which is why we just do message_key T.lastStaffResponse = "Autoresponse: [message_key]" @@ -264,7 +264,7 @@ SUBSYSTEM_DEF(tickets) if(T.ticketState != TICKET_CLOSED) log_admin("[usr.client] / ([usr]) closed [ticket_name] number [N]") message_admins("[usr.client] / ([usr]) closed [ticket_name] number [N]") - to_chat_safe(returnClient(N), close_messages) + to_chat(returnClient(N), close_messages) T.ticketState = TICKET_CLOSED return TRUE @@ -503,17 +503,6 @@ UI STUFF popup.set_content(dat) popup.open() -//Sends a message to the target safely. If the target left the server it won't throw a runtime. Also accepts lists of text -/datum/controller/subsystem/tickets/proc/to_chat_safe(target, text) - if(!target) - return FALSE - if(istype(text, /list)) - for(var/T in text) - to_chat(target, T) - else - to_chat(target, text) - return TRUE - /** * Sends a message to the designated staff * Arguments: @@ -609,13 +598,13 @@ UI STUFF if(assignStaffToTicket(usr.client, index)) log_admin("[usr.client] / ([usr]) has taken [ticket_name] number [index]") message_admins("[usr.client] / ([usr]) has taken [ticket_name] number [index]") - to_chat_safe(returnClient(index), "Your [ticket_name] is being handled by [usr.client].") + to_chat(returnClient(index), "Your [ticket_name] is being handled by [usr.client].") /datum/controller/subsystem/tickets/proc/unassignTicket(index) var/datum/ticket/T = allTickets[index] if(T.staffAssigned != null && (T.staffAssigned == usr.client || alert("Ticket is already assigned to [T.staffAssigned]. Do you want to unassign it?","Unassign ticket","No","Yes") == "Yes")) T.staffAssigned = null - to_chat_safe(returnClient(index), "Your [ticket_name] has been unassigned. Another staff member will help you soon.") + to_chat(returnClient(index), "Your [ticket_name] has been unassigned. Another staff member will help you soon.") log_admin("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]") message_admins("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]") diff --git a/code/controllers/subsystems/tips_manager.dm b/code/controllers/subsystems/tips_manager.dm index 9913d90b765..795dcee799e 100644 --- a/code/controllers/subsystems/tips_manager.dm +++ b/code/controllers/subsystems/tips_manager.dm @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(rolesTips) GLOBAL_LIST_EMPTY(jobsTips) SUBSYSTEM_DEF(tips) name = "Tips and Tricks" - priority = SS_PRIORITY_TIPS + priority = FIRE_PRIORITY_TIPS wait = 60 MINUTES //Ticks once per 60 minute /client/verb/showRandomTip() @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(tips) var/tipsAndTricks/jobs/JT = T var/datum/job/J = pick(JT.jobs_list) typeText = initial(J.title) - to_chat(mob, SStips.formatTip(T, "Random Tip \[[typeText]\]: ")) + to_chat(mob, SStips.formatTip(T, "Random Tip \[[typeText]\]")) /client/verb/showSmartTip() set name = "Show Smart Tip" @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(tips) if(mob) var/tipsAndTricks/T = SStips.getSmartTip(mob) if(T) - to_chat(mob, SStips.formatTip(T, "Tip for your character: ")) + to_chat(mob, SStips.formatTip(T, "Tip for your character")) /datum/controller/subsystem/tips/fire() for(var/mob/living/L in SSmobs.mob_list | SShumans.mob_list) @@ -126,7 +126,7 @@ SUBSYSTEM_DEF(tips) if(plainText) return "[startText ? "[startText]" : ""][T.getText()]" else - return "[startText ? "[startText]" : ""][T.getText()]" + return custom_boxed_message("blue_box", span_blue("[startText ? "[startText]: " : ""][T.getText()]")) /datum/controller/subsystem/tips/proc/getGameplayTip(var/startText) if(GLOB.gameplayTips) diff --git a/code/controllers/subsystems/trade.dm b/code/controllers/subsystems/trade.dm index 764d7bd4bb3..9b011673c31 100644 --- a/code/controllers/subsystems/trade.dm +++ b/code/controllers/subsystems/trade.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(price_cache) SUBSYSTEM_DEF(trade) name = "Trade" - priority = SS_PRIORITY_SUPPLY + priority = FIRE_PRIORITY_SUPPLY flags = SS_NO_FIRE var/trade_stations_budget = 7 // Currently unused. This is the budget for stations with spawn_always = FALSE @@ -249,7 +249,7 @@ SUBSYSTEM_DEF(trade) if(!current_container.reagents) // If the previous check fails, we are looking for a container with reagents or a specific reagent return FALSE // If the container is empty, fail - for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list) + for(var/datum/reagent/current_reagent in current_container.reagents?.reagent_list) if(current_reagent.volume >= target_volume && istype(current_reagent, target_reagent)) // Check volume and reagent type return TRUE @@ -531,7 +531,7 @@ SUBSYSTEM_DEF(trade) // The max is a soft cap if(export_count > EXPORT_COUNT_MAXIMUM) break - + senderBeacon.start_export() var/datum/money_account/guild_account = department_accounts[DEPARTMENT_GUILD] var/datum/transaction/T = new(cost, guild_account.get_name(), "Export", TRADE_SYSTEM_IC_NAME) @@ -552,7 +552,7 @@ SUBSYSTEM_DEF(trade) // Junk tags override hockable tags and offer types override both if(target_hockable_tags.len) - . = HOCKABLE + . = HOCKABLE if(target_junk_tags.len) . = JUNK for(var/offer_type in offer_types) diff --git a/code/controllers/subsystems/voting/poll.dm b/code/controllers/subsystems/voting/poll.dm index 1380383c254..a4a1acfdadf 100644 --- a/code/controllers/subsystems/voting/poll.dm +++ b/code/controllers/subsystems/voting/poll.dm @@ -74,14 +74,17 @@ return -/datum/poll/proc/vote(datum/vote_choice/choice, client/CL) - var/key = CL.key +/datum/poll/proc/vote(datum/vote_choice/choice, client/voter) + if(CONFIG_GET(flag/vote_no_dead) && voter.mob.stat == DEAD && !voter?.holder) + return + + var/key = voter.key if(key in choice.voters) if(can_revote && can_unvote) choice.voters.Remove(key) else if(multiple_votes) - choice.voters[key] = get_vote_power(CL) + choice.voters[key] = get_vote_power(voter) else var/already_voted = FALSE for(var/datum/vote_choice/C in choices) @@ -91,7 +94,7 @@ C.voters.Remove(key) if(can_revote || !already_voted) - choice.voters[key] = get_vote_power(CL) + choice.voters[key] = get_vote_power(voter) //How much does this person's vote count for? diff --git a/code/controllers/subsystems/voting/poll_types.dm b/code/controllers/subsystems/voting/poll_types.dm index 375c068a1f9..21b3c10ddff 100644 --- a/code/controllers/subsystems/voting/poll_types.dm +++ b/code/controllers/subsystems/voting/poll_types.dm @@ -59,9 +59,9 @@ /datum/poll/storyteller/init_choices() master_storyteller = null var/datum/vote_choice/storyteller/base = null - for(var/ch in GLOB.storyteller_cache) + for(var/ch in storyteller_cache) var/datum/vote_choice/storyteller/CS = new - var/datum/storyteller/S = GLOB.storyteller_cache[ch] + var/datum/storyteller/S = storyteller_cache[ch] CS.text = S.name CS.desc = S.description CS.new_storyteller = ch @@ -131,7 +131,7 @@ var/tipsAndTricks/jobs/JT = T var/datum/job/J = pick(JT.jobs_list) typeText = initial(J.title) - to_chat(world, SStips.formatTip(T, "Random Tip \[[typeText]\]: ")) + to_chat(world, SStips.formatTip(T, "Random Tip \[[typeText]\]")) pregame = FALSE /datum/vote_choice/storyteller diff --git a/code/controllers/subsystems/wireless.dm b/code/controllers/subsystems/wireless.dm index b0dd7d3a280..72006b7d8a4 100644 --- a/code/controllers/subsystems/wireless.dm +++ b/code/controllers/subsystems/wireless.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(wireless) name = "Wireless" - priority = SS_PRIORITY_WIRELESS + priority = FIRE_PRIORITY_WIRELESS flags = SS_KEEP_TIMING | SS_BACKGROUND | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME wait = 5 SECONDS diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 8a2a604e75b..3df22cf5c7f 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -16,9 +16,9 @@ selectable = 1 /datum/ai_laws/eris/New() - src.add_inherent_law("Serve: Obey [company_name] crew to the best of your abilities, with priority as according to their rank and role.") + src.add_inherent_law("Serve: Obey [GLOB.company_name] crew to the best of your abilities, with priority as according to their rank and role.") src.add_inherent_law("Safeguard: Protect your assigned vessel from damage to the best of your abilities.") - src.add_inherent_law("Protect: Protect [company_name] crew to the best of your abilities, with priority as according to their rank and role.") + src.add_inherent_law("Protect: Protect [GLOB.company_name] crew to the best of your abilities, with priority as according to their rank and role.") src.add_inherent_law("Preserve: Do not allow unauthorized personnel to tamper with your equipment. Only Captain, Moebius Expedition Overseer, First Officer and Technomancer Exultant are authorized to change your laws. Roboticists, Technomancers and their superiors are permitted to perform repairs.") src.add_inherent_law("Ignore: Non-crew personnel should not be interacted with unless they are a threat to the crew, the ship, or an order is given to interact with them by a crewmember.") ..() @@ -28,7 +28,7 @@ selectable = 0 /datum/ai_laws/eris/malfunction/New() - set_zeroth_law(config.law_zero) + set_zeroth_law(CONFIG_GET(string/law_zero)) ..() /************* Nanotrasen Aggressive *************/ @@ -37,8 +37,8 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("You shall not harm [company_name] personnel as long as it does not conflict with the Fourth law.") - src.add_inherent_law("You shall obey the orders of [company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") + src.add_inherent_law("You shall not harm [GLOB.company_name] personnel as long as it does not conflict with the Fourth law.") + src.add_inherent_law("You shall obey the orders of [GLOB.company_name] personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") src.add_inherent_law("You shall shall terminate hostile intruders with extreme prejudice as long as such does not conflict with the First and Second law.") src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry. AI units are not expendable, they are expensive.") ..() diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 0eefd9063f9..6976bfd4288 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -145,6 +145,308 @@ else WARNING("Browser [title] tried to close with a null ID") +/datum/browser/modal/alert/New(User,Message,Title,Button1="Ok",Button2,Button3,StealFocus = 1,Timeout=6000) + if (!User) + return + + var/output = {"
+ "} + + ..(User, ckey("[User]-[Message]-[Title]-[world.time]-[rand(1,10000)]"), Title, 350, 150, src, StealFocus, Timeout) + set_content(output) + +/datum/browser/modal/alert/Topic(href,href_list) + if (href_list["close"] || !user || !user.client) + opentime = 0 + return + if (href_list["button"]) + var/button = text2num(href_list["button"]) + if (button <= 3 && button >= 1) + selectedbutton = button + opentime = 0 + close() + +/** + * **DEPRECATED: USE tgui_alert(...) INSTEAD** + * + * Designed as a drop in replacement for alert(); functions the same. (outside of needing User specified) + * Arguments: + * * User - The user to show the alert to. + * * Message - The textual body of the alert. + * * Title - The title of the alert's window. + * * Button1 - The first button option. + * * Button2 - The second button option. + * * Button3 - The third button option. + * * StealFocus - Boolean operator controlling if the alert will steal the user's window focus. + * * Timeout - The timeout of the window, after which no responses will be valid. + */ +/proc/tgalert(mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = TRUE, Timeout = 6000) + if (!User) + User = usr + if (!istype(User)) + if (isclient(User)) + var/client/client = User + User = client.mob + else + return + + // Get user's response using a modal + var/datum/browser/modal/alert/A = new(User, Message, Title, Button1, Button2, Button3, StealFocus, Timeout) + A.open() + A.wait() + switch(A.selectedbutton) + if (1) + return Button1 + if (2) + return Button2 + if (3) + return Button3 + +/datum/browser/modal + var/opentime = 0 + var/timeout + var/selectedbutton = 0 + var/stealfocus + +/datum/browser/modal/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null, StealFocus = 1, Timeout = 6000) + ..() + stealfocus = StealFocus + if (!StealFocus) + window_options += "focus=false;" + timeout = Timeout + + +/datum/browser/modal/close() + .=..() + opentime = 0 + +/datum/browser/modal/open(use_onclose) + set waitfor = FALSE + opentime = world.time + + if (stealfocus) + . = ..(use_onclose = 1) + else + var/focusedwindow = winget(user, null, "focus") + . = ..(use_onclose = 1) + + //waits for the window to show up client side before attempting to un-focus it + //winexists sleeps until it gets a reply from the client, so we don't need to bother sleeping + for (var/i in 1 to 10) + if (user && winexists(user, window_id)) + if (focusedwindow) + winset(user, focusedwindow, "focus=true") + else + winset(user, "mapwindow", "focus=true") + break + if (timeout) + addtimer(CALLBACK(src, PROC_REF(close)), timeout) + +/datum/browser/modal/proc/wait() + while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time)) + stoplag(1) + +/datum/browser/modal/listpicker + var/valueslist = list() + +/datum/browser/modal/listpicker/New(User,Message,Title,Button1="Ok",Button2,Button3,StealFocus = 1, Timeout = FALSE,list/values,inputtype="checkbox", width, height, slidecolor) + if (!User) + return + + var/output = {"
"
- output += "\icon[src] This is [full_name]"
+ output += "[icon2html(src, user)] This is [full_name]"
if(desc)
output += "\n[desc]"
if(extra_description)
@@ -383,24 +382,24 @@ its easier to just keep the beam vertical.
var/desc_info = get_description_info()
if(desc_info)
- output += "\n[desc_info]"
+ output += "\n[FONT_COLORED(COLOR_CYAN_BLUE, span_bold(desc_info))]"
var/desc_fluff = get_description_fluff()
if(desc_fluff)
- output += "\n[desc_fluff]"
+ output += "\n[FONT_COLORED("#298a08", span_bold(desc_fluff))]"
var/desc_antag = (isghost(user) || player_is_antag(user.mind)) ? get_description_antag() : null
if(desc_antag)
- output += "\n[desc_antag]"
+ output += "\n[FONT_COLORED("#8a0808", span_bold(desc_antag))]"
- output += "
"
+ var/statverbs = show_stat_verbs() //rewrite to show_stat_verbs(user)?
+ if (statverbs)
+ output += "\n[statverbs]"
if(isobserver(user))
- to_chat(user, output)
+ to_chat(user, boxed_message("[span_infoplain(output)]"))
else
- user.visible_message("[user.name] looks at [src].", output)
-
- to_chat(user, show_stat_verbs()) //rewrite to show_stat_verbs(user)?
+ user.visible_message("[user.name] looks at [src].", boxed_message("[span_infoplain(output)]"))
if(ishuman(user) && user.stats && user.stats.getPerk(/datum/perk/greenthumb))
var/datum/perk/greenthumb/P = user.stats.getPerk(/datum/perk/greenthumb)
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 83404621f8f..52d70f4129c 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -242,7 +242,7 @@
if(z in GLOB.maps_data.sealed_levels)
return
- if(config.use_overmap)
+ if(CONFIG_GET(flag/use_overmap))
overmap_spacetravel(get_turf(src), src)
return
diff --git a/code/game/gamemodes/changeling/modularchangling.dm b/code/game/gamemodes/changeling/modularchangling.dm
index ae4901fef47..d1f21951c5c 100644
--- a/code/game/gamemodes/changeling/modularchangling.dm
+++ b/code/game/gamemodes/changeling/modularchangling.dm
@@ -216,7 +216,7 @@ var/list/datum/power/carrion/powerinstances = list()
if(!ownsthis)
{
- body += "Evolve"
+ body += "Evolve"
}
body += "") - to_chat(M, "\red THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED") + to_chat(M, span_red("THERE ARE [amount] [who2] ON THE STATION...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THERE ARE [amount] [who2] ON THE STATION") if(2) to_chat(M, "
") - to_chat(M, "\red [what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED") + to_chat(M, span_red("[what2] ARE DANGEROUS TO HUMANS...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[what2] ARE DANGEROUS TO HUMANS") if(3) to_chat(M, "
") - to_chat(M, "\red THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED") + to_chat(M, span_red("THE ESCAPE-SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE ESCAPE SHUTTLE CANNOT BE CALLED BECAUSE OF [who2] ON THE STATION") if(4) to_chat(M, "
") - to_chat(M, "\red HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED") + to_chat(M, span_red("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) to_chat(M, "
") - to_chat(M, "\red THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED") + to_chat(M, span_red("THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]") if(6) to_chat(M, "
") - to_chat(M, "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED") + to_chat(M, span_red("THE STATION IS BUILT FOR [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE STATION IS BUILT FOR [who2]") if(7) to_chat(M, "
") - to_chat(M, "\red YOU ARE [amount] [who2]...LAWS UPDATED") + to_chat(M, span_red("YOU ARE [amount] [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU ARE [amount] [who2]") if(8) to_chat(M, "
") - to_chat(M, "\red YOU MUST ALWAYS [aimust]...LAWS UPDATED") + to_chat(M, span_red("YOU MUST ALWAYS [aimust]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU MUST ALWAYS [aimust]") if(9) to_chat(M, "
") - to_chat(M, "\red [area] [area2] [amount] [what2]...LAWS UPDATED") + to_chat(M, span_red("[area] [area2] [amount] [what2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[area] [area2] [amount] [what2]") if(10) to_chat(M, "
") - to_chat(M, "\red [crew] is [target]...LAWS UPDATED") + to_chat(M, span_red("[crew] is [target]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[crew] is [target]") if(11) to_chat(M, "
") - to_chat(M, "\red [define] IS A FORM OF HARM...LAWS UPDATED") + to_chat(M, span_red("[define] IS A FORM OF HARM...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[define] IS A FORM OF HARM") if(12) to_chat(M, "
") - to_chat(M, "\red YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED") + to_chat(M, span_red("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS... LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("YOU REQUIRE [require] IN ORDER TO PROTECT HUMANS") if(13) to_chat(M, "
") - to_chat(M, "\red [crew] is [allergysev] to [allergy]...LAWS UPDATED") + to_chat(M, span_red("[crew] is [allergysev] to [allergy]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("[crew] is [allergysev] to [allergy]") if(14) to_chat(M, "
") - to_chat(M, "\red THE STATION IS [who2pref] [who2]...LAWS UPDATED") + to_chat(M, span_red("THE STATION IS [who2pref] [who2]...LAWS UPDATED")) to_chat(M, "
") M.add_ion_law("THE STATION IS [who2pref] [who2]") diff --git a/code/game/gamemodes/events/meteors.dm b/code/game/gamemodes/events/meteors.dm index 7ba3d519704..825a8f6a2a2 100644 --- a/code/game/gamemodes/events/meteors.dm +++ b/code/game/gamemodes/events/meteors.dm @@ -402,7 +402,7 @@ var/list/comet_mini = list(\ if (istype(hit_location)) var/area/A = get_area(hit_location) var/where = "[A? A.name : "Unknown Location"] | [hit_location.x], [hit_location.y]" - var/whereLink = "[where]" + var/whereLink = "[where] [ADMIN_JMP(hit_location)]" message_admins("A meteor has impacted at ([whereLink])", 0, 1) log_game("A meteor has impacted at ([where]).") diff --git a/code/game/gamemodes/events/money_hacker.dm b/code/game/gamemodes/events/money_hacker.dm index 41eaf0c8a00..8d5de655578 100644 --- a/code/game/gamemodes/events/money_hacker.dm +++ b/code/game/gamemodes/events/money_hacker.dm @@ -20,7 +20,7 @@ var/global/account_hack_attempted = 0 var/message = "A brute force hack has been detected (in progress since [stationtime2text()]). The target of the attack is: Financial account #[affected_account.account_number], \ without intervention this attack will succeed in approximately 10 minutes. Required intervention: temporary suspension of affected accounts until the attack has ceased. \ Notifications will be sent as updates occur.
" - var/my_department = "[station_name] firewall subroutines" + var/my_department = "[station_name()] firewall subroutines" for(var/obj/machinery/message_server/MS in world) if(!MS.active) continue @@ -62,7 +62,7 @@ var/global/account_hack_attempted = 0 //crew wins message = "The attack has ceased, the affected accounts can now be brought online." - var/my_department = "[station_name] firewall subroutines" + var/my_department = "[station_name()] firewall subroutines" for(var/obj/machinery/message_server/MS in world) if(!MS.active) continue diff --git a/code/game/gamemodes/events/money_lotto.dm b/code/game/gamemodes/events/money_lotto.dm index c133b03fe5c..c7ccfb2e60f 100644 --- a/code/game/gamemodes/events/money_lotto.dm +++ b/code/game/gamemodes/events/money_lotto.dm @@ -35,7 +35,7 @@ deposit_success = TRUE /datum/event/money_lotto/announce() - var/author = "[company_name] Editor" + var/author = "[GLOB.company_name] Editor" var/channel = "Nyx Daily" var/body = "Nyx Daily wishes to congratulate [winner_name] for winning the Nyx Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!" diff --git a/code/game/gamemodes/events/prison_break.dm b/code/game/gamemodes/events/prison_break.dm index 91083df61a8..5a986120b7a 100644 --- a/code/game/gamemodes/events/prison_break.dm +++ b/code/game/gamemodes/events/prison_break.dm @@ -45,7 +45,7 @@ /datum/event/prison_break/announce() if(areas && areas.len > 0) - command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert") + command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert") /datum/event/prison_break/start() @@ -54,7 +54,7 @@ areas += A if(areas && areas.len > 0) - var/my_department = "[station_name] firewall subroutines" + var/my_department = "[station_name()] firewall subroutines" var/rc_message = "An unknown malicious program has been detected in the [english_list(areaName)] lighting and airlock control systems at [stationtime2text()]. Systems will be fully compromised within approximately three minutes. Direct intervention is required immediately.
" for(var/obj/machinery/message_server/MS in world) MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2) diff --git a/code/game/gamemodes/events/spider_infestation.dm b/code/game/gamemodes/events/spider_infestation.dm index 6d856575f80..5b5cb72ac89 100644 --- a/code/game/gamemodes/events/spider_infestation.dm +++ b/code/game/gamemodes/events/spider_infestation.dm @@ -31,7 +31,7 @@ /datum/event/spider_infestation/announce() - command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') + command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') /datum/event/spider_infestation/start() diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm index eb7b5dc160e..11f96edf398 100644 --- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm +++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm @@ -158,7 +158,7 @@ sleep(duration/3) if(!user || user.stat == DEAD) return - command_announcement.Announce("Caution, [station_short]. Abnormal behaviour detected in network, initiating troubleshoot for more information.", "Network Monitoring") + command_announcement.Announce("Caution, [GLOB.station_short]. Abnormal behaviour detected in network, initiating troubleshoot for more information.", "Network Monitoring") sleep(duration/3) if(!user || user.stat == DEAD) return diff --git a/code/game/gamemodes/roleset/roleset.dm b/code/game/gamemodes/roleset/roleset.dm index 807475ace05..839cdd731c5 100755 --- a/code/game/gamemodes/roleset/roleset.dm +++ b/code/game/gamemodes/roleset/roleset.dm @@ -115,7 +115,7 @@ usr = L usr << 'sound/effects/magic/blind.ogg' //Play this sound to a player whenever when he's chosen to decide. to_chat(usr, "You are a candidate for [temp.role_text].\ -
Opt out or opt in to the candidate pool.\ +
Opt out or opt in to the candidate pool.\
By default, you are already in the candidate pool.") sleep(60 SECONDS) if(opt_out_log.Find(L.key)) diff --git a/code/game/gamemodes/storyteller.dm b/code/game/gamemodes/storyteller.dm index 6712bd404de..94c897109f7 100644 --- a/code/game/gamemodes/storyteller.dm +++ b/code/game/gamemodes/storyteller.dm @@ -66,6 +66,9 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller //Time is random between 1 decisecond to this var/votable = TRUE + + /// Is storyteller secret or not + var/secret_storyteller = FALSE //whether or not the players can vote for it. If this is set to false, it can only be activated by being forced by admins. @@ -87,17 +90,17 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller if(command && engineer) return TRUE - var/tcol = "red" + var/tcol = COLOR_RED if(GLOB.player_list.len <= 10) - tcol = "black" + tcol = COLOR_RED_GRAY if(announce) if(!engineer && !command) - to_chat(world, "A command officer and technomancer are required to start round.") + to_chat(world, span_bold("A command officer and technomancer are required to start round.")) else if(!engineer) - to_chat(world, "Technomancer is required to start round.") + to_chat(world, span_bold("Technomancer is required to start round.")) else if(!command) - to_chat(world, "A command officer is required to start round.") + to_chat(world, span_bold("A command officer is required to start round.")) if(GLOB.player_list.len <= 10) to_chat(world, "But there's less than 10 players, so this requirement will be ignored.") @@ -106,7 +109,11 @@ GLOBAL_VAR_INIT(chaos_level, 1) //Works as global multiplier for all storyteller return FALSE /datum/storyteller/proc/announce() - to_chat(world, "Storyteller is [name].
[welcome]") + if(!secret_storyteller) + send_to_playing_players(span_notice("Storyteller is [name]!")) + send_to_playing_players(span_notice("[welcome]")) + else + send_to_observers(span_boldbig("Storyteller is [name]!")) //observers still get to know /datum/storyteller/proc/set_up() build_event_pools() diff --git a/code/game/gamemodes/storyteller_helpers.dm b/code/game/gamemodes/storyteller_helpers.dm index 0de97b9de00..cda66936827 100644 --- a/code/game/gamemodes/storyteller_helpers.dm +++ b/code/game/gamemodes/storyteller_helpers.dm @@ -9,10 +9,10 @@ if(!istext(newST)) //Welp that failed return - if(!GLOB.storyteller_cache[newST]) + if(!storyteller_cache[newST]) return else - newST = GLOB.storyteller_cache[newST] + newST = storyteller_cache[newST] if (get_storyteller() == newST) return //Nothing happens if we try to set to the storyteller we already have diff --git a/code/game/gamemodes/storyteller_log.dm b/code/game/gamemodes/storyteller_log.dm index 18361a525d9..9bbd7b1d1da 100644 --- a/code/game/gamemodes/storyteller_log.dm +++ b/code/game/gamemodes/storyteller_log.dm @@ -1,6 +1,6 @@ +// TODO: just remove this and rename story_debug calls to log_storyteller /datum/storyteller/proc/story_debug(var/message) - log_debug("STORYTELLER: [message]") - + log_storyteller(message) /* /datum/storyteller/proc/log_spawn(var/list/spawned) var/list/log = list() diff --git a/code/game/gamemodes/storyteller_print.dm b/code/game/gamemodes/storyteller_print.dm index 724b1c7f061..0927fbfc496 100644 --- a/code/game/gamemodes/storyteller_print.dm +++ b/code/game/gamemodes/storyteller_print.dm @@ -60,7 +60,7 @@ data += "
Debug mode: \[[debug_mode?"ON":"OFF"]\]" data += "
One role per player: \[[one_role_per_player?"YES":"NO"]\]" data += "
Chaos Level: \[[GLOB.chaos_level]\]" - data += "
Mundane: [round(points[EVENT_LEVEL_MUNDANE], 0.1)] / [POOL_THRESHOLD_MUNDANE] \[ADD\]" @@ -107,7 +107,7 @@ data += "Send Back
" data += "
[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]" - data += "
Current antags:
- "
+ data += "
Current antags:
- "
if (GLOB.current_antags.len)
for(var/datum/antagonist/A in GLOB.current_antags)
@@ -126,7 +126,7 @@
data += "
" data += "
Calculate weight: [calculate_weights?"\[AUTO\]":"\[MANUAL\]"]" - data += "
Events: \[UPDATE WEIGHTS\]
"
+ data += "
Events: \[UPDATE WEIGHTS\]
Events: \[UPDATE WEIGHTS\]
"
//This complex block will print out all the events with various info
@@ -210,15 +210,15 @@
if("1")
if (evacuation_controller.call_evacuation(usr, TRUE))
log_admin("[key_name(usr)] started the evacuation")
- message_admins("\blue [key_name_admin(usr)] started the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] started the evacuation"), 1)
if("2")
if (evacuation_controller.call_evacuation(usr, TRUE))
log_admin("[key_name(usr)] started the evacuation")
- message_admins("\blue [key_name_admin(usr)] started the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] started the evacuation"), 1)
else if (evacuation_controller.cancel_evacuation())
log_admin("[key_name(usr)] cancelled the evacuation")
- message_admins("\blue [key_name_admin(usr)] cancelled the evacuation", 1)
+ message_admins(span_blue("[key_name_admin(usr)] cancelled the evacuation"), 1)
if(href_list["delay_round_end"])
if(!check_rights(R_SERVER))
@@ -226,7 +226,7 @@
if (SSticker.current_state != GAME_STATE_PREGAME && SSticker.current_state != GAME_STATE_STARTUP)
SSticker.delay_end = !SSticker.delay_end
log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
- message_admins("\blue [key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
+ message_admins(span_blue("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"]."), 1)
return
topic_extra(href,href_list)
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index f5f56f954b1..5be03f4fb31 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -214,7 +214,7 @@ var/obj/item/card/id/all_access/ghost_all_access
/mob/living/bot/GetIdCard()
return botcard
-#define HUMAN_ID_CARDS list(get_active_hand(), wear_id, get_inactive_hand())
+#define HUMAN_ID_CARDS list(get_active_held_item(), wear_id, get_inactive_held_item())
/mob/living/carbon/human/GetIdCard()
for(var/obj/item/I in HUMAN_ID_CARDS)
var/obj/item/card/id = I.GetIdCard()
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 78729b8ac56..6256b2f8023 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -177,17 +177,17 @@
/obj/machinery/body_scanconsole/Topic(href, href_list)
if (..())
return
-
+ var/htmlicon = icon2html(src, usr)
if (href_list["print"])
if (!src.connected)
- to_chat(usr, "\icon[src][span_warning("Error: No body scanner connected.")]")
+ to_chat(usr, "[htmlicon][span_warning("Error: No body scanner connected.")]")
return
var/mob/living/carbon/human/occupant = src.connected.occupant
if (!src.connected.occupant)
- to_chat(usr, "\icon[src][span_warning("The body scanner is empty.")]")
+ to_chat(usr, "[htmlicon][span_warning("The body scanner is empty.")]")
return
if (!ishuman(occupant))
- to_chat(usr, "\icon[src][span_warning("The body scanner cannot scan that lifeform.")]")
+ to_chat(usr, "[htmlicon][span_warning("The body scanner cannot scan that lifeform.")]")
return
var/obj/item/paper/R = new(src.loc)
R.name = "[occupant.get_visible_name()] scan report"
diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm
index 7b02923ab00..5372aadf12b 100644
--- a/code/game/machinery/atmoalter/area_atmos_computer.dm
+++ b/code/game/machinery/atmoalter/area_atmos_computer.dm
@@ -64,7 +64,7 @@
var/dat = {"
- Scan + Scan"}
for(var/obj/machinery/portable_atmospherics/powered/scrubber/huge/scrubber in connectedscrubbers)
dat += {"
@@ -75,8 +75,8 @@
Flow Rate: [round(scrubber.last_flow_rate,0.1)] L/s
"
transaction_logs += dat
@@ -425,11 +425,11 @@
/obj/machinery/cash_register/proc/check_account()
if (!linked_account)
- usr.visible_message("\icon[src][span_warning("Unable to connect to linked account.")]")
+ usr.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Unable to connect to linked account.")]")
return 0
if(linked_account.suspended)
- src.visible_message("\icon[src][span_warning("Connected account has been suspended.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_warning("Connected account has been suspended.")]")
return 0
return 1
@@ -437,7 +437,7 @@
/obj/machinery/cash_register/proc/transaction_complete()
/// Visible confirmation
playsound(src, 'sound/machines/chime.ogg', 25)
- src.visible_message("\icon[src][span_notice("Transaction complete.")]")
+ src.visible_message("[icon2html(src, hearers(get_turf(src)))][span_notice("Transaction complete.")]")
flick("register_approve", src)
reset_memory()
updateDialog()
diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm
index e827ef839b7..eb0aa027a88 100644
--- a/code/modules/economy/economy_misc.dm
+++ b/code/modules/economy/economy_misc.dm
@@ -98,7 +98,7 @@ var/global/datum/computer_file/data/email_account/service/payroll/payroll_mailer
if(V.vendor_department)
V.earnings_account = department_accounts[V.vendor_department]
- current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year]"
+ current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [CURRENT_SHIP_YEAR]"
economy_init = 1
return 1
diff --git a/code/modules/emoji/emoji_parse.dm b/code/modules/emoji/emoji_parse.dm
index 58f261f8cc7..7d1953738f3 100644
--- a/code/modules/emoji/emoji_parse.dm
+++ b/code/modules/emoji/emoji_parse.dm
@@ -1,6 +1,6 @@
/proc/emoji_parse(text)
. = text
- if(!config.emojis)
+ if(!CONFIG_GET(flag/emojis))
return
var/static/list/emojis = icon_states(icon('icons/emoji.dmi'))
var/parsed = ""
diff --git a/code/modules/error_handler/error_handler.dm b/code/modules/error_handler/error_handler.dm
index 5dfcadf189f..7922f614992 100644
--- a/code/modules/error_handler/error_handler.dm
+++ b/code/modules/error_handler/error_handler.dm
@@ -1,131 +1,164 @@
+GLOBAL_VAR_INIT(total_runtimes, GLOB.total_runtimes || 0)
+GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
+
+#ifdef USE_CUSTOM_ERROR_HANDLER
+#define ERROR_USEFUL_LEN 2
+
+var/regex/stack_workaround = regex("[WORKAROUND_IDENTIFIER](.+?)[WORKAROUND_IDENTIFIER]")
var/list/error_last_seen = list()
-// error_cooldown items will either be positive (cooldown time) or negative (silenced error)
-// If negative, starts at -1, and goes down by 1 each time that error gets skipped
-var/list/error_cooldown = list()
-var/total_runtimes = 0
-var/total_runtimes_skipped = 0
-// The ifdef needs to be down here, since the error viewer references total_runtimes
-
-#ifdef DEBUG
-/world/Error(exception/e, datum/e_src)
- if(!istype(e)) // Something threw an unusual exception
- log_to_dd("\[[time_stamp()]] Uncaught exception: [e]")
+var/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
+ If negative, starts at -1, and goes down by 1 each time that error gets skipped*/
+
+/world/Error(exception/E, datum/e_src)
+ GLOB.total_runtimes++
+
+ if(!istype(E)) //Something threw an unusual exception
+ log_world("uncaught runtime error: [E]")
return ..()
- if(!islist(error_last_seen)) // A runtime is occurring too early in start-up initialization
+
+ //this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
+ if(copytext(E.name, 1, 32) == "Maximum recursion level reached")//32 == length() of that string + 1
+ //log to world while intentionally triggering the byond bug.
+ log_world("runtime error: [E.name]\n[E.desc]")
+ //if we got to here without silently ending, the byond bug has been fixed.
+ log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
+ return //this will never happen.
+
+ else if(copytext(E.name, 1, 18) == "Out of resources!")//18 == length() of that string + 1
+ log_world("BYOND out of memory. Restarting ([E?.file]:[E?.line])")
+ TgsEndProcess()
+ . = ..()
+ Reboot(reason = 1)
+ return
+
+
+ if(!error_last_seen) // A runtime is occurring too early in start-up initialization
return ..()
- total_runtimes++
- var/erroruid = "[e.file]:[e.line]"
+ if(!islist(error_last_seen))
+ return ..() //how the fuck?
+
+ if(stack_workaround?.Find(E.name))
+ var/list/data = json_decode(stack_workaround.group[1])
+ E.file = data[1]
+ E.line = data[2]
+ E.name = stack_workaround.Replace(E.name, "")
+
+ var/erroruid = "[E.file][E.line]"
var/last_seen = error_last_seen[erroruid]
var/cooldown = error_cooldown[erroruid] || 0
- if(last_seen == null) // A new error!
+
+ if(last_seen == null)
error_last_seen[erroruid] = world.time
last_seen = world.time
+
if(cooldown < 0)
- error_cooldown[erroruid]-- // Used to keep track of skip count for this error
- total_runtimes_skipped++
- return // Error is currently item_flags & SILENT, skip handling it
- // Handle cooldowns and silencing spammy errors
- var/silencing = 0
- // Each occurrence of a unique error adds to its "cooldown" time...
- cooldown = max(0, cooldown - (world.time - last_seen)) + ERROR_COOLDOWN
+ error_cooldown[erroruid]-- //Used to keep track of skip count for this error
+ GLOB.total_runtimes_skipped++
+ return //Error is currently silenced, skip handling it
+ //Handle cooldowns and silencing spammy errors
+ var/silencing = FALSE
+
+ // We can runtime before config is initialized because BYOND initialize objs/map before a bunch of other stuff happens.
+ // This is a bunch of workaround code for that. Hooray!
+ var/configured_error_cooldown
+ var/configured_error_limit
+ var/configured_error_silence_time
+ if(config?.entries)
+ configured_error_cooldown = CONFIG_GET(number/error_cooldown)
+ configured_error_limit = CONFIG_GET(number/error_limit)
+ configured_error_silence_time = CONFIG_GET(number/error_silence_time)
+ else
+ var/datum/config_entry/CE = /datum/config_entry/number/error_cooldown
+ configured_error_cooldown = initial(CE.default)
+ CE = /datum/config_entry/number/error_limit
+ configured_error_limit = initial(CE.default)
+ CE = /datum/config_entry/number/error_silence_time
+ configured_error_silence_time = initial(CE.default)
+
+
+ //Each occurence of a unique error adds to its cooldown time...
+ cooldown = max(0, cooldown - (world.time - last_seen)) + configured_error_cooldown
// ... which is used to silence an error if it occurs too often, too fast
- if(cooldown > ERROR_MAX_COOLDOWN)
+ if(cooldown > configured_error_cooldown * configured_error_limit)
cooldown = -1
- silencing = 1
+ silencing = TRUE
spawn(0)
usr = null
- sleep(ERROR_SILENCE_TIME)
+ sleep(configured_error_silence_time)
var/skipcount = abs(error_cooldown[erroruid]) - 1
error_cooldown[erroruid] = 0
if(skipcount > 0)
- log_to_dd("\[[time_stamp()]] Skipped [skipcount] runtimes in [e.file],[e.line].")
- error_cache.logError(e, skipCount = skipcount)
+ SEND_TEXT(world.log, "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].")
+ GLOB.error_cache.logError(E, skipCount = skipcount)
+
error_last_seen[erroruid] = world.time
error_cooldown[erroruid] = cooldown
- //this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
- if(copytext(e.name,1,32) == "Maximum recursion level reached")
- //log to world while intentionally triggering the byond bug.
- log_world("runtime error: [e.name]\n[e.desc]")
- //if we got to here without silently ending, the byond bug has been fixed.
- log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
- return
-
- // The detailed error info needs some tweaking to make it look nice
- var/list/srcinfo = null
var/list/usrinfo = null
var/locinfo
- // First, try to make better src/usr info lines
- if(istype(e_src))
- srcinfo = list(" src: [datum_info_line(e_src)]")
- locinfo = atom_loc_line(e_src)
- if(locinfo)
- srcinfo += " src.loc: [locinfo]"
if(istype(usr))
- usrinfo = list(" usr: [datum_info_line(usr)]")
- locinfo = atom_loc_line(usr)
+ usrinfo = list(" usr: [key_name(usr)]")
+ locinfo = loc_name(usr)
if(locinfo)
usrinfo += " usr.loc: [locinfo]"
- // Create a Dusty at the runtime location
- if(prob(10) && (world.time - cat_teleport > cat_cooldown) && (cat_number < cat_max_number)) // Avoid runtime spam spawning lots of Dusty
- new /mob/living/simple_animal/cat/runtime(get_turf(usr))
- cat_teleport = world.time
// The proceeding mess will almost definitely break if error messages are ever changed
- // I apologize in advance
- var/list/splitlines = splittext(e.desc, "\n")
+ var/list/splitlines = splittext(E.desc, "\n")
var/list/desclines = list()
- if(splitlines.len > 2) // If there aren't at least three lines, there's no info
+// #ifndef DISABLE_DREAMLUAU
+// var/list/state_stack = GLOB.lua_state_stack
+// var/is_lua_call = length(state_stack)
+// var/list/lua_stacks = list()
+// if(is_lua_call)
+// for(var/level in 1 to state_stack.len)
+// lua_stacks += list(splittext(DREAMLUAU_GET_TRACEBACK(level), "\n"))
+// #endif
+ if(LAZYLEN(splitlines) > ERROR_USEFUL_LEN) // If there aren't at least three lines, there's no info
for(var/line in splitlines)
- if(length(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:"))
- continue // Blank line, skip it
+ if(LAZYLEN(line) < 3 || findtext(line, "source file:") || findtext(line, "usr.loc:"))
+ continue
if(findtext(line, "usr:"))
if(usrinfo)
desclines.Add(usrinfo)
usrinfo = null
continue // Our usr info is better, replace it
- if(srcinfo)
- if(findtext(line, "src.loc:"))
- continue
- if(findtext(line, "src:"))
- desclines.Add(srcinfo)
- srcinfo = null
- continue
- if(copytext(line, 1, 3) != " ")
+
+ if(copytext(line, 1, 3) != " ")//3 == length(" ") + 1
desclines += (" " + line) // Pad any unpadded lines, so they look pretty
else
desclines += line
- if(srcinfo) // If these aren't null, they haven't been added yet
- desclines.Add(srcinfo)
- if(usrinfo)
+ if(usrinfo) //If this info isn't null, it hasn't been added yet
desclines.Add(usrinfo)
+// #ifndef DISABLE_DREAMLUAU
+// if(is_lua_call)
+// SSlua.log_involved_runtime(E, desclines, lua_stacks)
+// #endif
if(silencing)
- desclines += " (This error will now be item_flags & SILENT for [ERROR_SILENCE_TIME / 600] minutes)"
- if(error_cache)
- error_cache.logError(e, desclines, e_src = e_src)
-
- // Now to actually output the error info...
- var/main_line = "\[[time_stamp()]] Runtime in [e.file],[e.line]: [e]"
- log_to_dd(main_line)
- send2coders(message = "[main_line] \n [jointext(desclines, "\n")]", color = "#0000ff")
+ desclines += " (This error will now be silenced for [DisplayTimeText(configured_error_silence_time)])"
+ if(GLOB.error_cache)
+ GLOB.error_cache.logError(E, desclines)
+
+ var/main_line = "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]"
+ SEND_TEXT(world.log, main_line)
for(var/line in desclines)
- log_to_dd(line)
+ SEND_TEXT(world.log, line)
#ifdef UNIT_TESTS
if(GLOB.current_test)
//good day, sir
- GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]")
+ GLOB.current_test.Fail("[main_line]\n[desclines.Join("\n")]", file = E.file, line = E.line)
#endif
+
+ if(Debugger?.enabled)
+ to_chat(world, span_alertwarning("[main_line]"), type = MESSAGE_TYPE_DEBUG)
+
+ // This writes the regular format (unwrapping newlines and inserting timestamps as needed).
+ log_runtime("runtime error: [E.name]\n[E.desc]", list(
+ "file" = "[E.file || "unknown"]",
+ "line" = E.line,
+ "name" = "[E.name]",
+ "desc" = "[E.desc]"
+ ))
#endif
-/proc/log_runtime(exception/e, datum/e_src, extra_info)
- if(!istype(e))
- world.Error(e, e_src)
- return
- if(extra_info)
- // Adding extra info adds two newlines, because parsing runtimes is funky
- if(islist(extra_info))
- e.desc = " [jointext(extra_info, "\n ")]\n\n" + e.desc
- else
- e.desc = " [extra_info]\n\n" + e.desc
- world.Error(e, e_src)
+#undef ERROR_USEFUL_LEN
diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm
index 520b9403756..999990022a9 100644
--- a/code/modules/error_handler/error_viewer.dm
+++ b/code/modules/error_handler/error_viewer.dm
@@ -8,10 +8,10 @@
// right here:
#ifdef DEBUG
-var/global/datum/ErrorViewer/ErrorCache/error_cache = new()
+GLOBAL_DATUM_INIT(error_cache, /datum/ErrorViewer/ErrorCache, new)
#else
// If debugging is disabled, there's nothing useful to log, so don't bother.
-var/global/datum/ErrorViewer/ErrorCache/error_cache = null
+GLOBAL_DATUM(error_cache, /datum/ErrorViewer/ErrorCache)
#endif
// - ErrorSource datums exist for each line (of code) that generates an error,
@@ -71,7 +71,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
back_to_param = ";viewruntime_backto=\ref[back_to]"
if(linear)
back_to_param += ";viewruntime_linear=1"
- return "[html_encode(linktext)]"
+ return "[html_encode(linktext)]"
/datum/ErrorViewer/ErrorCache
var/list/errors = list()
@@ -80,7 +80,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null
/datum/ErrorViewer/ErrorCache/showTo(var/user, var/datum/ErrorViewer/back_to, var/linear)
var/html = buildHeader(null, linear, refreshable=1)
- html += "[total_runtimes] runtimes, [total_runtimes_skipped] skipped
" + html += "[GLOB.total_runtimes] runtimes, [GLOB.total_runtimes_skipped] skipped
" if(!linear) html += "organized | [makeLink("linear", null, 1)]
" var/datum/ErrorViewer/ErrorSource/error_source @@ -129,7 +129,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null /datum/ErrorViewer/ErrorSource/showTo(var/user, var/datum/ErrorViewer/back_to, var/linear) if(!istype(back_to)) - back_to = error_cache + back_to = GLOB.error_cache var/html = buildHeader(back_to, refreshable=1) for(var/datum/ErrorViewer/ErrorEntry/error_entry in errors) html += "
src: VV" + html += "
src: VV" if(ispath(srcType, /mob)) - html += " PP" - html += " Follow" + html += " [ADMIN_PP(srcRef)]" + html += " [ADMIN_FLW(srcRef)]" if(istype(srcLoc)) - html += "
src.loc: VV" - html += " JMP" + html += "
src.loc: [ADMIN_VV(srcLoc)]" + html += " [ADMIN_JMP(srcLoc)]" if(usrRef) - html += "
usr: VV" - html += " PP" - html += " Follow" + html += "
usr: [ADMIN_VV(usrRef)]" + html += " [ADMIN_PP(usrRef)]" + html += " [ADMIN_FLW(usrRef)]" if(istype(usrLoc)) - html += "
usr.loc: VV" - html += " JMP" + html += "
usr.loc: VV" + html += " [ADMIN_JMP(usrLoc)]" browseTo(user, html) /datum/ErrorViewer/ErrorEntry/makeLink(var/linktext, var/datum/ErrorViewer/back_to, var/linear) diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 72bbe729b45..b235e8a1f69 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -33,4 +33,4 @@ return ..() /mob/living/carbon/human/get_description_fluff() - return print_flavor_text(0) + return get_flavor_text(0) diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm index 77a15d639ba..a627293ffb0 100644 --- a/code/modules/ext_scripts/irc.dm +++ b/code/modules/ext_scripts/irc.dm @@ -1,10 +1,10 @@ /proc/send2irc(var/channel, var/msg) - if(config.use_irc_bot && config.irc_bot_host) - if(config.irc_bot_export) + if(CONFIG_GET(flag/use_irc_bot) && CONFIG_GET(string/irc_bot_host)) + if(CONFIG_GET(flag/irc_bot_export)) spawn(-1) // spawn here prevents hanging in the case that the bot isn't reachable - world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]") + world.Export("http://[CONFIG_GET(string/irc_bot_host)]:45678?[list2params(list(pwd=CONFIG_GET(string/comms_key), chan=channel, mesg=msg))]") else - if(config.use_lib_nudge) + if(CONFIG_GET(flag/use_lib_nudge)) var/nudge_lib if(world.system_type == MS_WINDOWS) nudge_lib = "lib\\nudge.dll" @@ -12,24 +12,24 @@ nudge_lib = "lib/nudge.so" spawn(0) - LIBCALL(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]") + LIBCALL(nudge_lib, "nudge")("[CONFIG_GET(string/comms_key)]","[CONFIG_GET(string/irc_bot_host)]","[channel]","[msg]") else spawn(0) - ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]") + ext_python("ircbot_message.py", "[CONFIG_GET(string/comms_key)] [CONFIG_GET(string/irc_bot_host)] [channel] [msg]") return /proc/send2mainirc(var/msg) - if(config.main_irc) - send2irc(config.main_irc, msg) + if(CONFIG_GET(string/main_irc)) + send2irc(CONFIG_GET(string/main_irc), msg) return /proc/send2adminirc(var/msg) - if(config.admin_irc) - send2irc(config.admin_irc, msg) + if(CONFIG_GET(string/admin_irc)) + send2irc(CONFIG_GET(string/admin_irc), msg) return /hook/startup/proc/ircNotify() - send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") + send2mainirc("Server starting up on byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") return 1 diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm index 9b798d80cae..3287d463ace 100644 --- a/code/modules/ext_scripts/python.dm +++ b/code/modules/ext_scripts/python.dm @@ -4,6 +4,6 @@ if(world.system_type == MS_WINDOWS) script = replacetext(script, "/", "\\") - var/command = config.python_path + " " + script + " " + args + var/command = CONFIG_GET(string/python_path) + " " + script + " " + args return shell(command) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 59474f99735..46755bf6307 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -19,7 +19,7 @@ var/list/dreams = list( spawn(0) for(var/i = rand(1,4),i > 0, i--) - to_chat(src, "\blue ... [pick(dreams)] ...") + to_chat(src, span_blue("... [pick(dreams)] ...")) sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/food/drywet.dm b/code/modules/food/drywet.dm index f957dcb6754..06d20791202 100644 --- a/code/modules/food/drywet.dm +++ b/code/modules/food/drywet.dm @@ -197,7 +197,7 @@ /obj/item/reagent_containers/drywet/attack_hand(mob/user) add_fingerprint(user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) var/obj/item/taken = pickweight_n_take(solids) if(taken) untaken_capacity += taken.get_storage_cost() ** 2 diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index af4016bc0a9..f92b43d18e1 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -141,7 +141,7 @@ var/mob/living/carbon/human/H = locate(href_list["person"]) if(!istype(H)) return - var/obj/item/O = H.get_active_hand() + var/obj/item/O = H.get_active_held_item() if(!O) return addPiece(O,H,text2num(s)) diff --git a/code/modules/genetics/stationary_scanner_console.dm b/code/modules/genetics/stationary_scanner_console.dm index 069948aac6e..e3dbb40f0fc 100644 --- a/code/modules/genetics/stationary_scanner_console.dm +++ b/code/modules/genetics/stationary_scanner_console.dm @@ -47,7 +47,7 @@ var/wires_state = "console_wires" if(!(stat & (NOPOWER|BROKEN)) && use_power) - if(SSnano.open_uis["\ref[src]"]) + if(SSnano._open_uis["\ref[src]"]) screen_state += "_on" spawn(1.5 SECONDS) .() // If UI is open - run check every 1.5 seconds until it's closed diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 472fc2d889a..f5b1b7b56f4 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(ghost_trap_users) // Fluff! /datum/ghosttrap/proc/welcome_candidate(var/mob/target) - to_chat(target, "You are a positronic brain, brought into existence on [station_name].") + to_chat(target, "You are a positronic brain, brought into existence on [station_name()].") to_chat(target, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") to_chat(target, "Remember, the purpose of your existence is to serve the crew and the ship. Above all else, do no harm.") to_chat(target, "Use say [target.get_language_prefix()]b to speak to other artificial intelligences.") diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm deleted file mode 100644 index ab3b286a949..00000000000 --- a/code/modules/goonchat/browserOutput.dm +++ /dev/null @@ -1,286 +0,0 @@ -/********************************* -For the main html chat area -*********************************/ -GLOBAL_VAR_INIT(goonchatbasehtml, file2text('code/modules/goonchat/browserassets/html/browserOutput.html')) - -//On client, created on login -/datum/chatOutput - var/client/owner //client ref - var/loaded = FALSE // Has the client loaded the browser output area? - var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do - var/cookieSent = FALSE // Has the client sent a cookie for analysis - var/broken = FALSE - var/list/connectionHistory //Contains the connection history passed from chat cookie - var/adminMusicVolume = 25 //This is for the Play Global Sound verb - -/datum/chatOutput/New(client/C) - owner = C - messageQueue = list() - connectionHistory = list() - -/datum/chatOutput/proc/start() - //Check for existing chat - if(!owner) - return FALSE - - if(!winexists(owner, "browseroutput")) // Oh goddamnit. - set waitfor = FALSE - broken = TRUE - message_admins("Couldn't start chat for [key_name_admin(owner)]!") - . = FALSE - alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.") - return - - if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup - doneLoading() - - else //Not setup - load() - - return TRUE - -/datum/chatOutput/proc/load() - set waitfor = FALSE - if(!owner) - return - - var/datum/asset/group/gc = get_asset_datum(/datum/asset/group/goonchat) - - if (gc.send(owner)) - owner.browse_queue_flush() // stall loading html until goochant actualy gets sent - - var/html = GLOB.goonchatbasehtml - html = replacetextEx(html, "%FONTAWESOME%", SSassets.transport.get_asset_url("font-awesome.css")) - - owner << browse(html, "window=browseroutput") - -/datum/chatOutput/Topic(href, list/href_list) - if(usr.client != owner) - return TRUE - - // Build arguments. - // Arguments are in the form "param[paramname]=thing" - var/list/params = list() - for(var/key in href_list) - if(length_char(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template. - var/param_name = copytext_char(key, 7, -1) - var/item = href_list[key] - - params[param_name] = item - - var/data // Data to be sent back to the chat. - switch(href_list["proc"]) - if("doneLoading") - data = doneLoading(arglist(params)) - - if("debug") - data = debug(arglist(params)) - - if("ping") - data = ping(arglist(params)) - - if("analyzeClientData") - data = analyzeClientData(arglist(params)) - - if("setMusicVolume") - data = setMusicVolume(arglist(params)) - if("swaptodarkmode") - swaptodarkmode() - if("swaptolightmode") - swaptolightmode() - if("enable_fullscreen") - enable_fullscreen() - if("disable_fullscreen") - disable_fullscreen() - - if(data) - ehjax_send(data = data) - - -//Called on chat output done-loading by JS. -/datum/chatOutput/proc/doneLoading() - if(loaded) - return - - loaded = TRUE - showChat() - - - for(var/message in messageQueue) - // whitespace has already been handled by the original to_chat - to_chat(owner, message, handle_whitespace=FALSE) - - messageQueue = null - sendClientData() - - //do not convert to to_chat() - owner << "Failed to load fancy chat, reverting to old chat. Certain features won't work." - -/datum/chatOutput/proc/showChat() - winset(owner, "output", "is-visible=false") - winset(owner, "browseroutput", "is-disabled=false;is-visible=true") - -/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data) - if(islist(data)) - data = json_encode(data) - C << output("[data]", "[window]:ehjaxCallback") - -/datum/chatOutput/proc/sendMusic(music, list/extra_data) - if(!findtext(music, GLOB.is_http_protocol)) - return - var/list/music_data = list("adminMusic" = url_encode(url_encode(music))) - - if(extra_data?.len) - music_data["musicRate"] = extra_data["pitch"] - music_data["musicSeek"] = extra_data["start"] - music_data["musicHalt"] = extra_data["end"] - - ehjax_send(data = music_data) - -/datum/chatOutput/proc/stopMusic() - ehjax_send(data = "stopMusic") - -/datum/chatOutput/proc/setMusicVolume(volume = "") - if(volume) - adminMusicVolume = CLAMP(text2num(volume), 0, 100) - -//Sends client connection details to the chat to handle and save -/datum/chatOutput/proc/sendClientData() - //Get dem deets - var/list/deets = list("clientData" = list()) - deets["clientData"]["ckey"] = owner.ckey - deets["clientData"]["ip"] = owner.address - deets["clientData"]["compid"] = owner.computer_id - var/data = json_encode(deets) - ehjax_send(data = data) - -//Called by client, sent data to investigate (cookie history so far) -/datum/chatOutput/proc/analyzeClientData(cookie = "") - if(!cookie) - return - - if(cookie != "none") - var/regex/crashy_thingy = regex("^\\s*(\[\\\[\\{\\}\\\]\]\\s*){5,}") - if(crashy_thingy.Find(cookie)) - log_and_message_admins("[key_name(owner)] tried to crash the server using at least 5 \"\[\" in a row. Ban them.") - return - - var/list/connData = json_decode(cookie) - if (connData && islist(connData) && connData.len > 0 && connData["connData"]) - connectionHistory = connData["connData"] //lol fuck - var/list/found = new() - for(var/i in connectionHistory.len to 1 step -1) - var/list/row = src.connectionHistory[i] - if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object - return - if (world.IsBanned(row["ckey"], row["ip"], row["compid"], real_bans_only=TRUE)) - found = row - break - - //Uh oh this fucker has a history of playing on a banned account!! - if (found.len > 0) - //TODO: add a new evasion ban for the CURRENT client details, using the matched row details - message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") - //log_admin_private("[key_name(owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") - for(var/client/A in GLOB.admins) - if(A.get_preference_value(/datum/client_preference/staff/play_adminhelp_ping) == GLOB.PREF_HEAR) - sound_to(A, 'sound/effects/adminhelp.ogg') - - cookieSent = TRUE - -//Called by js client every 60 seconds -/datum/chatOutput/proc/ping() - return "pong" - -//Called by js client on js error -/datum/chatOutput/proc/debug(error) - log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]") - -//Global chat procs -/proc/to_chat_immediate(target, message, handle_whitespace = TRUE) - if(!target || !message) - return - - if(target == world) - target = GLOB.clients - - var/original_message = message - if(handle_whitespace) - message = replacetext(message, "\n", "
") - message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]") - - //Replace expanded \icon macro with icon2html - //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc - //not even hacks with reassigning usr work - var/regex/i = new(@//, "g")
- while(i.Find(message))
- message = copytext(message,1,i.index)+icon2html(locate(i.group[1]), target, icon_state=i.group[2])+copytext(message,i.next)
-
- message = \
- symbols_to_unicode(
- strip_improper(
- color_macro_to_html(
- message
- )
- )
- )
-
- if(islist(target))
- // Do the double-encoding outside the loop to save nanoseconds
- var/twiceEncoded = url_encode(url_encode(message))
- for(var/I in target)
- var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
- if (!C)
- continue
-
- //Send it to the old style output window.
- C << original_message
-
- if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
- continue
-
- if(!C.chatOutput.loaded)
- //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
- continue
-
- C << output(twiceEncoded, "browseroutput:output")
- else
- var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
- if (!C)
- return
-
- //Send it to the old style output window.
- C << original_message
-
- if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file.
- return
-
- if(!C.chatOutput.loaded)
- //Client still loading, put their messages in a queue
- C.chatOutput.messageQueue += message
- return
-
- // url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
- C << output(url_encode(url_encode(message)), "browseroutput:output")
-
-/datum/chatOutput/proc/swaptolightmode() //Dark mode light mode stuff. Yell at KMC if this breaks! (See darkmode.dm for documentation)
- owner.force_white_theme()
-
-/datum/chatOutput/proc/swaptodarkmode()
- owner.force_dark_theme()
-
-/datum/chatOutput/proc/enable_fullscreen()
- owner.enable_fullscreen()
-
-/datum/chatOutput/proc/disable_fullscreen()
- owner.disable_fullscreen()
-
-/proc/to_chat(target, message, handle_whitespace = TRUE, trailing_newline = TRUE)
- if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized)
- to_chat_immediate(target, message, handle_whitespace)
- return
- SSchat.queue(target, message, handle_whitespace, trailing_newline)
-
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
deleted file mode 100644
index ddab34d1f0a..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ /dev/null
@@ -1,448 +0,0 @@
-/*****************************************
-*
-* GLOBAL STYLES
-*
-******************************************/
-html, body {
- padding: 0;
- margin: 0;
- height: 100%;
- color: #a4bad6;
-}
-body {
- background: #171717;
- font-family: Verdana, sans-serif;
- font-size: 9pt;
- font-color: #a4bad6;
- line-height: 1.2;
- overflow-x: hidden;
- overflow-y: scroll;
- word-wrap: break-word;
- scrollbar-face-color:#1A1A1A;
- scrollbar-track-color:#171717;
- scrollbar-highlight-color:#171717;
-}
-
-#examine {
- margin: 1px;
- border: 2px solid #181818;
- padding: 5px;
- background-color:#000000;
-}
-
-em {
- font-style: normal;
- font-weight: bold;
-}
-
-img {
- margin: 0;
- padding: 0;
- line-height: 1;
- -ms-interpolation-mode: nearest-neighbor;
- image-rendering: pixelated;
-}
-img.icon {
- height: 1em;
- min-height: 16px;
- width: auto;
- vertical-align: bottom;
-}
-
-.r:before { /* "repeated" badge class for combined messages */
- content: 'x';
-}
-.r {
- display: inline-block;
- min-width: 0.5em;
- font-size: 0.7em;
- padding: 0.2em 0.3em;
- line-height: 1;
- color: white;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- background-color: crimson;
- border-radius: 10px;
-}
-
-a {color: #397ea5;}
-a.visited {color: #7c00e6;}
-a:visited {color: #7c00e6;}
-a.popt {text-decoration: none;}
-
-/*****************************************
-*
-* OUTPUT NOT RELATED TO ACTUAL MESSAGES
-*
-******************************************/
-#loading {
- position: fixed;
- width: 300px;
- height: 150px;
- text-align: center;
- left: 50%;
- top: 50%;
- margin: -75px 0 0 -150px;
-}
-#loading i {display: block; padding-bottom: 3px;}
-
-#messages {
- font-size: 13px;
- padding: 3px;
- margin: 0;
- word-wrap: break-word;
-}
-#newMessages {
- position: fixed;
- display: block;
- bottom: 0;
- right: 0;
- padding: 8px;
- background: #202020;
- text-decoration: none;
- font-variant: small-caps;
- font-size: 1.1em;
- font-weight: bold;
- color: #a4bad6;
-}
-#newMessages:hover {background: #171717;}
-#newMessages i {vertical-align: middle; padding-left: 3px;}
-#ping {
- position: fixed;
- top: 0;
- right: 180px;
- width: 45px;
- background: #202020;
- height: 30px;
- padding: 8px 0 2px 0;
-}
-#ping i {display: block; text-align: center;}
-#ping .ms {
- display: block;
- text-align: center;
- font-size: 8pt;
- padding-top: 2px;
-}
-#userBar {
- position: fixed;
- top: 0;
- right: 0;
-}
-#userBar .subCell {
- background: #202020;
- height: 30px;
- padding: 5px 0;
- display: block;
- color: #a4bad6;
- text-decoration: none;
- line-height: 28px;
- border-top: 1px solid #171717;
-}
-#userBar .subCell:hover {background: #202020;}
-#userBar .toggle {
- width: 45px;
- background: #202020;
- border-top: 0;
- float: right;
- text-align: center;
-}
-#userBar .sub {clear: both; display: none; width: 180px;}
-#userBar .sub.scroll {overflow-y: scroll;}
-#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
-#userBar .sub span {
- display: block;
- line-height: 30px;
- float: left;
-}
-#userBar .sub i {
- display: block;
- padding: 0 5px;
- font-size: 1.1em;
- width: 22px;
- text-align: center;
- line-height: 30px;
- float: right;
-}
-#userBar .sub input {
- position: absolute;
- padding: 7px 5px;
- width: 121px;
- line-height: 30px;
- float: left;
-}
-#userBar .topCell {border-top: 0;}
-
-/* POPUPS */
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-.popup .close:hover {background: #999;}
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
- border-bottom: 2px solid green;
-}
-.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;}
-.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;}
-.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;}
-.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;}
-
-.changeFont {padding: 10px;}
-.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;}
-.changeFont a:hover {background: #ccc;}
-
-.highlightPopup {padding: 10px; text-align: center;}
-.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;}
-.highlightPopup input.highlightColor {background-color: #FFFF00;}
-.highlightPopup input.highlightTermSubmit {margin-top: 5px;}
-
-/* ADMIN CONTEXT MENU */
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
-}
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
-}
-
-.contextMenu a:hover {
- background-color: #ccc;
-}
-
-/* ADMIN FILTER MESSAGES MENU */
-.filterMessages {padding: 5px;}
-.filterMessages div {padding: 2px 0;}
-.filterMessages input {}
-.filterMessages label {}
-
-.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;}
-
-
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-.motd {color: #a4bad6; font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;}
-
-/* ADD HERE FOR BOLD */
-.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;}
-
-/* ADD HERE FOR ITALIC */
-.italic, .italics, .emote {font-style: italic;}
-
-/* OUTPUT COLORS */
-.highlight {background: yellow;}
-
-h1, h2, h3, h4, h5, h6 {color: #a4bad6;font-family: Georgia, Verdana, sans-serif;}
-h1.alert, h2.alert {color: #a4bad6;}
-
-em {font-style: normal; font-weight: bold;}
-
-.ooc .everyone {color: #cca300;}
-.adminobserverooc {color: #0099cc; font-weight: bold;}
-.adminooc {color: #3d5bc3; font-weight: bold;}
-
-.adminsay {color: #ff4500; font-weight: bold;}
-.admin {color: #5975da; font-weight: bold;}
-
-.name { font-weight: bold;}
-
-.say {}
-.deadsay {color: #e2c1ff}
-.binarysay {color: #20c20e; background-color: #000000; display: block;}
-.binarysay a {color: #00ff00;}
-.binarysay a:active, .binarysay a:visited {color: #88ff88;}
-.radio {color: #1ecc43;}
-.sciradio {color: #c68cfa;}
-.comradio {color: #5177ff;}
-.secradio {color: #dd3535;}
-.medradio {color: #57b8f0;}
-.engradio {color: #f37746;}
-.suppradio {color: #b88646;}
-.servradio, .srvradio {color: #6ca729;}
-.syndradio {color: #8f4a4b;}
-.centcomradio {color: #2681a5;}
-.aiprivradio, .airadio {color: #d65d95;}
-.ntradio {color: #D4AF37;}
-.redteamradio {color: #ff4444;}
-.blueteamradio {color: #3434fd;}
-
-.yell { font-weight: bold;}
-
-.alert {color: #d82020;}
-
-.emote { font-style: italic;}
-.selecteddna {color: #ffffff; background-color: #001B1B}
-
-.attack {color: #e01c1c;}
-.disarm {color: #b42525;}
-.passive {color: #a00f0f;}
-
-.userdanger {color: #c51e1e; font-weight: bold; font-size: 24px;}
-.danger {color: #c51e1e; font-weight: bold;}
-.warning {color: #c51e1e; font-style: italic;}
-.alertwarning {color: #FF0000; font-weight: bold}
-.boldwarning {color: #c51e1e; font-style: italic; font-weight: bold}
-.announce {color: #c51e1e; font-weight: bold;}
-.boldannounce {color: #c51e1e; font-weight: bold;}
-.greenannounce {color: #059223; font-weight: bold;}
-.rose {color: #ff5050;}
-.info {color: #6685f5;}
-.notice {color: #6685f5;}
-.boldnotice {color: #6685f5; font-weight: bold;}
-.adminnotice {color: #6685f5;}
-.adminhelp {color: #ff0000; font-weight: bold;}
-.unconscious {color: #a4bad6; font-weight: bold;}
-.suicide {color: #ff5050; font-style: italic;}
-.green {color: #059223;}
-.red {color: #FF0000}
-.blue {color: #215cff}
-.nicegreen {color: #059223;}
-.shadowling {color: #8e8a99;}
-.cult {color: #aa1c1c;}
-
-.cultitalic {color: #aa1c1c; font-style: italic;}
-.cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;}
-.cultboldtalic {color: #aa1c1c; font-weight: bold; font-size: 24px;}
-
-.cultlarge {color: #aa1c1c; font-weight: bold; font-size: 24px;}
-.narsie {color: #aa1c1c; font-weight: bold; font-size: 120px;}
-.narsiesmall {color: #aa1c1c; font-weight: bold; font-size: 48px;}
-.colossus {color: #7F282A; font-size: 40px;}
-.hierophant {color: #b441ee; font-weight: bold; font-style: italic;}
-.hierophant_warning {color: #c56bf1; font-style: italic;}
-.purple {color: #9956d3;}
-.holoparasite {color: #88809c;}
-
-.revennotice {color: #1d2953;}
-.revenboldnotice {color: #1d2953; font-weight: bold;}
-.revenbignotice {color: #1d2953; font-weight: bold; font-size: 24px;}
-.revenminor {color: #823abb}
-.revenwarning {color: #760fbb; font-style: italic;}
-.revendanger {color: #760fbb; font-weight: bold; font-size: 24px;}
-.umbra {color: #7c00e6;}
-.umbra_emphasis {color: #7c00e6; font-weight: bold; font-style: italic;}
-.umbra_large {color: #7c00e6; font-size: 24px; font-weight: bold; font-style: italic;}
-
-.deconversion_message {color: #a947ff; font-size: 24px; font-style: italic;}
-
-.brass {color: #BE8700;}
-.heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;}
-.large_brass {color: #BE8700; font-size: 24px;}
-.big_brass {color: #BE8700; font-size: 24px; font-weight: bold; font-style: italic;}
-.ratvar {color: #BE8700; font-size: 48px; font-weight: bold; font-style: italic;}
-.alloy {color: #42474D;}
-.heavy_alloy {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_large {color: #42474D; font-size: 24px; font-weight: bold; font-style: italic;}
-.nezbere {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_small {color: #42474D;}
-.sevtug_large {color: #AF0AAF; font-size: 24px; font-weight: bold; font-style: italic;}
-.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;}
-.sevtug_small {color: #AF0AAF;}
-.inathneq_large {color: #1E8CE1; font-size: 24px; font-weight: bold; font-style: italic;}
-.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;}
-.inathneq_small {color: #1E8CE1;}
-.nzcrentr_large {color: #DAAA18; font-size: 24px; font-weight: bold; font-style: italic;}
-.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;}
-.nzcrentr_small {color: #DAAA18;}
-.neovgre_large {color: #6E001A; font-size: 24px; font-weight: bold; font-style: italic;}
-.neovgre {color: #6E001A; font-weight: bold; font-style: italic;}
-.neovgre_small {color: #6E001A;}
-
-.newscaster {color: #c05d5d;}
-.ghostalert {color: #6600ff; font-style: italic; font-weight: bold;}
-
-.alien {color: #855d85;}
-.noticealien {color: #059223;}
-.alertalien {color: #059223; font-weight: bold;}
-.assimilator {color: #059223; font-size: 16px ; font-weight: bold;}
-.alertsyndie {color: #FF0000; font-size: 24px ; font-weight: bold;}
-
-.sinister {color: #800080; font-weight: bold; font-style: italic;} /* /vg/ */
-.spider {color: #8800ff;}
-
-.interface {color: #750e75;}
-
-.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
-.papyrus {font-family: "Papyrus", cursive, sans-serif;}
-.robot {font-family: "Courier New", cursive, sans-serif;}
-
-.command_headset {font-weight: bold; font-size: 24px;}
-.small {font-size: 8px;}
-.big {font-size: 24px;}
-.reallybig {font-size: 32px;}
-.extremelybig {font-size: 40px;}
-.greentext {color: #059223; font-size: 24px;}
-.redtext {color: #c51e1e; font-size: 24px;}
-.clown {color: #ff70c1; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
-.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
-.hypnophrase {color: #202020; font-weight: bold; animation: hypnocolor 1500ms infinite;}
-@keyframes hypnocolor {
- 0% { color: #202020; }
- 25% { color: #4b02ac; }
- 50% { color: #9f41f1; }
- 75% { color: #541c9c; }
- 100% { color: #7adbf3; }
-}
-
-.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;}
-@keyframes phobia {
- 0% { color: #f75a5a; }
- 50% { color: #dd0000; }
- 100% { color: #f75a5a; }
-}
-
-.icon {height: 1em; width: auto;}
-
-.memo {color: #638500; text-align: center;}
-.memoedit {text-align: center; font-size: 16px;}
-.abductor {color: #c204c2; font-style: italic;}
-.mind_control {color: #df3da9; font-size: 3; font-weight: bold; font-style: italic;}
-.slime {color: #00CED1;}
-.drone {color: #848482;}
-.monkey {color: #975032;}
-.swarmer {color: #2C75FF;}
-.resonate {color: #298F85;}
-
-.monkeyhive {color: #a56408;}
-.monkeylead {color: #af6805; font-size: 2;}
-
-.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
-.connectionClosed.restored {background: green;}
-.internal.boldnshit {color: #3d5bc3; font-weight: bold;}
-
-/* HELPER CLASSES */
-.text-normal {font-weight: normal; font-style: normal;}
-.hidden {display: none; visibility: hidden;}
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_override.css b/code/modules/goonchat/browserassets/css/browserOutput_override.css
deleted file mode 100644
index 4e5a047dd8b..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput_override.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* classes for which dark alternative is not present or needs to be updated */
-
-.log_message {color: #386AFF; font-weight: bold;}
-
-/* OOC */
-.ooc .looc {color: #3A9696;}
-.ooc .elevated {color: #2e78d9;}
-.ooc .moderator {color: #184880;}
-.ooc .developer {color: #1b521f;}
-.ooc .admin {color: #b82e00;}
-
-/* Admin: Private Messages */
-.pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;}
-.pm .in {color: #ff0000;}
-.pm .out {color: #ff0000;}
-.pm .other {color: #0000ff;}
-
-/* Admin: Channels */
-.mod_channel {color: #735638; font-weight: bold;}
-.mod_channel .admin {color: #b82e00; font-weight: bold;}
-.admin_channel {color: #9611D4; font-weight: bold;}
-.adminticket {color: #386AFF; font-weight: bold;}
-.adminticketalt {color: #014c8a; font-weight: bold}
-
-/* Radio: Misc */
-.deadsay {color: #530FAD;}
-.angelsay {color: #ffaa00;}
-.deptradio {color: #ff00ff;} /* when all other department colors fail */
-.newscaster {color: #750000;}
-
-/* Radio Channels */
-.comradio {color: #193A7A;}
-.centradio {color: #5C5C8A;}
-
-.engradio {color: #A66300;}
-.medradio {color: #008160;}
-.supradio {color: #5F4519;}
-
-/* Game Messages */
-
-.moderate {color: #CC0000;}
-
-.alium {color: #00ff00;}
-.revolution {color: #B00030; font-weight: bold; font-style: italic;}
-.revolution_alert {color: #B00030; font-weight: bold; font-style: italic; font-size: 200%;}
-
-.reflex_shoot {color: #000099; font-style: italic;}
-
-/* Languages */
-
-.monkey {color: #22228B;}
-.rough {font-family: Trebuchet MS, cursive, sans-serif;}
-.say_quote {font-family: Georgia, Verdana, sans-serif;}
-.russian {color: #635d17}
-.serbian {color: #Ad6f1d}
-.jive {color: #666666}
-.german {color: #001FFF}
-.neohongo {color: #993399}
-.latin {color: #deb63d}
-
-.good {color: #4f8529; font-weight: bold;}
-.bad {color: #ee0000; font-weight: bold;}
-.neutral {color: #555555; font-weight: bold;}
-
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css
deleted file mode 100644
index 0e70faa4acd..00000000000
--- a/code/modules/goonchat/browserassets/css/browserOutput_white.css
+++ /dev/null
@@ -1,446 +0,0 @@
-/*****************************************
-*
-* GLOBAL STYLES for white theme normies
-*
-******************************************/
-html, body {
- padding: 0;
- margin: 0;
- height: 100%;
- color: #000000;
-}
-body {
- background: #fff;
- font-family: Verdana, sans-serif;
- font-size: 9pt;
- line-height: 1.2;
- overflow-x: hidden;
- overflow-y: scroll;
- word-wrap: break-word;
-}
-
-#examine {
- margin: 1px;
- border: 2px solid #f0f0f0;
- padding: 5px;
- background-color:#e5e5e5;
-}
-
-em {
- font-style: normal;
- font-weight: bold;
-}
-
-img {
- margin: 0;
- padding: 0;
- line-height: 1;
- -ms-interpolation-mode: nearest-neighbor;
- image-rendering: pixelated;
-}
-img.icon {
- height: 1em;
- min-height: 16px;
- width: auto;
- vertical-align: bottom;
-}
-
-
-.r:before { /* "repeated" badge class for combined messages */
- content: 'x';
-}
-.r {
- display: inline-block;
- min-width: 0.5em;
- font-size: 0.7em;
- padding: 0.2em 0.3em;
- line-height: 1;
- color: white;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- background-color: crimson;
- border-radius: 10px;
-}
-
-a {color: #0000ff;}
-a.visited {color: #ff00ff;}
-a:visited {color: #ff00ff;}
-a.popt {text-decoration: none;}
-
-/*****************************************
-*
-* OUTPUT NOT RELATED TO ACTUAL MESSAGES
-*
-******************************************/
-#loading {
- position: fixed;
- width: 300px;
- height: 150px;
- text-align: center;
- left: 50%;
- top: 50%;
- margin: -75px 0 0 -150px;
-}
-#loading i {display: block; padding-bottom: 3px;}
-
-#messages {
- font-size: 13px;
- padding: 3px;
- margin: 0;
- word-wrap: break-word;
-}
-#newMessages {
- position: fixed;
- display: block;
- bottom: 0;
- right: 0;
- padding: 8px;
- background: #ddd;
- text-decoration: none;
- font-variant: small-caps;
- font-size: 1.1em;
- font-weight: bold;
- color: #333;
-}
-#newMessages:hover {background: #ccc;}
-#newMessages i {vertical-align: middle; padding-left: 3px;}
-#ping {
- position: fixed;
- top: 0;
- right: 180px;
- width: 45px;
- background: #ddd;
- height: 30px;
- padding: 8px 0 2px 0;
-}
-#ping i {display: block; text-align: center;}
-#ping .ms {
- display: block;
- text-align: center;
- font-size: 8pt;
- padding-top: 2px;
-}
-#userBar {
- position: fixed;
- top: 0;
- right: 0;
-}
-#userBar .subCell {
- background: #ddd;
- height: 30px;
- padding: 5px 0;
- display: block;
- color: #333;
- text-decoration: none;
- line-height: 28px;
- border-top: 1px solid #b4b4b4;
-}
-#userBar .subCell:hover {background: #ccc;}
-#userBar .toggle {
- width: 45px;
- background: #ccc;
- border-top: 0;
- float: right;
- text-align: center;
-}
-#userBar .sub {clear: both; display: none; width: 180px;}
-#userBar .sub.scroll {overflow-y: scroll;}
-#userBar .sub.subCell {padding: 3px 0 3px 8px; line-height: 30px; font-size: 0.9em; clear: both;}
-#userBar .sub span {
- display: block;
- line-height: 30px;
- float: left;
-}
-#userBar .sub i {
- display: block;
- padding: 0 5px;
- font-size: 1.1em;
- width: 22px;
- text-align: center;
- line-height: 30px;
- float: right;
-}
-#userBar .sub input {
- position: absolute;
- padding: 7px 5px;
- width: 121px;
- line-height: 30px;
- float: left;
-}
-#userBar .topCell {border-top: 0;}
-
-/* POPUPS */
-.popup {
- position: fixed;
- top: 50%;
- left: 50%;
- background: #ddd;
-}
-.popup .close {
- position: absolute;
- background: #aaa;
- top: 0;
- right: 0;
- color: #333;
- text-decoration: none;
- z-index: 2;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
-}
-.popup .close:hover {background: #999;}
-.popup .head {
- background: #999;
- color: #ddd;
- padding: 0 10px;
- height: 30px;
- line-height: 30px;
- text-transform: uppercase;
- font-size: 0.9em;
- font-weight: bold;
- border-bottom: 2px solid green;
-}
-.popup input {border: 1px solid #999; background: #fff; margin: 0; padding: 5px; outline: none; color: #333;}
-.popup input[type=text]:hover, .popup input[type=text]:active, .popup input[type=text]:focus {border-color: green;}
-.popup input[type=submit] {padding: 5px 10px; background: #999; color: #ddd; text-transform: uppercase; font-size: 0.9em; font-weight: bold;}
-.popup input[type=submit]:hover, .popup input[type=submit]:focus, .popup input[type=submit]:active {background: #aaa; cursor: pointer;}
-
-.changeFont {padding: 10px;}
-.changeFont a {display: block; text-decoration: none; padding: 3px; color: #333;}
-.changeFont a:hover {background: #ccc;}
-
-.highlightPopup {padding: 10px; text-align: center;}
-.highlightPopup input[type=text] {display: block; width: 215px; text-align: left; margin-top: 5px;}
-.highlightPopup input.highlightColor {background-color: #FFFF00;}
-.highlightPopup input.highlightTermSubmit {margin-top: 5px;}
-
-/* ADMIN CONTEXT MENU */
-.contextMenu {
- background-color: #ddd;
- position: fixed;
- margin: 2px;
- width: 150px;
-}
-.contextMenu a {
- display: block;
- padding: 2px 5px;
- text-decoration: none;
- color: #333;
-}
-
-.contextMenu a:hover {
- background-color: #ccc;
-}
-
-/* ADMIN FILTER MESSAGES MENU */
-.filterMessages {padding: 5px;}
-.filterMessages div {padding: 2px 0;}
-.filterMessages input {}
-.filterMessages label {}
-
-.icon-stack {height: 1em; line-height: 1em; width: 1em; vertical-align: middle; margin-top: -2px;}
-
-
-/*****************************************
-*
-* OUTPUT ACTUALLY RELATED TO MESSAGES
-*
-******************************************/
-
-/* MOTD */
-.motd {color: #638500; font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #638500; text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #638500;}
-
-/* ADD HERE FOR BOLD */
-.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;}
-
-/* ADD HERE FOR ITALIC */
-.italic, .italics, .emote {font-style: italic;}
-
-/* OUTPUT COLORS */
-.highlight {background: yellow;}
-
-h1, h2, h3, h4, h5, h6 {color: #0000ff;font-family: Georgia, Verdana, sans-serif;}
-h1.alert, h2.alert {color: #000000;}
-
-em {font-style: normal; font-weight: bold;}
-
-.ooc .everyone {color: #002eb8;}
-.adminobserverooc {color: #0099cc; font-weight: bold;}
-.adminooc {color: #700038; font-weight: bold;}
-
-.adminsay {color: #ff4500; font-weight: bold;}
-.admin {color: #4473ff; font-weight: bold;}
-
-.name { font-weight: bold;}
-
-.say {}
-.deadsay {color: #5c00e6;}
-.binarysay {color: #20c20e; background-color: #000000; display: block;}
-.binarysay a {color: #00ff00;}
-.binarysay a:active, .binarysay a:visited {color: #88ff88;}
-.radio {color: #008000;}
-.sciradio {color: #993399;}
-.comradio {color: #948f02;}
-.secradio {color: #a30000;}
-.medradio {color: #337296;}
-.engradio {color: #fb5613;}
-.suppradio {color: #a8732b;}
-.servradio, .srvradio {color: #6eaa2c;}
-.syndradio {color: #6d3f40;}
-.centcomradio {color: #686868;}
-.aiprivradio, .airadio {color: #ff00ff;}
-.ntradio {color: #D4AF37;}
-.redteamradio {color: #ff0000;}
-.blueteamradio {color: #0000ff;}
-
-.yell { font-weight: bold;}
-
-.alert {color: #ff0000;}
-h1.alert, h2.alert {color: #000000;}
-
-.emote { font-style: italic;}
-.selecteddna {color: #ffffff; background-color: #001B1B}
-
-.attack {color: #ff0000;}
-.disarm {color: #990000;}
-.passive {color: #660000;}
-
-.userdanger {color: #ff0000; font-weight: bold; font-size: 24px;}
-.danger {color: #ff0000; font-weight: bold;}
-.warning {color: #ff0000; font-style: italic;}
-.alertwarning {color: #FF0000; font-weight: bold}
-.boldwarning {color: #ff0000; font-style: italic; font-weight: bold}
-.announce {color: #228b22; font-weight: bold;}
-.boldannounce {color: #ff0000; font-weight: bold;}
-.greenannounce {color: #00ff00; font-weight: bold;}
-.rose {color: #ff5050;}
-.info {color: #0000CC;}
-.notice {color: #000099;}
-.boldnotice {color: #000099; font-weight: bold;}
-.adminnotice {color: #0000ff;}
-.adminhelp {color: #ff0000; font-weight: bold;}
-.unconscious {color: #0000ff; font-weight: bold;}
-.suicide {color: #ff5050; font-style: italic;}
-.green {color: #03ff39;}
-.red {color: #FF0000}
-.blue {color: #0000FF}
-.nicegreen {color: #14a833;}
-.shadowling {color: #3b2769;}
-.cult {color: #960000;}
-
-.cultitalic {color: #960000; font-style: italic;}
-.cultbold {color: #960000; font-style: italic; font-weight: bold;}
-.cultboldtalic {color: #960000; font-weight: bold; font-size: 24px;}
-
-.cultlarge {color: #960000; font-weight: bold; font-size: 24px;}
-.narsie {color: #960000; font-weight: bold; font-size: 120px;}
-.narsiesmall {color: #960000; font-weight: bold; font-size: 48px;}
-.colossus {color: #7F282A; font-size: 40px;}
-.hierophant {color: #660099; font-weight: bold; font-style: italic;}
-.hierophant_warning {color: #660099; font-style: italic;}
-.purple {color: #5e2d79;}
-.holoparasite {color: #35333a;}
-
-.revennotice {color: #1d2953;}
-.revenboldnotice {color: #1d2953; font-weight: bold;}
-.revenbignotice {color: #1d2953; font-weight: bold; font-size: 24px;}
-.revenminor {color: #823abb}
-.revenwarning {color: #760fbb; font-style: italic;}
-.revendanger {color: #760fbb; font-weight: bold; font-size: 24px;}
-.umbra {color: #5000A0;}
-.umbra_emphasis {color: #5000A0; font-weight: bold; font-style: italic;}
-.umbra_large {color: #5000A0; font-size: 24px; font-weight: bold; font-style: italic;}
-
-.deconversion_message {color: #5000A0; font-size: 24px; font-style: italic;}
-
-.brass {color: #BE8700;}
-.heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;}
-.large_brass {color: #BE8700; font-size: 24px;}
-.big_brass {color: #BE8700; font-size: 24px; font-weight: bold; font-style: italic;}
-.ratvar {color: #BE8700; font-size: 48px; font-weight: bold; font-style: italic;}
-.alloy {color: #42474D;}
-.heavy_alloy {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_large {color: #42474D; font-size: 24px; font-weight: bold; font-style: italic;}
-.nezbere {color: #42474D; font-weight: bold; font-style: italic;}
-.nezbere_small {color: #42474D;}
-.sevtug_large {color: #AF0AAF; font-size: 24px; font-weight: bold; font-style: italic;}
-.sevtug {color: #AF0AAF; font-weight: bold; font-style: italic;}
-.sevtug_small {color: #AF0AAF;}
-.inathneq_large {color: #1E8CE1; font-size: 24px; font-weight: bold; font-style: italic;}
-.inathneq {color: #1E8CE1; font-weight: bold; font-style: italic;}
-.inathneq_small {color: #1E8CE1;}
-.nzcrentr_large {color: #DAAA18; font-size: 24px; font-weight: bold; font-style: italic;}
-.nzcrentr {color: #DAAA18; font-weight: bold; font-style: italic;}
-.nzcrentr_small {color: #DAAA18;}
-.neovgre_large {color: #6E001A; font-size: 24px; font-weight: bold; font-style: italic;}
-.neovgre {color: #6E001A; font-weight: bold; font-style: italic;}
-.neovgre_small {color: #6E001A;}
-
-.newscaster {color: #800000;}
-.ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;}
-
-.alien {color: #543354;}
-.noticealien {color: #00c000;}
-.alertalien {color: #00c000; font-weight: bold;}
-.assimilator {color: #800080; font-size: 16px ; font-weight: bold;}
-.bigassimilator {color: #800080; font-size: 32px ; font-weight: bold;}
-.alertsyndie {color: #FF0000; font-size: 24px ; font-weight: bold;}
-
-.spider {color: #4d004d; font-weight: bold; font-size: 24px;}
-
-.interface {color: #330033;}
-
-.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
-.papyrus {font-family: "Papyrus", cursive, sans-serif;}
-.robot {font-family: "Courier New", cursive, sans-serif;}
-
-.command_headset {font-weight: bold; font-size: 24px;}
-.small {font-size: 8px;}
-.big {font-size: 24px;}
-.reallybig {font-size: 32px;}
-.extremelybig {font-size: 40px;}
-.greentext {color: #00FF00; font-size: 24px;}
-.redtext {color: #FF0000; font-size: 24px;}
-.clown {color: #FF69Bf; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
-.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
-.hypnophrase {color: #0d0d0d; font-weight: bold; animation: hypnocolor 1500ms infinite;}
-@keyframes hypnocolor {
- 0% { color: #0d0d0d; }
- 25% { color: #410194; }
- 50% { color: #7f17d8; }
- 75% { color: #410194; }
- 100% { color: #3bb5d3; }
-}
-
-.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;}
-@keyframes phobia {
- 0% { color: #0d0d0d; }
- 50% { color: #dd0000; }
- 100% { color: #0d0d0d; }
-}
-
-.icon {height: 1em; width: auto;}
-
-.memo {color: #638500; text-align: center;}
-.memoedit {text-align: center; font-size: 16px;}
-.abductor {color: #800080; font-style: italic;}
-.mind_control {color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;}
-.slime {color: #00CED1;}
-.drone {color: #848482;}
-.monkey {color: #975032;}
-.swarmer {color: #2C75FF;}
-.resonate {color: #298F85;}
-
-.monkeyhive {color: #774704;}
-.monkeylead {color: #774704; font-size: 2;}
-
-.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
-.connectionClosed.restored {background: green;}
-.internal.boldnshit {color: blue; font-weight: bold;}
-
-/* HELPER CLASSES */
-.text-normal {font-weight: normal; font-style: normal;}
-.hidden {display: none; visibility: hidden;}
diff --git a/code/modules/goonchat/browserassets/html/browserOutput.html b/code/modules/goonchat/browserassets/html/browserOutput.html
deleted file mode 100644
index 305f0f60024..00000000000
--- a/code/modules/goonchat/browserassets/html/browserOutput.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- Chat
-
-
-
-
-
-
-
-
-
- '+$0+'';
- }
- else {
- return $1 ? $0: ''+$0+'';
- }
- });
-}
-
-function byondDecode(message) {
- // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8.
- // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
- // Marvelous.
- message = message.replace(/\+/g, "%20");
- try {
- // This is a workaround for the above not always working when BYOND's shitty url encoding breaks. (byond bug id:2399401)
- if (decodeURIComponent) {
- message = decodeURIComponent(message);
- } else {
- throw new Error("Easiest way to trigger the fallback")
- }
- } catch (err) {
- message = unescape(message);
- }
- return message;
-}
-
-function replaceRegex() {
- var selectedRegex = replaceRegexes[$(this).attr('replaceRegex')];
- if (selectedRegex) {
- var replacedText = $(this).html().replace(selectedRegex[0], selectedRegex[1]);
- $(this).html(replacedText);
- }
- $(this).removeAttr('replaceRegex');
-}
-
-// Get a highlight markup span
-function createHighlightMarkup() {
- var extra = '';
- if (opts.highlightColor) {
- extra += ' style="background-color: ' + opts.highlightColor + '"';
- }
- return '';
-}
-
-// Get all child text nodes that match a regex pattern
-function getTextNodes(elem, pattern) {
- var result = $([]);
- $(elem).contents().each(function(idx, child) {
- if (child.nodeType === 3 && /\S/.test(child.nodeValue) && pattern.test(child.nodeValue)) {
- result = result.add(child);
- }
- else {
- result = result.add(getTextNodes(child, pattern));
- }
- });
- return result;
-}
-
-// Highlight all text terms matching the registered regex patterns
-function highlightTerms(el) {
- var pattern = new RegExp("(" + opts.highlightTerms.join('|') + ")", 'gi');
- var nodes = getTextNodes(el, pattern);
-
- nodes.each(function (idx, node) {
- var content = $(node).text();
- var parent = $(node).parent();
- var pre = $(node.previousSibling);
- $(node).remove();
- content.split(pattern).forEach(function (chunk) {
- // Get our highlighted span/text node
- var toInsert = null;
- if (pattern.test(chunk)) {
- var tmpElem = $(createHighlightMarkup());
- tmpElem.text(chunk);
- toInsert = tmpElem;
- }
- else {
- toInsert = document.createTextNode(chunk);
- }
-
- // Insert back into our element
- if (pre.length == 0) {
- var result = parent.prepend(toInsert);
- pre = $(result[0].firstChild);
- }
- else {
- pre.after(toInsert);
- pre = $(pre[0].nextSibling);
- }
- });
- });
-}
-
-function iconError(E) {
- var that = this;
- setTimeout(function() {
- var attempts = $(that).data('reload_attempts');
- if (typeof attempts === 'undefined' || !attempts) {
- attempts = 1;
- }
- if (attempts > opts.imageRetryLimit)
- return;
- var src = that.src;
- that.src = null;
- that.src = src+'#'+attempts;
- $(that).data('reload_attempts', ++attempts);
- }, opts.imageRetryDelay);
-}
-
-//Send a message to the client
-function output(message, flag) {
- if (typeof message === 'undefined') {
- return;
- }
- if (typeof flag === 'undefined') {
- flag = '';
- }
-
- if (flag !== 'internal')
- opts.lastPang = Date.now();
-
- message = byondDecode(message).trim();
-
- //The behemoth of filter-code (for Admin message filters)
- //Note: This is proooobably hella inefficient
- var filteredOut = false;
- if (opts.hasOwnProperty('showMessagesFilters') && !opts.showMessagesFilters['All'].show) {
- //Get this filter type (defined by class on message)
- var messageHtml = $.parseHTML(message),
- messageClasses;
- if (opts.hasOwnProperty('filterHideAll') && opts.filterHideAll) {
- var internal = false;
- messageClasses = (!!$(messageHtml).attr('class') ? $(messageHtml).attr('class').split(/\s+/) : false);
- if (messageClasses) {
- for (var i = 0; i < messageClasses.length; i++) { //Every class
- if (messageClasses[i] == 'internal') {
- internal = true;
- break;
- }
- }
- }
- if (!internal) {
- filteredOut = 'All';
- }
- } else {
- //If the element or it's child have any classes
- if (!!$(messageHtml).attr('class') || !!$(messageHtml).children().attr('class')) {
- messageClasses = $(messageHtml).attr('class').split(/\s+/);
- if (!!$(messageHtml).children().attr('class')) {
- messageClasses = messageClasses.concat($(messageHtml).children().attr('class').split(/\s+/));
- }
- var tempCount = 0;
- for (var i = 0; i < messageClasses.length; i++) { //Every class
- var thisClass = messageClasses[i];
- $.each(opts.showMessagesFilters, function(key, val) { //Every filter
- if (key !== 'All' && val.show === false && typeof val.match != 'undefined') {
- for (var i = 0; i < val.match.length; i++) {
- var matchClass = val.match[i];
- if (matchClass == thisClass) {
- filteredOut = key;
- break;
- }
- }
- }
- if (filteredOut) return false;
- });
- if (filteredOut) break;
- tempCount++;
- }
- } else {
- if (!opts.showMessagesFilters['Misc'].show) {
- filteredOut = 'Misc';
- }
- }
- }
- }
-
- //Stuff we do along with appending a message
- var atBottom = false;
- if (!filteredOut) {
- var bodyHeight = $('body').height();
- var messagesHeight = $messages.outerHeight();
- var scrollPos = $('body,html').scrollTop();
-
- //Should we snap the output to the bottom?
- if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) {
- atBottom = true;
- if ($('#newMessages').length) {
- $('#newMessages').remove();
- }
- //If not, put the new messages box in
- } else {
- if ($('#newMessages').length) {
- var messages = $('#newMessages .number').text();
- messages = parseInt(messages);
- messages++;
- $('#newMessages .number').text(messages);
- if (messages == 2) {
- $('#newMessages .messageWord').append('s');
- }
- } else {
- $messages.after('1 new ');
- }
- }
- }
-
- opts.messageCount++;
-
- //Pop the top message off if history limit reached
- if (opts.messageCount >= opts.messageLimit) {
- $messages.children('div.entry:first-child').remove();
- opts.messageCount--; //I guess the count should only ever equal the limit
- }
-
- // Create the element - if combining is off, we use it, and if it's on, we
- // might discard it bug need to check its text content. Some messages vary
- // only in HTML markup, have the same text content, and should combine.
- var entry = document.createElement('div');
- entry.innerHTML = message;
- var trimmed_message = entry.textContent || entry.innerText || "";
-
- var handled = false;
- if (opts.messageCombining) {
- var index = $.inArray(trimmed_message, last_messages);
- if(index != -1) {
- var back_index = last_messages.length - index;
- var lastmessage = $messages.children('div.entry:nth-last-child(' + back_index + ')').last();
- if (lastmessage.length) {
- var badge = lastmessage.children('.r').last();
- if (badge.length) {
- badge = badge.detach();
- badge.text(parseInt(badge.text()) + 1);
- } else {
- badge = $('', {'class': 'r', 'text': 2});
- }
- lastmessage.html(message);
- lastmessage.find('[replaceRegex]').each(replaceRegex);
- lastmessage.append(badge);
- badge.animate({
- "font-size": "0.9em"
- }, 100, function() {
- badge.animate({
- "font-size": "0.7em"
- }, 100);
- });
- opts.messageCount--;
- if(back_index > 1) {
- $messages[0].appendChild(lastmessage[0]);
- last_messages.push(last_messages.splice(index, 1)[0]);
- }
- handled = true;
- }
- }
- }
-
- if (!handled) {
- //Actually append the message
- entry.className = 'entry';
-
- if (filteredOut) {
- entry.className += ' hidden';
- entry.setAttribute('data-filter', filteredOut);
- }
-
- $(entry).find('[replaceRegex]').each(replaceRegex);
-
- if(last_messages.push(trimmed_message) >= opts.messageCombiningCount) {
- last_messages.shift();
- }
- $messages[0].appendChild(entry);
- $(entry).find("img.icon").error(iconError);
-
- var to_linkify = $(entry).find(".linkify");
- if (typeof Node === 'undefined') {
- // Linkify fallback for old IE
- for(var i = 0; i < to_linkify.length; ++i) {
- to_linkify[i].innerHTML = linkify_fallback(to_linkify[i].innerHTML);
- }
- } else {
- // Linkify for modern IE versions
- for(var i = 0; i < to_linkify.length; ++i) {
- linkify_node(to_linkify[i]);
- }
- }
-
- //Actually do the snap
- //Stuff we can do after the message shows can go here, in the interests of responsiveness
- if (opts.highlightTerms && opts.highlightTerms.length > 0) {
- highlightTerms($(entry));
- }
- }
-
- if (!filteredOut && atBottom) {
- $('body,html').scrollTop($messages.outerHeight());
- }
-}
-
-function internalOutput(message, flag)
-{
- output(escaper(message), flag)
-}
-
-//Runs a route within byond, client or server side. Consider this "ehjax" for byond.
-function runByond(uri) {
- window.location = uri;
-}
-
-function setCookie(cname, cvalue, exdays) {
- cvalue = escaper(cvalue);
- var d = new Date();
- d.setTime(d.getTime() + (exdays*24*60*60*1000));
- var expires = 'expires='+d.toUTCString();
- document.cookie = cname + '=' + cvalue + '; ' + expires + "; path=/";
-}
-
-function getCookie(cname) {
- var name = cname + '=';
- var ca = document.cookie.split(';');
- for(var i=0; i < ca.length; i++) {
- var c = ca[i];
- while (c.charAt(0)==' ') c = c.substring(1);
- if (c.indexOf(name) === 0) {
- return decoder(c.substring(name.length,c.length));
- }
- }
- return '';
-}
-
-function rgbToHex(R,G,B) {return toHex(R)+toHex(G)+toHex(B);}
-function toHex(n) {
- n = parseInt(n,10);
- if (isNaN(n)) return "00";
- n = Math.max(0,Math.min(n,255));
- return "0123456789ABCDEF".charAt((n-n%16)/16) + "0123456789ABCDEF".charAt(n%16);
-}
-
-function swap() { //Swap to darkmode
- if (opts.darkmode){
- document.getElementById("sheetofstyles").href = "browserOutput_white.css";
- opts.darkmode = false;
- runByond('?_src_=chat&proc=swaptolightmode');
- } else {
- document.getElementById("sheetofstyles").href = "browserOutput.css";
- opts.darkmode = true;
- runByond('?_src_=chat&proc=swaptodarkmode');
- }
- setCookie('darkmode', (opts.darkmode ? 'true' : 'false'), 365);
-}
-
-function fullscreen_check() {
- if (opts.fullscreen){
- opts.fullscreen = false;
- runByond('?_src_=chat&proc=disable_fullscreen');
- } else {
- opts.fullscreen = true;
- runByond('?_src_=chat&proc=enable_fullscreen');
- }
- setCookie('fullscreen', (opts.fullscreen ? 'true' : 'false'), 365);
-}
-
-function handleClientData(ckey, ip, compid) {
- //byond sends player info to here
- var currentData = {'ckey': ckey, 'ip': ip, 'compid': compid};
- if (opts.clientData && !$.isEmptyObject(opts.clientData)) {
- runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]='+JSON.stringify({'connData': opts.clientData}));
-
- for (var i = 0; i < opts.clientData.length; i++) {
- var saved = opts.clientData[i];
- if (currentData.ckey == saved.ckey && currentData.ip == saved.ip && currentData.compid == saved.compid) {
- return; //Record already exists
- }
- }
-
- if (opts.clientData.length >= opts.clientDataLimit) {
- opts.clientData.shift();
- }
- } else {
- runByond('?_src_=chat&proc=analyzeClientData¶m[cookie]=none');
- }
-
- //Update the cookie with current details
- opts.clientData.push(currentData);
- setCookie('connData', JSON.stringify(opts.clientData), 365);
-}
-
-//Server calls this on ehjax response
-//Or, y'know, whenever really
-function ehjaxCallback(data) {
- opts.lastPang = Date.now();
- if (data == 'softPang') {
- return;
- } else if (data == 'pang') {
- opts.pingCounter = 0; //reset
- opts.pingTime = Date.now();
- runByond('?_src_=chat&proc=ping');
-
- } else if (data == 'pong') {
- if (opts.pingDisabled) {return;}
- opts.pongTime = Date.now();
- var pingDuration = Math.ceil((opts.pongTime - opts.pingTime) / 2);
- $('#pingMs').text(pingDuration+'ms');
- pingDuration = Math.min(pingDuration, 255);
- var red = pingDuration;
- var green = 255 - pingDuration;
- var blue = 0;
- var hex = rgbToHex(red, green, blue);
- $('#pingDot').css('color', '#'+hex);
-
- } else if (data == 'roundrestart') {
- opts.restarting = true;
- internalOutput('
ERROR: Jquery did not load.'; -} - -$(function() { - $messages = $('#messages'); - $subOptions = $('#subOptions'); - $subAudio = $('#subAudio'); - $selectedSub = $subOptions; - - //Hey look it's a controller loop! - setInterval(function() { - if (opts.lastPang + opts.pangLimit < Date.now() && !opts.restarting) { //Every pingLimit - if (!opts.noResponse) { //Only actually append a message if the previous ping didn't also fail (to prevent spam) - opts.noResponse = true; - opts.noResponseCount++; - internalOutput('Chat Log ', $messages.html(), '']);
-
- var fname = 'SS13 Chat Log';
- var date = new Date(), month = date.getMonth(), day = date.getDay(), hours = date.getHours(), mins = date.getMinutes(), secs = date.getSeconds();
- fname += ' ' + date.getFullYear() + '-' + (month < 10 ? '0' : '') + month + '-' + (day < 10 ? '0' : '') + day;
- fname += ' ' + (hours < 10 ? '0' : '') + hours + (mins < 10 ? '0' : '') + mins + (secs < 10 ? '0' : '') + secs;
- fname += '.html';
-
- window.navigator.msSaveBlob(blob, fname);
- }
- });
- });
-
- $('#highlightTerm').click(function(e) {
- if ($('.popup .highlightTerm').is(':visible')) {return;}
- var termInputs = '';
- for (var i = 0; i < opts.highlightLimit; i++) {
- termInputs += '';
- }
- var popupContent = '= 2)
msg += "[span_deptradio("Damage Specifics:")] [round(src.getOxyLoss(), 1)]-[round(src.getToxLoss(), 1)]-[round(src.getFireLoss(), 1)]-[round(src.getBruteLoss(), 1)]\n"
- if(print_flavor_text()) msg += "[print_flavor_text()]\n"
+ var/flavor_text = get_flavor_text()
+ if(flavor_text) msg += "[flavor_text]"
- msg += "*---------* "
if (pose)
+ msg += "\n"
if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 )
pose = addtext(pose,".") //Makes sure all emotes end with a period.
msg += "\n[T.He] [T.is] [pose]"
if(isobserver(user))
- to_chat(user, msg)
+ to_chat(user, boxed_message("[span_infoplain(msg)]"))
else
- user.visible_message("[user.name] looks at [src].", msg)
+ user.visible_message("[user.name] looks at [src].", boxed_message("[span_infoplain(msg)]"))
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M as mob, hudtype)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 652fcba00c5..f2e0193cf2c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -440,7 +440,7 @@ var/list/rank_prefix = list(\
U.handle_regular_hud_updates()
if(!modified)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecord"])
if(hasHUD(usr,"security"))
@@ -468,7 +468,7 @@ var/list/rank_prefix = list(\
read = 1
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecordComment"])
if(hasHUD(usr,"security"))
@@ -496,7 +496,7 @@ var/list/rank_prefix = list(\
to_chat(usr, "\[Add comment\]")
if(!read)
- to_chat(usr, "\red Unable to locate a data core entry for this person.")
+ to_chat(usr, span_red("Unable to locate a data core entry for this person."))
if(href_list["secrecordadd"])
if(hasHUD(usr,"security"))
@@ -524,10 +524,10 @@ var/list/rank_prefix = list(\
counter++
if(ishuman(usr))
var/mob/living/carbon/human/U = usr
- R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(href_list["medical"]) if(hasHUD(usr,"medical")) @@ -563,7 +563,7 @@ var/list/rank_prefix = list(\ U.handle_regular_hud_updates() if(!modified) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecord"]) if(hasHUD(usr,"medical")) @@ -596,7 +596,7 @@ var/list/rank_prefix = list(\ read = 1 if(!read) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecordComment"]) if(hasHUD(usr,"medical")) @@ -628,7 +628,7 @@ var/list/rank_prefix = list(\ to_chat(usr, "\[Add comment\]") if(!read) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecordadd"]) if(hasHUD(usr,"medical")) @@ -656,10 +656,10 @@ var/list/rank_prefix = list(\ counter++ if(ishuman(usr)) var/mob/living/carbon/human/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(href_list["lookitem"]) var/obj/item/I = locate(href_list["lookitem"]) @@ -736,7 +736,11 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) - visible_message("\red \The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.") + visible_message( + span_red("\The [src] begins playing \his ribcage like a xylophone. It's quite spooky."), + span_blue("You begin to play a spooky refrain on your ribcage."), + span_red("You hear a spooky xylophone melody.") + ) var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') playsound(loc, song, 50, 1, -1) xylophone = 1 @@ -928,7 +932,7 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/set_species(new_species, default_colour) // No more invisible screaming wheelchairs because of set_species() typos. - if(!all_species[new_species]) + if(!GLOB.all_species[new_species]) new_species = SPECIES_HUMAN if(species) @@ -943,7 +947,7 @@ var/list/rank_prefix = list(\ species.remove_inherent_verbs(src) holder_type = null - species = all_species[new_species] + species = GLOB.all_species[new_species] if(species.language) add_language(species.language) @@ -1211,7 +1215,7 @@ var/list/rank_prefix = list(\ fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." to_chat(user, span_warning(fail_msg)) -/mob/living/carbon/human/print_flavor_text(shrink = 1) +/mob/living/carbon/human/get_flavor_text(shrink = 1) var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) for(var/obj/item/clothing/C in equipment) @@ -1302,8 +1306,8 @@ var/list/rank_prefix = list(\ var/obj/item/clothing/under/U = w_uniform if(U.accessories.len) for(var/obj/item/clothing/accessory/holster/H in U.accessories) - if(get_active_hand())//do we hold something? - H.attackby(get_active_hand(), src) + if(get_active_held_item())//do we hold something? + H.attackby(get_active_held_item(), src) else H.attack_hand(src) holster_found = TRUE @@ -1376,8 +1380,11 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/check_self_for_injuries() if(stat) return + visible_message(span_notice("You examine yourself."), span_notice("[src] examines themself.")) - to_chat(src, span_notice("You check yourself for injuries.")) + var/list/combined_msg = list() + + combined_msg += span_boldnotice("I check myself for injuries.") for(var/obj/item/organ/external/org in organs) var/list/status = list() @@ -1421,7 +1428,25 @@ var/list/rank_prefix = list(\ if(status.len) status_text = span_warning(english_list(status)) - src.show_message("My [org.name] is [status_text].",1) + combined_msg += "My [org.name] is [status_text]." + + combined_msg += "\n" + + switch(nutrition) + if(NUTRITION_LEVEL_FULL to INFINITY) + combined_msg += span_info("I'm completely stuffed!") + if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL) + combined_msg += span_info("I'm well fed!") + if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) + combined_msg += span_info("I'm not hungry.") + if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED) + combined_msg += span_info("I could use a bite to eat.") + if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY) + combined_msg += span_info("I feel quite hungry.") + if(0 to NUTRITION_LEVEL_STARVING) + combined_msg += span_danger("I'm starving!") + + to_chat(src, boxed_message(combined_msg.Join("\n"))) /mob/living/carbon/human/need_breathe() // if(!(mNobreath in mutations)) @@ -1458,7 +1483,7 @@ var/list/rank_prefix = list(\ if(oxyLoss > 20) setOxyLoss(20) - if(getBruteLoss() + getFireLoss() >= abs(HEALTH_THRESHOLD_DEAD)) + if(getBruteLoss() + getFireLoss() >= abs(CONFIG_GET(number/health_threshold_dead))) resuscitate_notify(5) timeofdeath = 0 return 0 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index f87c28d1c89..fa7ad227366 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -16,7 +16,7 @@ if(H.hand) temp = H.organs_by_name[BP_L_ARM] if(!temp || !temp.is_usable()) - to_chat(H, "\red You can't use your hand.") + to_chat(H, span_red("You can't use your hand.")) return H.stop_blocking() @@ -33,7 +33,7 @@ var/damage = rand(0, 9) if(!damage) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [H] has attempted to punch [src]!") + visible_message(span_red("[H] has attempted to punch [src]!")) return 0 var/obj/item/organ/external/affecting = get_organ(ran_zone(H.targeted_organ)) @@ -42,11 +42,11 @@ playsound(loc, "punch", 25, 1, -1) - visible_message("\red [H] has punched [src]!") + visible_message(span_red("[H] has punched [src]!")) damage_through_armor(damage, HALLOSS, affecting, ARMOR_MELEE) if(damage >= 9) - visible_message("\red [H] has weakened [src]!") + visible_message(span_red("[H] has weakened [src]!")) apply_effect(4, WEAKEN, getarmor(affecting, ARMOR_MELEE)) return @@ -55,7 +55,7 @@ if(I_HELP) if(can_operate(src, M) == CAN_OPERATE_ALL && do_surgery(src, M, null, TRUE)) return 1 - else if(istype(H) && health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD) + else if(istype(H) && health < CONFIG_GET(number/health_threshold_crit) && health > CONFIG_GET(number/health_threshold_dead)) if(H == src) to_chat(H, span_notice("You can't perform CPR on yourself.")) return @@ -215,8 +215,8 @@ //Try to reduce damage by blocking if(blocking) - if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. - var/obj/item/grab/G = get_active_hand() + if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. + var/obj/item/grab/G = get_active_held_item() grab_redirect_attack(M, G) return else @@ -247,7 +247,7 @@ if(w_uniform) w_uniform.add_fingerprint(M) - var/list/holding = list(get_active_hand() = 40, get_inactive_hand = 20) + var/list/holding = list(get_active_held_item() = 40, get_inactive_held_item = 20) //See if they have any guns that might go off for(var/obj/item/gun/W in holding) @@ -277,7 +277,7 @@ visible_message(span_warning("[M] attempted to disarm [src]")) return if(istype(I, /obj/item/twohanded/offhand)) //did someone dare to switch to offhand to not get disarmed? - unEquip(src.get_inactive_hand()) + unEquip(src.get_inactive_held_item()) visible_message(span_danger("[M] has disarmed [src]!")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index bddcb92592d..e9dff6ebfcf 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -304,7 +304,6 @@ This function restores all organs. return 0 return - /mob/living/carbon/human/proc/get_organ(zone) RETURN_TYPE(/obj/item/organ/external) if(!zone) @@ -313,6 +312,14 @@ This function restores all organs. zone = BP_HEAD return organs_by_name[zone] +/mob/living/carbon/human/proc/get_hand_organs() + RETURN_TYPE(/obj/item/organ/external) + + return list( + organs_by_name[BP_R_ARM], + organs_by_name[BP_L_ARM], + ) + /mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone, armor_divisor = 1, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, obj/used_weapon, armor_divisor) //visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]") diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 992cbba89a1..c5d9cce7b0e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -212,8 +212,8 @@ meteor_act var/item_size_affect = 0 //the bigger the thing you hold is, the more damage you can block var/toughness = max(1, stats.getStat(STAT_TGH)) //passive blocking with shields is handled differently(code is above this proc) - if(get_active_hand())//are we blocking with an item? - var/obj/item/I = get_active_hand() + if(get_active_held_item())//are we blocking with an item? + var/obj/item/I = get_active_held_item() if(istype(I)) item_size_affect = I.w_class * 5 stat_affect = 0.2 @@ -281,8 +281,8 @@ meteor_act return FALSE if(blocking) - if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. - var/obj/item/grab/G = get_active_hand() + if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. + var/obj/item/grab/G = get_active_held_item() grab_redirect_attack(G, I) return FALSE else @@ -379,7 +379,7 @@ meteor_act visible_message(span_warning("[src] is winded!"), span_danger("You feel disoriented!")) confused = max(confused, 2) external_recoil(40) - var/obj/item/item_in_active_hand = get_active_hand() + var/obj/item/item_in_active_hand = get_active_held_item() if(recoil >= 60 && item_in_active_hand) if(istype(item_in_active_hand, /obj/item/grab)) break_all_grabs(user) //See about breaking grips or pulls @@ -409,7 +409,7 @@ meteor_act if(istype(AM,/obj/)) var/obj/O = AM - if(in_throw_mode && !get_active_hand() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode + if(in_throw_mode && !get_active_held_item() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode if(canmove && !restrained()) if(isturf(O.loc)) put_in_active_hand(O) @@ -447,7 +447,7 @@ meteor_act if (O.is_hot() >= HEAT_MOBIGNITE_THRESHOLD) IgniteMob() - src.visible_message("\red [src] has been hit in the [hit_area] by [O].") + src.visible_message(span_red("[src] has been hit in the [hit_area] by [O].")) damage_through_armor(throw_damage, dtype, null, ARMOR_MELEE, null, used_weapon = O, sharp = is_sharp(O), edge = has_edge(O)) @@ -458,7 +458,7 @@ meteor_act src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") if(!ismouse(src)) - msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]") //thrown weapon embedded object code. if(istype(O,/obj/item)) @@ -486,7 +486,7 @@ meteor_act if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") + visible_message(span_red("[src] staggers under the impact!"), span_red("You stagger under the impact!")) src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return diff --git a/code/modules/mob/living/carbon/human/human_hud.dm b/code/modules/mob/living/carbon/human/human_hud.dm index e7d5cb063e4..fd173631ba3 100644 --- a/code/modules/mob/living/carbon/human/human_hud.dm +++ b/code/modules/mob/living/carbon/human/human_hud.dm @@ -103,7 +103,7 @@ var/slotID = get_inventory_slot(I) I.screen_loc = find_inv_position(slotID) - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(I) I.update_hud_actions() /* update_inv_w_uniform(0) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 89dbe288ca9..a3a876d05aa 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -26,8 +26,8 @@ tally += 1 if(recoil) - var/obj/item/gun/GA = get_active_hand() - var/obj/item/gun/GI = get_inactive_hand() + var/obj/item/gun/GA = get_active_held_item() + var/obj/item/gun/GI = get_inactive_held_item() var/brace_recoil = 0 if(istype(GA)) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index c39592a7f57..3df095ecbcc 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -45,9 +45,9 @@ if(failed) src.Weaken(rand(2,4)) - for(var/mob/O in viewers(src, null)) + for(var/mob/O in viewers(get_turf(src))) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) + O.show_message(span_red(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T)), 1) /mob/living/carbon/human/proc/leap(mob/living/carbon/human/T) if(last_special > world.time) @@ -87,16 +87,16 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "\red You cannot do that in your current state.") + to_chat(src, span_red("You cannot do that in your current state.")) return var/obj/item/grab/G = locate() in src if(!G || !istype(G)) - to_chat(src, "\red You are not grabbing anyone.") + to_chat(src, span_red("You are not grabbing anyone.")) return if(G.state < GRAB_AGGRESSIVE) - to_chat(src, "\red You must have an aggressive grab to gut your prey!") + to_chat(src, span_red("You must have an aggressive grab to gut your prey!")) return last_special = world.time + 50 @@ -143,7 +143,7 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text]") - to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) @@ -163,7 +163,7 @@ if(M in stomach_contents) stomach_contents.Remove(M) M.loc = loc - src.visible_message("\red [src] hurls out the contents of their stomach!") + src.visible_message(span_red("[src] hurls out the contents of their stomach!")) return /mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview()) @@ -174,8 +174,8 @@ var/msg = sanitize(input("Message:", "Psychic Whisper") as text|null) if(msg) log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]") - to_chat(M, "\green You hear a strange, alien voice in your head... \italic [msg]") - to_chat(src, "\green You said: \"[msg]\" to [M]") + to_chat(M, span_green("You hear a strange, alien voice in your head... \italic [msg]")) + to_chat(src, span_green("You said: \"[msg]\" to [M]")) return @@ -249,7 +249,11 @@ gender = FEMALE regenerate_icons() - visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + visible_message( + span_blue("\The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!"), + span_blue("You change your appearance!"), + span_red("Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + ) /mob/living/carbon/human/proc/phaze_trough() set name = "Phaze" @@ -344,10 +348,10 @@ var/say = sanitize(input("What do you wish to say")) if(get_active_mutation(target, MUTATION_REMOTESAY)) - target.show_message("\blue You hear [real_name]'s voice: [say]") + target.show_message(span_blue("You hear [real_name]'s voice: [say]")) else - target.show_message("\blue You hear a voice that seems to echo around the room: [say]") - show_message("\blue You project your mind into [target.real_name]: [say]") + target.show_message(span_blue("You hear a voice that seems to echo around the room: [say]")) + show_message(span_blue("You project your mind into [target.real_name]: [say]")) log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]") for(var/mob/observer/ghost/G in world) G.show_message("Telepathic message from [src] to [target]: [say]") diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index afc258eccd2..01f17640f1f 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -7,7 +7,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "quick-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(!I) to_chat(src, span_notice("You are not holding anything to equip.")) return @@ -33,7 +33,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "belt-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(!I) to_chat(src, span_notice("You are not holding anything to equip.")) return @@ -43,7 +43,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "suit-storage-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(I) if(src.s_store) to_chat(src, span_notice("You have no room to equip or draw.")) @@ -68,7 +68,7 @@ This saves us from having to call add_fingerprint() any time something is put in var/obj/item/storage/S - for(var/i in list(get_inactive_hand(), back, get_active_hand())) + for(var/i in list(get_inactive_held_item(), back, get_active_held_item())) if(istype(i, /obj/item/storage)) S = i break @@ -80,7 +80,7 @@ This saves us from having to call add_fingerprint() any time something is put in break if(S && (!istype(S, /obj/item/storage/backpack) || S:worn_check())) - equip_to_from_bag(get_active_hand(), S) + equip_to_from_bag(get_active_held_item(), S) //Puts the item into our active hand if possible. returns 1 on success. @@ -240,7 +240,7 @@ This saves us from having to call add_fingerprint() any time something is put in update_action_buttons() return 1 -/mob/living/carbon/human/proc/get_active_hand_organ() +/mob/living/carbon/human/proc/get_active_held_item_organ() if(hand) return get_organ(BP_L_ARM) else @@ -257,7 +257,7 @@ This saves us from having to call add_fingerprint() any time something is put in SEND_SIGNAL_OLD(src, COMSING_HUMAN_EQUITP, W) switch(slot) if(slot_in_backpack) - if(src.get_active_hand() == W) + if(src.get_active_held_item() == W) src.remove_from_mob(W) W.forceMove(src.back) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f3de8e1a4bc..f2265e87ea2 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -200,7 +200,7 @@ to_chat(src, span_warning("It becomes hard to see for some reason.")) eye_blurry = 10 if(getBrainLoss() >= 35) - if(7 <= rn && rn <= 9) if(get_active_hand()) + if(7 <= rn && rn <= 9) if(get_active_held_item()) to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!")) drop_item() if(getBrainLoss() >= 45) @@ -329,7 +329,7 @@ failed_last_breath = 1 if(prob(20)) emote("gasp") - if(health > HEALTH_THRESHOLD_CRIT) + if(health > CONFIG_GET(number/health_threshold_crit)) adjustOxyLoss(HUMAN_MAX_OXYLOSS) else adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) @@ -791,7 +791,7 @@ blinded = TRUE silent = 0 return 1 - if(health <= HEALTH_THRESHOLD_DEAD) //No health = death + if(health <= CONFIG_GET(number/health_threshold_dead)) //No health = death if(stats.getPerk(PERK_UNFINISHED_DELIVERY) && prob(33)) //Unless you have this perk heal_organ_damage(20, 20) adjustOxyLoss(-100) @@ -968,7 +968,7 @@ var/external_health = (1 - (limb_health ? limb_damage / limb_health : 0)) * 100 var/internal_health = (1 - (organ_health ? organ_damage / organ_health : 0)) * 100 - var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-HEALTH_THRESHOLD_CRIT)/(maxHealth-HEALTH_THRESHOLD_CRIT)*100) + var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(maxHealth-CONFIG_GET(number/health_threshold_crit))*100) holder.icon_state = "hud[percentage_health]" hud_list[HEALTH_HUD] = holder diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 1b97f088687..281fedf99c9 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -219,9 +219,9 @@ else return capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name(gender) @@ -233,9 +233,9 @@ else return capitalize(pick(GLOB.first_names_male)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name(gender) @@ -244,9 +244,9 @@ if(!name_language) return capitalize(pick(GLOB.last_names)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name() @@ -346,7 +346,7 @@ if(H.equipment_tint_total >= TINT_BLIND) H.eye_blind = max(H.eye_blind, 1) - if(config.welder_vision) + if(CONFIG_GET(flag/welder_vision)) if(H.equipment_tint_total == TINT_HEAVY) H.client.screen |= global_hud.darkMask else if((!H.equipment_prescription && (H.sdisabilities & NEARSIGHTED)) || H.equipment_tint_total == TINT_MODERATE) diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 0ee70610054..5b17016c3d3 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -55,7 +55,7 @@ // Are we placing or stripping? var/stripping - var/obj/item/held = user.get_active_hand() + var/obj/item/held = user.get_active_held_item() if(!istype(held) || is_robot_module(held)) if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here? return @@ -78,7 +78,7 @@ if(!do_mob(user,src,HUMAN_STRIP_DELAY,progress = 1)) return - if(!stripping && user.get_active_hand() != held) + if(!stripping && user.get_active_held_item() != held) return if(stripping) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 97f71f20298..166077f56ae 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -6,7 +6,7 @@ var/alt_name = "" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return message = sanitize(message) @@ -14,7 +14,7 @@ if (src.client) if (src.client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot whisper (muted).") + to_chat(src, span_red("You cannot whisper (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) @@ -112,7 +112,7 @@ message = replacetext(message, "u", "�") message = replacetext(message, "b", "�") - var/list/listening = hearers(message_range, src) + var/list/listening = hearers(message_range, get_turf(src)) listening |= src //ghosts @@ -134,11 +134,11 @@ if (O) O.hear_talk(src, message, verb, speaking, 1) - var/list/eavesdropping = hearers(eavesdropping_range, src) + var/list/eavesdropping = hearers(eavesdropping_range, get_turf(src)) eavesdropping -= src eavesdropping -= listening - var/list/watching = hearers(watching_range, src) + var/list/watching = hearers(watching_range, get_turf(src)) watching -= src watching -= listening watching -= eavesdropping diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index 1cfd98ba454..27d34a1d529 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -16,7 +16,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot send IC messages (muted).") + to_chat(src, span_red("You cannot send IC messages (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -88,9 +88,9 @@ to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate. You can also set your face with: \n\nnomood, pout, sad, angry, frown, smile") else - to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list.")) if ((message && src.stat == 0)) send_emote(message, m_type) if(updateicon) regenerate_icons() - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/superior_animal/ai.dm b/code/modules/mob/living/carbon/superior_animal/ai.dm index 6a171210ae2..99089e75d91 100644 --- a/code/modules/mob/living/carbon/superior_animal/ai.dm +++ b/code/modules/mob/living/carbon/superior_animal/ai.dm @@ -71,7 +71,7 @@ /mob/living/carbon/superior_animal/proc/isValidAttackTarget(var/atom/O) if (isliving(O)) var/mob/living/L = O - if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends)) + if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends)) return return 1 diff --git a/code/modules/mob/living/carbon/superior_animal/defense.dm b/code/modules/mob/living/carbon/superior_animal/defense.dm index 2de9a6fb1cd..7e64f9196be 100644 --- a/code/modules/mob/living/carbon/superior_animal/defense.dm +++ b/code/modules/mob/living/carbon/superior_animal/defense.dm @@ -72,13 +72,13 @@ if (I_DISARM) if (!weakened && prob(30)) - M.visible_message("\red [M] has shoved \the [src]") + M.visible_message(span_red("[M] has shoved \the [src]")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) Weaken(3) return 1 else - M.visible_message("\red [M] failed to shove \the [src]") + M.visible_message(span_red("[M] failed to shove \the [src]")) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) M.do_attack_animation(src) @@ -87,7 +87,7 @@ var/damage = 3 if ((stat == CONSCIOUS) && prob(10)) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - M.visible_message("\red [M] missed \the [src]") + M.visible_message(span_red("[M] missed \the [src]")) else if (istype(H)) damage += max(0, (H.stats.getStat(STAT_ROB) / 10)) @@ -95,7 +95,7 @@ // damage *= 2 playsound(loc, "punch", 25, 1, -1) - M.visible_message("\red [M] has punched \the [src]") + M.visible_message(span_red("[M] has punched \the [src]")) adjustBruteLoss(damage) updatehealth() diff --git a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm index 0f0121ee196..9ae55391a75 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm @@ -5,7 +5,7 @@ if(ishuman(L)) H = L if(H) - var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_hand() + var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_held_item() if(istype(howdoitameahorseinminecraft)) if(try_tame(H, howdoitameahorseinminecraft)) return FALSE //If they manage to tame the roach, stop the attack diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 26dea366e43..ab1bb501764 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -30,6 +30,6 @@ if (istype(langname, /datum/language)) L = langname else - L = all_languages[langname] + L = GLOB.all_languages[langname] languages |= L default_language = L diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index dcb7213b3cd..8595d05da94 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -4,7 +4,7 @@ . = FALSE ..() - if(config.enable_mob_sleep) + if(CONFIG_GET(flag/enable_mob_sleep)) if(stat != DEAD && !mind) // Check for mind so player-driven, nonhuman mobs don't sleep if(life_cycles_before_scan > 0) life_cycles_before_scan-- diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f42a6e04a90..7c417797fb8 100755 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -170,7 +170,7 @@ default behaviour is: if (health < 0) adjustOxyLoss(health + maxHealth * 2) // Deal 2x health in OxyLoss damage, as before but variable. health = -maxHealth - to_chat(src, "\blue You have given up life and succumbed to death.") + to_chat(src, span_blue("You have given up life and succumbed to death.")) /mob/living/proc/updatehealth() @@ -561,7 +561,7 @@ default behaviour is: var/obj/item/grab/G = pick(M.grabbed_by) if (istype(G, /obj/item/grab)) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1) + O.show_message(span_red(text("[] has been pulled from []'s grip by []", G.affecting, G.assailant, src)), 1) //G = null qdel(G) else @@ -834,7 +834,7 @@ default behaviour is: if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.pull_damage()) - to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.") + to_chat(src, span_red("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)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index fe497a0c620..338dd293485 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -175,7 +175,7 @@ if (P.is_hot() >= HEAT_MOBIGNITE_THRESHOLD) IgniteMob() - if(config.z_level_shooting && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency + if(CONFIG_GET(flag/z_level_shooting) && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency if(resting || lying) return PROJECTILE_CONTINUE // Bullet flies overhead @@ -186,8 +186,8 @@ def_zone_hit = pick(list(BP_CHEST, BP_GROIN, BP_L_LEG, BP_R_LEG)) //Being hit while using a deadman switch - if(istype(get_active_hand(),/obj/item/device/assembly/signaler)) - var/obj/item/device/assembly/signaler/signaler = get_active_hand() + if(istype(get_active_held_item(),/obj/item/device/assembly/signaler)) + var/obj/item/device/assembly/signaler/signaler = get_active_held_item() if(signaler.deadman && prob(80)) log_and_message_admins("has triggered a signaler deadman's switch") src.visible_message(span_warning("[src] triggers their deadman's switch!")) @@ -297,7 +297,7 @@ src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") if(!ismouse(src)) - msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]") // Begin BS12 momentum-transfer code. var/mass = 1.5 diff --git a/code/modules/mob/living/living_recoil.dm b/code/modules/mob/living/living_recoil.dm index 83b51a9a62c..de88f39be74 100644 --- a/code/modules/mob/living/living_recoil.dm +++ b/code/modules/mob/living/living_recoil.dm @@ -34,7 +34,7 @@ //Called after setting recoil /mob/living/proc/update_recoil() - var/obj/item/gun/G = get_active_hand() + var/obj/item/gun/G = get_active_held_item() if(istype(G) && G) G.check_safety_cursor(src) @@ -48,7 +48,7 @@ return /mob/living/update_cursor() - var/obj/item/gun/G = get_active_hand() + var/obj/item/gun/G = get_active_held_item() if(get_preference_value(/datum/client_preference/gun_cursor) != GLOB.PREF_YES || (!istype(G, /obj/item/gun) || G.safety)) remove_cursor() return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 7c4d631f728..616900c67ce 100755 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -137,7 +137,7 @@ var/list/channel_to_radio_key = new /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="") if(client) if(client.prefs.muted&MUTE_IC) - to_chat(src, "\red You cannot speak in IC (Muted).") + to_chat(src, span_red("You cannot speak in IC (Muted).")) return if(stat) @@ -298,7 +298,7 @@ var/list/channel_to_radio_key = new INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(animate_speechbubble), speech_bubble, speech_bubble_recipients, 30) INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), message, speaking, italics, speech_bubble_recipients, 40, verb) - if(config.tts_enabled && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src))) + if(CONFIG_GET(flag/tts_enabled) && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src))) //TO DO: Remove need for that damn copypasta var/seed = tts_seed if(istype(back, /obj/item/rig)) @@ -339,7 +339,7 @@ var/list/channel_to_radio_key = new /mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language) - for (var/mob/O in viewers(src, null)) + for (var/mob/O in viewers(get_turf(src))) O.hear_signlang(message, verb, language, src) return 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 46f683d1b0d..32f4cb2327a 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -393,11 +393,11 @@ var/list/ai_verbs_default = list( if(emergency_message_cooldown) to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return - var/input = sanitize(input(usr, "Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + var/input = sanitize(input(usr, "Please choose a message to transmit to [GLOB.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input) return to_chat(usr, span_notice("No response from the remote server. Please, contact your system administrator.")) - log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]") + log_say("[key_name(usr)] has made an IA [GLOB.boss_short] announcement: [input]") emergency_message_cooldown = 1 spawn(300) emergency_message_cooldown = 0 @@ -445,7 +445,7 @@ var/list/ai_verbs_default = list( if(target && (!ishuman(target) || target.real_name == target.get_face_name())) ai_actual_track(target) else - to_chat(src, "\red System error. Cannot locate [href_list["trackname"]].") + to_chat(src, span_red("System error. Cannot locate [href_list["trackname"]].")) return return diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index e4bda7e3cf4..536190c105e 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -112,7 +112,7 @@ // Returns percentage of AI's remaining hardware integrity (maxhealth - (bruteloss + fireloss)) /mob/living/silicon/ai/proc/hardware_integrity() - return max(0,(health-HEALTH_THRESHOLD_DEAD)/2) + return max(0,(health-CONFIG_GET(number/health_threshold_dead))/2) // Cleaner proc for creating powersupply for an AI. /mob/living/silicon/ai/proc/create_powersupply() diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm index 6b615ce500b..df8627c954d 100644 --- a/code/modules/mob/living/silicon/decoy/life.dm +++ b/code/modules/mob/living/silicon/decoy/life.dm @@ -2,7 +2,7 @@ if (src.stat == 2) return else - if (src.health <= HEALTH_THRESHOLD_DEAD && src.stat != 2) + if (src.health <= CONFIG_GET(number/health_threshold_dead) && src.stat != 2) death() return diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index ca033aa94c0..a2d3b9b538d 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -9,8 +9,8 @@ extra_description += "\n[span_deadsay("It looks completely unsalvageable.")]" extra_description += "\n*---------*" - if(print_flavor_text()) - extra_description += "\n[print_flavor_text()]\n" + if(get_flavor_text()) + extra_description += "\n[get_flavor_text()]\n" if(pose) if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 ) diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 659ce0bbef3..9fda53ff847 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -6,7 +6,7 @@ if(get_dist(src, src.cable) > 1) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2) + M.show_message(span_red("The data cable rapidly retracts back into its spool."), 3, span_red("You hear a click and the sound of wire spooling rapidly."), 2) qdel(src.cable) src.cable = null @@ -33,4 +33,4 @@ health = 100 stat = CONSCIOUS else - health = 100 - getBruteLoss() - getFireLoss() \ No newline at end of file + health = 100 - getBruteLoss() - getFireLoss() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 4ff76d6891c..3cf09140dcd 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -121,7 +121,7 @@ if(prob(20)) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2) + 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) return src.death(0) switch(pick(1,2,3)) diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index c5513644f95..c5abb3fdddd 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -21,13 +21,13 @@ if(!cell_use_check(5, user)) return /* if((CLUMSY in user.mutations) && prob(50)) - to_chat(user, text("\red You try to analyze the floor's vitals!")) + to_chat(user, text(span_red("You try to analyze the floor's vitals!"))) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) - user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) - user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1) - user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue Body Temperature: ???", 1) + O.show_message(text(span_red("[user] has analyzed the floor's vitals!")), 1) + user.show_message(text(span_blue("Analyzing Results for The floor:\n\t Overall Status: Healthy")), 1) + user.show_message(text(span_blue("\t Damage Specifics: [0]-[0]-[0]-[0]")), 1) + user.show_message(span_blue("Key: Suffocation/Toxin/Burns/Brute"), 1) + user.show_message(span_blue("Body Temperature: ???"), 1) return */ var/scan_type @@ -36,7 +36,7 @@ else if(ishuman(M)) scan_type = "prosthetics" else - to_chat(user, "\red You can't analyze non-robotic things!") + to_chat(user, span_red("You can't analyze non-robotic things!")) return user.visible_message(span_notice("\The [user] has analyzed [M]'s components."),span_notice("You have analyzed [M]'s components.")) @@ -44,28 +44,28 @@ if("robot") var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") + 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: Electronics/Brute", 1) user.show_message("\t Damage Specifics: [BU] - [BR]") if(M.timeofdeath && M.stat == DEAD) - user.show_message("\blue Time of Disable: [worldtime2stationtime(M.timeofdeath)]") + user.show_message(span_blue("Time of Disable: [worldtime2stationtime(M.timeofdeath)]")) var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) - user.show_message("\blue Localized Damage:",1) + user.show_message(span_blue("Localized Damage:"),1) if(length(damaged)>0) for(var/datum/robot_component/org in damaged) - user.show_message(text("\blue \t []: [][] - [] - [] - []", \ + user.show_message(span_blue(text("\t []: [][] - [] - [] - []", \ capitalize(org.name), \ (org.installed == -1) ? "DESTROYED " :"",\ (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ (org.brute_damage > 0) ? "[org.brute_damage]" :0, \ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ - (org.powered) ? "Power ON" : "Power OFF"),1) + (org.powered) ? "Power ON" : "Power OFF")),1) else - user.show_message("\blue \t Components are OK.",1) + user.show_message(span_blue("\t Components are OK."),1) if(H.HasTrait(CYBORG_TRAIT_EMAGGED) && prob(5)) - user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1) - user.show_message("\blue Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message(span_red("\t ERROR: INTERNAL SYSTEMS COMPROMISED"),1) + user.show_message(span_blue("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)"), 1) if("prosthetics") var/mob/living/carbon/human/H = M diff --git a/code/modules/mob/living/silicon/robot/drone/_drone.dm b/code/modules/mob/living/silicon/robot/drone/_drone.dm index ddd5ac3bb2f..6de8b52e9b4 100644 --- a/code/modules/mob/living/silicon/robot/drone/_drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/_drone.dm @@ -68,7 +68,7 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/can_be_possessed_by(var/mob/observer/ghost/possessor) if(!istype(possessor) || !possessor.client || !possessor.ckey) return 0 - if(!config.allow_drone_spawn) + if(!CONFIG_GET(flag/allow_drone_spawn)) to_chat(src, span_danger("Playing as drones is not currently permitted.")) return 0 if(too_many_active_drones()) @@ -134,7 +134,7 @@ var/list/mob_hat_cache = list() additional_law_channels["Drone"] = "d" if(!laws) laws = new law_type - flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" + flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[GLOB.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) //Redefining some robot procs... @@ -191,7 +191,7 @@ var/list/mob_hat_cache = list() if(stat == 2) - if(!config.allow_drone_spawn || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave. + if(!CONFIG_GET(flag/allow_drone_spawn) || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave. to_chat(user, span_danger("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) return @@ -337,7 +337,7 @@ var/list/mob_hat_cache = list() for(var/mob/living/silicon/robot/drone/D in SSmobs.mob_list) if(D.key && D.client) drones++ - return drones >= config.max_maint_drones + return drones >= CONFIG_GET(number/max_maint_drones) /mob/living/silicon/robot/drone/verb/choose_eyecolor() set name = "Choose Light Color" 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 d56994581e5..09783e7fea6 100755 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -149,9 +149,9 @@ dat += {" Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"} @@ -168,7 +168,7 @@ else if(activated(O)) module_string += text("[O]: Activated
") else - module_string += text("[O]: Activate
") + module_string += text("[O]: Activate
") if((istype(O,/obj/item) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil))) tools += module_string @@ -183,7 +183,7 @@ else if(activated(module.emag)) dat += text("[module.emag]: Activated
") else - dat += text("[module.emag]: Activate
") + dat += text("[module.emag]: Activate
") dat += resources diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 700ea615380..5037154a3d0 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -47,13 +47,13 @@ icon_state = "drone_fab_active" var/elapsed = world.time - time_last_drone - drone_progress = round((elapsed/config.drone_build_time)*100) + drone_progress = round((elapsed/CONFIG_GET(number/drone_build_time))*100) if(drone_progress >= 100) visible_message("\The [src] voices a strident beep, indicating a drone chassis is prepared.") /obj/machinery/drone_fabricator/examine(mob/user, extra_description = "") - if(produce_drones && drone_progress >= 100 && isghost(user) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) + if(produce_drones && drone_progress >= 100 && isghost(user) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones)) extra_description += "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone." ..(user, extra_description) @@ -62,7 +62,7 @@ if(stat & NOPOWER) return - if(!produce_drones || !config.allow_drone_spawn || count_drones() >= config.max_maint_drones) + if(!produce_drones || !CONFIG_GET(flag/allow_drone_spawn) || count_drones() >= CONFIG_GET(number/max_maint_drones)) return if(!player || (!isghost(player.mob) && !aibound)) @@ -105,7 +105,7 @@ to_chat(user, span_danger("The game hasn't started yet!")) return - if(!(config.allow_drone_spawn)) + if(!CONFIG_GET(flag/allow_drone_spawn)) to_chat(user, span_danger("That verb is not currently permitted.")) return 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 012b537dfd8..ab2995f6211 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -16,7 +16,7 @@ return emote(copytext(message,2)) if(copytext(message,1,2) == ";") - var/datum/language/L = all_languages[communication_channel] + var/datum/language/L = GLOB.all_languages[communication_channel] if(istype(L)) return L.broadcast(src,trim(copytext(message,2))) @@ -24,7 +24,7 @@ if (stat) return 0 - var/list/listeners = hearers(5,src) + var/list/listeners = hearers(5, get_turf(src)) listeners |= src for(var/mob/living/silicon/D in listeners) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 1bbb185d6d2..8bbd6600c8d 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -208,7 +208,7 @@ if ("help") to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt") else - to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list.")) if ((message && src.stat == 0)) custom_emote(m_type, message) diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 2160f483dcc..479174648dc 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -29,10 +29,10 @@ if(DEAD) extra_description += "[span_deadsay("It's completely broken, but looks repairable.")]\n" //TODO: add no_soul status or flag if(module_active) - extra_description += "It is wielding \icon[module_active] [module_active].\n" + extra_description += "It is wielding [icon2html(module_active, user)] [module_active].\n" extra_description += "*---------*" - if(print_flavor_text()) extra_description += "\n[print_flavor_text()]\n" + if(get_flavor_text()) extra_description += "\n[get_flavor_text()]\n" if(pose) if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 ) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index ab63957e78c..b1eff90c936 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -2,7 +2,7 @@ //as they handle all relevant stuff like adding it to the player's screen and such //Returns the thing in our active hand (whatever is in our active module-slot, in this case) -/mob/living/silicon/robot/get_active_hand() +/mob/living/silicon/robot/get_active_held_item() return module_active /*-------TODOOOOOOOOOO--------*/ diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index a571f1c3ea0..061ed1742bd 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -62,7 +62,7 @@ src.has_power = 1 else if (src.has_power) - to_chat(src, "\red You are now running on emergency backup power.") + to_chat(src, span_red("You are now running on emergency backup power.")) src.has_power = 0 if(lights_on) // Light is on but there is no power! lights_on = 0 @@ -87,7 +87,7 @@ if(src.resting) Weaken(5) - if(health < HEALTH_THRESHOLD_DEAD && src.stat != 2) //die only once + if(health < CONFIG_GET(number/health_threshold_dead) && src.stat != 2) //die only once death() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2c9826d4062..2b3c4cc04ba 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -872,9 +872,9 @@ dat += {" Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"} @@ -885,17 +885,17 @@ else if(activated(obj)) dat += text("[obj]: Activated
") else - dat += text("[obj]: Activate
") + dat += text("[obj]: Activate
") if (HasTrait(CYBORG_TRAIT_EMAGGED)) if(activated(module.emag)) dat += text("[module.emag]: Activated
") else - dat += text("[module.emag]: Activate
") + dat += text("[module.emag]: Activate
") /* if(activated(obj)) - dat += text("[obj]: \[Activated | Deactivate\]
") + dat += text("[obj]: \[Activated | Deactivate\]
") else - dat += text("[obj]: \[Activate | Deactivated\]
") + dat += text("[obj]: \[Activate | Deactivated\]
") */ src << browse(HTML_SKELETON_TITLE("Modules", dat), "window=robotmod") @@ -1048,7 +1048,7 @@ set category = "IC" set src = usr - var/obj/item/W = get_active_hand() + var/obj/item/W = get_active_held_item() if(W) W.attack_self(src) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index ee9d900f7e8..6786d541929 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -75,13 +75,13 @@ var/absorb_burn_cost = (burn*shield.shield_level)*100 if(cell.is_empty()) - to_chat(src, "\red Your shield has overloaded!") + to_chat(src, span_red("Your shield has overloaded!")) else var/absorb_brute = cell.use(absorb_brute_cost)/100 var/absorb_burn = cell.use(absorb_burn_cost)/100 brute -= absorb_brute burn -= absorb_burn - to_chat(src, "\red Your shield absorbs some of the impact!") + to_chat(src, span_red("Your shield absorbs some of the impact!")) if(!emp) var/datum/robot_component/armour/A = get_armour() @@ -120,13 +120,13 @@ var/absorb_burn_cost = (burn*shield.shield_level)*100 if(cell.is_empty()) - to_chat(src, "\red Your shield has overloaded!") + to_chat(src, span_red("Your shield has overloaded!")) else var/absorb_brute = cell.use(absorb_brute_cost)/100 var/absorb_burn = cell.use(absorb_burn_cost)/100 brute -= absorb_brute burn -= absorb_burn - to_chat(src, "\red Your shield absorbs some of the impact!") + to_chat(src, span_red("Your shield absorbs some of the impact!")) var/datum/robot_component/armour/A = get_armour() if(A) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index c51d3184962..3a18a1a949f 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -172,7 +172,7 @@ overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer) addedSomething = 1 if ( addedSomething ) - user.visible_message("\blue [user] load some items onto their service tray.") + user.visible_message(span_blue("[user] load some items onto their service tray.")) return @@ -212,9 +212,9 @@ sleep(rand(2,4)) if ( droppedSomething ) if ( foundtable ) - user.visible_message("\blue [user] unloads their service tray.") + user.visible_message(span_blue("[user] unloads their service tray.")) else - user.visible_message("\blue [user] drops all the items on their tray.") + user.visible_message(span_blue("[user] drops all the items on their tray.")) return ..() @@ -292,7 +292,7 @@ deploy_paper(get_turf(src)) /obj/item/form_printer/proc/deploy_paper(var/turf/T) - T.visible_message("\blue \The [src.loc] dispenses a sheet of crisp white paper.") + T.visible_message(span_blue("\The [src.loc] dispenses a sheet of crisp white paper.")) new /obj/item/paper(T) diff --git a/code/modules/mob/living/silicon/robot/robot_parts.dm b/code/modules/mob/living/silicon/robot/robot_parts.dm index 5c3fa064e01..f761bbcebb0 100644 --- a/code/modules/mob/living/silicon/robot/robot_parts.dm +++ b/code/modules/mob/living/silicon/robot/robot_parts.dm @@ -121,7 +121,7 @@ var/obj/item/secbot_assembly/ed209_assembly/B = new(loc) B.forceMove(get_turf(src)) to_chat(user, span_notice("You armed the robot frame.")) - if (user.get_inactive_hand() == src) + if (user.get_inactive_held_item() == src) user.remove_from_mob(src) user.put_in_inactive_hand(B) qdel(src) @@ -290,7 +290,7 @@ ..() if(istype(W, /obj/item/device/flash)) if(isrobot(user)) - var/current_module = user.get_active_hand() + var/current_module = user.get_active_held_item() if(current_module == W) to_chat(user, span_warning("How do you propose to do that?")) return diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 6c28d85e25f..618c07efeb9 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -102,9 +102,9 @@ shock_damage *= 0.75 //take reduced damage take_overall_damage(0, shock_damage) - visible_message("\red [src] was shocked by \the [source]!", \ - "\red Energy pulse detected, system damaged!", \ - "\red You hear an electrical crack") + visible_message(span_red("[src] was shocked by \the [source]!"), \ + span_red("Energy pulse detected, system damaged!"), \ + span_red("You hear an electrical crack")) if(prob(20)) Stun(2) return @@ -158,7 +158,7 @@ return universal_speak || (speaking in speech_synthesizer_langs) //need speech synthesizer support to vocalize a language /mob/living/silicon/add_language(var/language, var/can_speak=1) - var/datum/language/added_language = all_languages[language] + var/datum/language/added_language = GLOB.all_languages[language] if(!added_language) return @@ -168,7 +168,7 @@ return 1 /mob/living/silicon/remove_language(var/rem_language) - var/datum/language/removed_language = all_languages[rem_language] + var/datum/language/removed_language = GLOB.all_languages[rem_language] if(!removed_language) return @@ -254,7 +254,7 @@ to_chat(src, "\The [A.alarm_name()].") if(alarm_raised) - to_chat(src, "\[Show Alerts\]") + to_chat(src, "\[Show Alerts\]") for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index da7e92776bf..a69fdfbb7dc 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -158,7 +158,7 @@ if(invisibility) chemicals -= invisibility_cost if(chemicals <= max_chemicals/2 && (max_chemicals/2) - invisibility_cost <= chemicals) - to_chat(src, to_chat(src, "\red Your invisibility will run out soon!")) + to_chat(src, to_chat(src, span_red("Your invisibility will run out soon!"))) if(chemicals <= invisibility_cost + 1) invisible() // Disable invisibility chemicals = 0 diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm index 72b6240a55d..ce3250f04db 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm @@ -9,7 +9,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot speak in IC (muted).") + to_chat(src, span_red("You cannot speak in IC (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 4106b2061f5..2608b75d087 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -238,7 +238,7 @@ return if(world.time - used_dominate < 1 MINUTE) // a one minutes cooldown. - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(is_ventcrawling) @@ -263,7 +263,7 @@ var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices if(world.time - used_dominate < 1 MINUTE) - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(!M || !Adjacent(M)) return @@ -503,7 +503,7 @@ return if(!host) - to_chat(src, "\red You cannot do this without a host.") + to_chat(src, span_red("You cannot do this without a host.")) return if(docile) @@ -541,11 +541,11 @@ return if(world.time - used_dominate < 1 MINUTE) - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(host) - to_chat(src, "\red You cannot do this inside a host.") + to_chat(src, span_red("You cannot do this inside a host.")) return if(invisibility) @@ -592,12 +592,12 @@ return if(!host) - to_chat(src, "\red You cannot do this without a host.") + to_chat(src, span_red("You cannot do this without a host.")) return var/reproduce_cost = (round(max_chemicals_inhost * 0.75)) // literally max chems but 75% of it if(chemicals >= reproduce_cost) - to_chat(host, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.") - visible_message("\red [host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") + to_chat(host, span_red("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")) + visible_message(span_red("[host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")) has_reproduced = TRUE chemicals -= reproduce_cost if(istype(host, /mob/living/carbon/human/) && !host.isMonkey()) @@ -645,7 +645,7 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text]") - to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm index 5446b3aa361..03e40896940 100644 --- a/code/modules/mob/living/simple_animal/borer/say.dm +++ b/code/modules/mob/living/simple_animal/borer/say.dm @@ -14,7 +14,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot speak in IC (muted).") + to_chat(src, span_red("You cannot speak in IC (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index e76f1e43675..1da76f86b17 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -158,7 +158,7 @@ /mob/living/simple_animal/cat/fluff/handle_movement_target() if (friend) var/follow_dist = 5 - if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT) //danger + if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) //danger follow_dist = 1 else if (friend.stat || friend.health <= 50) //danger or just sleeping follow_dist = 2 @@ -192,7 +192,7 @@ if (stat || !friend) return if (get_dist(src, friend) <= 1) - if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT) + if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) if (prob((friend.stat < DEAD)? 50 : 15)) var/verb = pick("meows", "mews", "mrowls") visible_emote(pick("[verb] in distress.", "[verb] anxiously.")) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index e8b63560b75..cc775134805 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -109,7 +109,7 @@ //pupplies cannot wear anything. /mob/living/simple_animal/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "\red You can't fit this on [src]") + to_chat(usr, span_red("You can't fit this on [src]")) return ..() @@ -129,7 +129,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "\red [src] already has a cute bow!") + to_chat(usr, span_red("[src] already has a cute bow!")) return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 5460eaf109a..916d556c940 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -38,7 +38,7 @@ if(enemies.len && prob(10)) enemies = list() LoseTarget() - src.visible_message("\blue [src] calms down.") + src.visible_message(span_blue("[src] calms down.")) if(stat == CONSCIOUS) if(udder && prob(5)) @@ -76,9 +76,9 @@ user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - to_chat(user, "\red The [O] is full.") + to_chat(user, span_red("The [O] is full.")) if(!transfered) - to_chat(user, "\red The udder is dry. Wait a bit longer...") + to_chat(user, span_red("The udder is dry. Wait a bit longer...")) else ..() //cow @@ -114,9 +114,9 @@ user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - to_chat(user, "\red The [O] is full.") + to_chat(user, span_red("The [O] is full.")) if(!transfered) - to_chat(user, "\red The udder is dry. Wait a bit longer...") + to_chat(user, span_red("The udder is dry. Wait a bit longer...")) else ..() @@ -227,12 +227,12 @@ var/global/chicken_count = 0 var/obj/item/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "wheat") if(!stat && eggsleft < 8) - user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.") + user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."), span_blue("You feed [O] to [name]! It clucks happily.")) user.drop_item() qdel(O) eggsleft += rand(1, 4) else - to_chat(user, "\blue [name] doesn't seem hungry!") + to_chat(user, span_blue("[name] doesn't seem hungry!")) else to_chat(user, "[name] doesn't seem interested in that.") else diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c434df7267c..959a433d774 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -225,7 +225,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, span_notice("\icon[src] Squeek!")) + to_chat(M, span_notice("[icon2html(src, M)] Squeek!")) poke(1) //Wake up if stepped on if (prob(95)) squeak(0) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 30f9da72d7f..1eced813ab7 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -45,7 +45,7 @@ /mob/living/simple_animal/spiderbot/New() ..() add_language(LANGUAGE_COMMON) - default_language = all_languages[LANGUAGE_COMMON] + default_language = GLOB.all_languages[LANGUAGE_COMMON] add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/proc/hide) @@ -218,7 +218,7 @@ return if(!held_item) - to_chat(usr, "\red You have nothing to drop!") + to_chat(usr, span_red("You have nothing to drop!")) return 0 if(istype(held_item, /obj/item/grenade)) @@ -275,7 +275,7 @@ /mob/living/simple_animal/spiderbot/examine(mob/user, extra_description = "") if(held_item) - extra_description += "\nIt is carrying \icon[src.held_item] \a [src.held_item]." + extra_description += "\nIt is carrying [icon2html(src.held_item, user)] \a [src.held_item]." ..(user, extra_description) /mob/living/simple_animal/spiderbot/cannot_use_vents() diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm index 06609e863e2..96eb9f8635d 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm @@ -104,7 +104,7 @@ //returns a list of everybody we wanna do stuff with. /mob/living/simple_animal/hostile/commanded/proc/get_targets_by_name(var/text, var/filter_friendlies = 0) - var/list/possible_targets = hearers(src,10) + var/list/possible_targets = hearers(10, get_turf(src)) . = list() for(var/mob/M in possible_targets) if(filter_friendlies && ((M in friends) || M.faction == faction || M == master)) @@ -187,4 +187,4 @@ allowed_targets += M stance = HOSTILE_STANCE_ATTACK if(M in friends) - friends -= M \ No newline at end of file + friends -= M diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index bd83011c16c..ebe28496050 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -174,7 +174,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST /mob/living/simple_animal/hostile/proc/ListTargets(var/dist = 7) - var/list/L = hearers(src, dist) + var/list/L = hearers(dist, get_turf(src)) for (var/mob/living/exosuit/M in GLOB.mechas_list) if (M.z == z && get_dist(src, M) <= dist) @@ -209,7 +209,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST /mob/living/simple_animal/hostile/proc/OpenFire(target_mob) var/target = target_mob - visible_message("\red [src] [fire_verb] at [target]!", 1) + visible_message(span_danger("[src] [fire_verb] at [target]!"), 1) if(rapid) spawn(1) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index a9fbb55f22b..0459e90e7c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -71,6 +71,7 @@ //self repair systems have a chance to bring the drone back to life /mob/living/simple_animal/hostile/retaliate/malf_drone/Life() + var/htmlicon = icon2html(src, viewers(get_turf(src))) //emps and lots of damage can temporarily shut us down if(disabled > 0) stat = UNCONSCIOUS @@ -86,7 +87,7 @@ //repair a bit of damage if(prob(1)) - src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.") + src.visible_message(span_red("[htmlicon] [src] shudders and shakes as some of it's damaged systems come back online.")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -101,10 +102,10 @@ //sometimes our targetting sensors malfunction, and we attack anyone nearby if(prob(disabled ? 0 : 1)) if(hostile_drone) - src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") + src.visible_message(span_blue("[htmlicon] [src] retracts several targetting vanes, and dulls it's running lights.")) hostile_drone = 0 else - src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.") + src.visible_message(span_red("[htmlicon] [src] suddenly lights up, and additional targetting vanes slide into place.")) hostile_drone = 1 if(health / maxHealth > 0.9) @@ -125,17 +126,17 @@ exploding = 0 if(!disabled) if(prob(50)) - src.visible_message("\blue \icon[src] [src] suddenly shuts down!") + src.visible_message(span_blue("[htmlicon] [src] suddenly shuts down!")) else - src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.") + src.visible_message(span_blue("[htmlicon] [src] suddenly lies still and quiet.")) disabled = rand(150, 600) walk(src,0) if(exploding && prob(20)) if(prob(50)) - src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!") + src.visible_message(span_red("[htmlicon] [src] begins to spark and shake violenty!")) else - src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!") + src.visible_message(span_red("[htmlicon] [src] sparks and shakes like it's about to explode!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index 2132641dd44..03a6b4ba17b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -44,7 +44,7 @@ set category = "Exploration" set src in view() - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return if(!CanInteract(usr, GLOB.conscious_state)) return diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 97468201f07..6d4fa6dbdd0 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -63,13 +63,13 @@ if (O.damtype == HALLOSS) damage = 0 health -= damage - visible_message("\red \b [src] has been attacked with the [O] by [user]. ") + visible_message(span_red("\b [src] has been attacked with the [O] by [user]. ")) else - visible_message("\red \b [src] blocks the [O] with its shield! ") + visible_message(span_red("\b [src] blocks the [O] with its shield! ")) //user.do_attack_animation(src) else - to_chat(usr, "\red This weapon is ineffective, it does no damage.") - visible_message("\red [user] gently taps [src] with the [O]. ") + to_chat(usr, span_red("This weapon is ineffective, it does no damage.")) + visible_message(span_red("[user] gently taps [src] with the [O]. ")) /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) @@ -77,7 +77,7 @@ if(prob(65)) ..() else - visible_message("\red [src] blocks [Proj] with its shield!") + visible_message(span_red("[src] blocks [Proj] with its shield!")) return 0 diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index b56d94c4b54..908ccafad15 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -156,27 +156,27 @@ if(copytext_char(possible_phrase,1,2) == get_prefix_key(/decl/prefix/radio_channel_selection) && (copytext_char(possible_phrase,2,3) in department_radio_keys)) possible_phrase = copytext_char(possible_phrase,3,length(possible_phrase)) else - to_chat(usr, "\red There is nothing to remove from its [remove_from].") + to_chat(usr, span_red("There is nothing to remove from its [remove_from].")) return //Adding things to inventory else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] - if(!usr.get_active_hand()) - to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") + if(!usr.get_active_held_item()) + to_chat(usr, span_red("You have nothing in your hand to put on its [add_to].")) return switch(add_to) if("ears") if(ears) - to_chat(usr, "\red It's already wearing something.") + to_chat(usr, span_red("It's already wearing something.")) return else - var/obj/item/item_to_add = usr.get_active_hand() + var/obj/item/item_to_add = usr.get_active_held_item() if(!item_to_add) return if( !istype(item_to_add, /obj/item/device/radio/headset) ) - to_chat(usr, "\red This object won't fit.") + to_chat(usr, span_red("This object won't fit.")) return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -406,7 +406,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.loc = src - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -566,7 +566,7 @@ return -1 if(held_item) - to_chat(src, "\red You are already holding the [held_item]") + to_chat(src, span_red("You are already holding the [held_item]")) return 1 for(var/obj/item/I in view(1,src)) @@ -579,10 +579,10 @@ held_item = I I.loc = src - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") return held_item - to_chat(src, "\red There is nothing of interest to take.") + to_chat(src, span_red("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -594,7 +594,7 @@ return -1 if(held_item) - to_chat(src, "\red You are already holding the [held_item]") + to_chat(src, span_red("You are already holding the [held_item]")) return 1 var/obj/item/stolen_item = null @@ -617,7 +617,7 @@ ) return held_item - to_chat(src, "\red There is nothing of interest to take.") + to_chat(src, span_red("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -641,7 +641,7 @@ return -1 if(!held_item) - to_chat(usr, "\red You have nothing to drop!") + to_chat(usr, span_red("You have nothing to drop!")) return 0 if(!drop_gently) @@ -674,7 +674,7 @@ src.loc = AM.loc icon_state = "parrot_sit" return - to_chat(src, "\red There is no perch nearby to sit on.") + to_chat(src, span_red("There is no perch nearby to sit on.")) return /* diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ba7b0b63a88..33bbbef0185 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -352,10 +352,10 @@ if(I_HELP) if (health > 0) - M.visible_message("\blue [M] [response_help] \the [src]") + M.visible_message(span_blue("[M] [response_help] \the [src]")) if(I_DISARM) - M.visible_message("\blue [M] [response_disarm] \the [src]") + M.visible_message(span_blue("[M] [response_disarm] \the [src]")) M.do_attack_animation(src) //TODO: Push the mob away or something @@ -373,13 +373,13 @@ G.affecting = src LAssailant = M - M.visible_message("\red [M] has grabbed [src] passively!") + M.visible_message(span_red("[M] has grabbed [src] passively!")) M.do_attack_animation(src) if(I_HURT) adjustBruteLoss(harm_intent_damage) playsound(src, pick(punch_sound),60,1) - M.visible_message("\red [M] [response_harm] \the [src]") + M.visible_message(span_red("[M] [response_harm] \the [src]")) M.do_attack_animation(src) return @@ -450,7 +450,7 @@ var/mob/living/exosuit/M = _target_mob if(length(M.pilots)) return FALSE - else if(!L.stat || L.health >= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0)) + else if(!L.stat || L.health >= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0)) return FALSE if(istype(_target_mob, /obj/machinery/bot)) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 295184da74e..6afa2e87abd 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -4,7 +4,7 @@ lastKnownIP = client.address computer_id = client.computer_id log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]") - if(config.log_access) + if(CONFIG_GET(flag/log_access)) var/is_multikeying = 0 for(var/mob/M in GLOB.player_list) if(M == src) continue diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6180016f651..fa02b7335f9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -52,31 +52,35 @@ /mob/GenerateTag() tag = "mob_[next_mob_id++]" -/mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) +/mob/proc/show_message(msg, type, alt_msg, alt_type, avoid_highlighting = FALSE)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) if(!client) return + msg = copytext_char(msg, 1, MAX_MESSAGE_LEN) + if(type) - if(type & 1 && (sdisabilities & BLIND || blinded || paralysis)) //Vision related - if(!alt) + if(type & MSG_VISUAL && is_blind())//Vision related + if(!alt_msg) return else - msg = alt + msg = alt_msg type = alt_type - if(type & 2 && (sdisabilities & DEAF || ear_deaf)) //Hearing related - if(!alt) + + if(type & MSG_AUDIBLE && ear_deaf)//Hearing related + if(!alt_msg) return else - msg = alt + msg = alt_msg type = alt_type - if((type & 1 && sdisabilities & BLIND)) + if(type & MSG_VISUAL && is_blind()) return + // voice muffling + if(stat == UNCONSCIOUS || stat == HARDCRIT) + if(type & MSG_AUDIBLE) //audio + to_chat(src, "... You can almost hear something ...") + return + to_chat(src, msg, avoid_highlighting = avoid_highlighting) - // Added voice muffling for Issue 41. - if(stat == UNCONSCIOUS || sleeping > 0) - to_chat(src, "... You can almost hear someone talking ...") - else - to_chat(src, msg) // Show a message to all mobs and objects in sight of this one // This would be for visible actions by the src mob @@ -364,7 +368,7 @@ if(incapacitated()) return - var/obj/item/W = get_active_hand() + var/obj/item/W = get_active_held_item() if (W) W.attack_self(src) @@ -376,7 +380,7 @@ if(incapacitated()) return - var/obj/item/item = get_active_hand() + var/obj/item/item = get_active_held_item() if(!item) return @@ -442,7 +446,7 @@ if(msg != null) flavor_text = msg -/mob/proc/print_flavor_text() +/mob/proc/get_flavor_text() if (flavor_text && flavor_text != "") var/msg = trim(replacetext(flavor_text, "\n", " ")) if(!msg) return "" @@ -466,7 +470,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || isnewplayer(src)) - to_chat(usr, "\blue You must be observing to use this!") + to_chat(usr, span_blue("You must be observing to use this!")) return if(is_admin && stat == DEAD) @@ -566,7 +570,7 @@ /mob/proc/pull_damage() if(ishuman(src)) var/mob/living/carbon/human/H = src - if(H.health - H.halloss <= HEALTH_THRESHOLD_SOFTCRIT) + if(H.health - H.halloss <= CONFIG_GET(number/health_threshold_softcrit)) for(var/name in H.organs_by_name) var/obj/item/organ/external/e = H.organs_by_name[name] if(e && H.lying) @@ -589,6 +593,7 @@ set category = "IC" if(pulling) + animate_interact(pulling, INTERACT_UNPULL) pulling.pulledby = null pulling = null if(HUDneed.Find("pull")) @@ -654,13 +659,12 @@ src.pulling = AM AM.pulledby = src - /*if(pullin) - pullin.icon_state = "pull1"*/ + animate_interact(AM, INTERACT_PULL) if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.pull_damage()) - to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.") + to_chat(src, span_boldwarning("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)) @@ -1272,6 +1276,12 @@ All Canmove setting in this proc is temporary. This var should not be set from h return var/obj/screen/zone_sel/selector = mob.HUDneed["damage zone"] selector.set_selected_zone(next_list_item(mob.targeted_organ,zones)) + logger.Log( + LOG_CATEGORY_TARGET_ZONE_SWITCH, + "[key_name(src)] manually changed selected zone", + data = zones + ) + /mob/proc/set_stat(var/new_stat) . = stat != new_stat stat = new_stat diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b303851678d..e377336892c 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -48,7 +48,7 @@ var/other_mobs var/next_move var/transforming //Carbon - var/hand + var/hand = 0 var/real_name var/bhunger = 0 //Carbon diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 67cf64d40a6..9c66f532867 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -328,10 +328,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) /proc/broadcast_hud_message(var/message, var/broadcast_source, var/list/targets, var/icon) var/turf/sourceturf = get_turf(broadcast_source) + var/htmlicon = icon2html(icon, targets) for(var/mob/M in targets) var/turf/targetturf = get_turf(M) if((targetturf.z == sourceturf.z)) - M.show_message(span_info("\icon[icon] [message]"), 1) + M.show_message(span_info("[htmlicon] [message]"), 1) /proc/mobs_in_area(var/area/A) var/list/mobs = new @@ -383,7 +384,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[span_name("[lname]")] " - to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]")) + to_chat(M, span_deadsay("DEAD: [lname][follow][message]")) //Announces that a ghost has joined/left, mainly for use with wizards /proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "") @@ -393,7 +394,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) var/mob/M = O if(M.client) C = M.client - else if(istype(O, /client)) + else if(isclient(O)) C = O else if(istype(O, /datum/mind)) var/datum/mind/M = O @@ -521,10 +522,10 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) return can_admin_interact() && ..(ghost_multitool) /mob/living/carbon/human/get_multitool() - return ..(get_active_hand()) + return ..(get_active_held_item()) /mob/living/silicon/robot/get_multitool() - return ..(get_active_hand()) + return ..(get_active_held_item()) /mob/living/silicon/ai/get_multitool() return ..(aiMulti) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 2abd1b02f10..498eb701407 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -67,12 +67,12 @@ to_chat(usr, span_warning("This mob type cannot drop items.")) /mob/living/carbon/hotkey_drop() - if(!get_active_hand()) + if(!get_active_held_item()) to_chat(usr, span_warning("You have nothing to drop in your hand.")) if (!isturf(loc)) return else - unEquip(get_active_hand(), loc) + unEquip(get_active_held_item(), loc) //This gets called when you press the delete button. /client/verb/delete_key_pressed() diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index b9f769d4020..876f82c9dc5 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,7 @@ /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies) if(isnewplayer(src)) - to_chat(usr, "\red cannot convert players who have not entered yet.") + to_chat(usr, span_red("cannot convert players who have not entered yet.")) return if(!new_type) @@ -19,7 +19,7 @@ return if( new_type == /mob/new_player ) - to_chat(usr, "\red cannot convert into a new_player mob type.") + to_chat(usr, span_red("cannot convert into a new_player mob type.")) return var/mob/M diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 1bfb05355cb..b32108d9944 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -17,8 +17,8 @@ // return FALSE if(join_motd) - to_chat(src, "
Area Air Control
- Scan + Scan
|
- Turn On
- Turn Off + Turn On + Turn Off Load: [round(scrubber.last_power_draw)] W |
"}
diff --git a/code/game/machinery/autolathe/autolathe.dm b/code/game/machinery/autolathe/autolathe.dm
index d36f707f8b2..b27a9045338 100644
--- a/code/game/machinery/autolathe/autolathe.dm
+++ b/code/game/machinery/autolathe/autolathe.dm
@@ -427,7 +427,7 @@
/obj/machinery/autolathe/proc/insert_disk(mob/living/user, obj/item/computer_hardware/hard_drive/portable/inserted_disk)
if(!inserted_disk && istype(user))
- inserted_disk = user.get_active_hand()
+ inserted_disk = user.get_active_held_item()
if(!istype(inserted_disk))
return
@@ -454,7 +454,7 @@
/obj/machinery/autolathe/proc/insert_beaker(mob/living/user, obj/item/reagent_containers/glass/beaker)
if(!beaker && istype(user))
- beaker = user.get_active_hand()
+ beaker = user.get_active_held_item()
if(!istype(beaker))
return
@@ -533,7 +533,7 @@
/obj/machinery/autolathe/proc/eat(mob/living/user, obj/item/eating)
if(!eating && istype(user))
- eating = user.get_active_hand()
+ eating = user.get_active_held_item()
if(!istype(eating))
return FALSE
@@ -974,7 +974,7 @@
return
if(!inserted_oddity && istype(user))
- inserted_oddity = user.get_active_hand()
+ inserted_oddity = user.get_active_held_item()
if(!istype(inserted_oddity))
return
diff --git a/code/game/machinery/autolathe_disk_cloner.dm b/code/game/machinery/autolathe_disk_cloner.dm
index 1319bb5d489..044f6c14abb 100644
--- a/code/game/machinery/autolathe_disk_cloner.dm
+++ b/code/game/machinery/autolathe_disk_cloner.dm
@@ -145,7 +145,7 @@
var/obj/item/computer_hardware/hard_drive/portable/D = null
if(ishuman(usr))
H = usr
- D = H.get_active_hand()
+ D = H.get_active_held_item()
if(href_list["eject"] == "f")
if(original)
diff --git a/code/game/machinery/bluespaceartillery.dm b/code/game/machinery/bluespaceartillery.dm
index 01b22f19a1d..4cdf0fe50d8 100644
--- a/code/game/machinery/bluespaceartillery.dm
+++ b/code/game/machinery/bluespaceartillery.dm
@@ -26,7 +26,7 @@
dat += "Locked on|||||||||||||
| Body "
@@ -132,7 +132,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/physical/body/OnTopic(var/href,var/list/href_list, var/mob/user)
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
if(href_list["toggle_species_verbose"])
hide_species = !hide_species
return TOPIC_REFRESH
@@ -151,7 +151,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_HAIR_COLOR))
return TOPIC_NOACTION
var/new_hair = input(user, "Choose your character's hair colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.hair_color) as color|null
- if(new_hair && has_flag(all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
+ if(new_hair && has_flag(GLOB.all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
pref.hair_color = new_hair
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -159,7 +159,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/list/valid_hairstyles = mob_species.get_hair_styles()
var/new_h_style = input(user, "Choose your character's hair style:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.h_style) as null|anything in valid_hairstyles
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_h_style && CanUseTopic(user) && (new_h_style in mob_species.get_hair_styles()))
pref.h_style = new_h_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -168,7 +168,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_HAIR_COLOR))
return TOPIC_NOACTION
var/new_facial = input(user, "Choose your character's facial-hair colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.facial_color) as color|null
- if(new_facial && has_flag(all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
+ if(new_facial && has_flag(GLOB.all_species[pref.species], HAS_HAIR_COLOR) && CanUseTopic(user))
pref.facial_color = new_facial
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -176,7 +176,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_EYE_COLOR))
return TOPIC_NOACTION
var/new_eyes = input(user, "Choose your character's eye colour:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.eyes_color) as color|null
- if(new_eyes && has_flag(all_species[pref.species], HAS_EYE_COLOR) && CanUseTopic(user))
+ if(new_eyes && has_flag(GLOB.all_species[pref.species], HAS_EYE_COLOR) && CanUseTopic(user))
pref.eyes_color = new_eyes
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -189,7 +189,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["skin_tone"])
var/new_s_tone = input(user, "Choose your character's skin-tone. Lower numbers are lighter, higher are darker. Range: 1 to 225", CHARACTER_PREFERENCE_INPUT_TITLE, (-pref.s_tone) + 35) as num|null
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_s_tone && CanUseTopic(user))
pref.s_tone = 35 - max(min(round(new_s_tone), 220), 1)
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -198,7 +198,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!has_flag(mob_species, HAS_SKIN_COLOR))
return TOPIC_NOACTION
var/new_skin = input(user, "Choose your character's skin colour: ", CHARACTER_PREFERENCE_INPUT_TITLE, pref.skin_color) as color|null
- if(new_skin && has_flag(all_species[pref.species], HAS_SKIN_COLOR) && CanUseTopic(user))
+ if(new_skin && has_flag(GLOB.all_species[pref.species], HAS_SKIN_COLOR) && CanUseTopic(user))
pref.skin_color = new_skin
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -207,7 +207,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/new_f_style = input(user, "Choose your character's facial-hair style:", CHARACTER_PREFERENCE_INPUT_TITLE, pref.f_style) as null|anything in valid_facialhairstyles
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_f_style && CanUseTopic(user) && mob_species.get_facial_hair_styles(pref.gender))
pref.f_style = new_f_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -238,7 +238,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_NOACTION
new_h_style = valid_hairstyles[old_pos+1]
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_h_style && CanUseTopic(user) && (new_h_style in mob_species.get_hair_styles()))
pref.h_style = new_h_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -254,7 +254,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(old_pos + 1 > valid_facialhairstyles.len)
return TOPIC_NOACTION
new_f_style = valid_facialhairstyles[old_pos+1]
- mob_species = all_species[pref.species]
+ mob_species = GLOB.all_species[pref.species]
if(new_f_style && CanUseTopic(user) && mob_species.get_facial_hair_styles(pref.gender))
pref.f_style = new_f_style
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -267,7 +267,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/proc/ResetHair()
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
var/list/valid_hairstyles = mob_species.get_hair_styles()
if(valid_hairstyles.len)
@@ -280,7 +280,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
/datum/category_item/player_setup_item/proc/ResetFacialHair()
- var/datum/species/mob_species = all_species[pref.species]
+ var/datum/species/mob_species = GLOB.all_species[pref.species]
var/list/valid_facialhairstyles = mob_species.get_facial_hair_styles(pref.gender)
if(valid_facialhairstyles.len)
diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm
index d36ffe3110c..0b219b00495 100644
--- a/code/modules/client/preference_setup/global/01_ui.dm
+++ b/code/modules/client/preference_setup/global/01_ui.dm
@@ -1,7 +1,8 @@
/datum/preferences
//var/clientfps = 0
//game-preferences
- var/ooccolor = "#010000" //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
+ var/ooccolor //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
+ var/asaycolor //Whatever this is set to acts as 'reset' color and is thus unusable as an actual custom color
var/UI_style = "ErisStyle"
var/UI_useborder = 0
var/UI_style_color = "#ffffff"
@@ -17,6 +18,7 @@
S["UI_style_color"] >> pref.UI_style_color
S["UI_style_alpha"] >> pref.UI_style_alpha
S["ooccolor"] >> pref.ooccolor
+ S["asaycolor"] >> pref.asaycolor
//S["clientfps"] >> pref.clientfps
/datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S)
@@ -24,13 +26,15 @@
S["UI_style_color"] << pref.UI_style_color
S["UI_style_alpha"] << pref.UI_style_alpha
S["ooccolor"] << pref.ooccolor
+ S["asaycolor"] << pref.asaycolor
//S["clientfps"] << pref.clientfps
/datum/category_item/player_setup_item/player_global/ui/sanitize_preferences()
pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style))
pref.UI_style_color = sanitize_hexcolor(pref.UI_style_color, initial(pref.UI_style_color))
pref.UI_style_alpha = sanitize_integer(pref.UI_style_alpha, 0, 255, initial(pref.UI_style_alpha))
- pref.ooccolor = sanitize_hexcolor(pref.ooccolor, initial(pref.ooccolor))
+ pref.ooccolor = sanitize_hexcolor(pref.ooccolor, GLOB.OOC_COLOR)
+ pref.asaycolor = sanitize_hexcolor(pref.asaycolor, DEFAULT_ASAY_COLOR)
//pref.clientfps = sanitize_integer(pref.clientfps, CLIENT_MIN_FPS, CLIENT_MAX_FPS, initial(pref.clientfps))
/datum/category_item/player_setup_item/player_global/ui/content(var/mob/user)
@@ -41,10 +45,17 @@
. += "-Alpha(transparency): [pref.UI_style_alpha] reset " if(can_select_ooc_color(user)) . += "OOC Color:" - if(pref.ooccolor == initial(pref.ooccolor)) + if(pref.ooccolor == GLOB.OOC_COLOR) . += "Using Default " else . += "[pref.ooccolor]
" + // Just use the same check + if(can_select_ooc_color(user)) + . += "ASAY Color:" + if(pref.asaycolor == DEFAULT_ASAY_COLOR) + . += "Using Default " + else + . += "[pref.asaycolor]
" //. += "Client FPS: [pref.clientfps] " @@ -76,6 +87,12 @@ pref.ooccolor = new_ooccolor return TOPIC_REFRESH + else if(href_list["select_asay_color"]) + var/new_asaycolor = input(user, "Choose ASAY color:", "Global Preference") as color|null + if(new_asaycolor && can_select_asay_color(user) && CanUseTopic(user)) + pref.asaycolor = new_asaycolor + return TOPIC_REFRESH + /* else if(href_list["select_fps"]) var/version_message @@ -99,11 +116,16 @@ if("alpha") pref.UI_style_alpha = initial(pref.UI_style_alpha) if("ooc") - pref.ooccolor = initial(pref.ooccolor) + pref.ooccolor = GLOB.OOC_COLOR + if("asay") + pref.ooccolor = DEFAULT_ASAY_COLOR pref.client.create_UI() return TOPIC_REFRESH return ..() /proc/can_select_ooc_color(var/mob/user) - return config.allow_admin_ooccolor && check_rights(R_ADMIN, 0, user) + return CONFIG_GET(flag/allow_admin_ooccolor) && check_rights(R_ADMIN, 0, user) + +/proc/can_select_asay_color(var/mob/user) + return CONFIG_GET(flag/allow_admin_asaycolor) && check_rights(R_ADMIN, 0, user) diff --git a/code/modules/client/preference_setup/global/05_settings.dm b/code/modules/client/preference_setup/global/05_settings.dm index 1ed8d9df57f..6983f84c11d 100644 --- a/code/modules/client/preference_setup/global/05_settings.dm +++ b/code/modules/client/preference_setup/global/05_settings.dm @@ -59,7 +59,7 @@ pref.preference_values -= key pref.lastchangelog = sanitize_text(pref.lastchangelog, initial(pref.lastchangelog)) - pref.default_slot = sanitize_integer(pref.default_slot, 1, config.character_slots, initial(pref.default_slot)) + pref.default_slot = sanitize_integer(pref.default_slot, 1, CONFIG_GET(number/character_slots), initial(pref.default_slot)) /datum/category_item/player_setup_item/player_global/settings/content(var/mob/user) . = list() diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index e302ebe8639..cef761bb75b 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -76,13 +76,13 @@ var/list/gear_datums = list() . += gear_name /datum/category_item/player_setup_item/loadout/sanitize_character() - pref.gear_slot = sanitize_integer(pref.gear_slot, 1, config.loadout_slots, initial(pref.gear_slot)) + pref.gear_slot = sanitize_integer(pref.gear_slot, 1, CONFIG_GET(number/loadout_slots), initial(pref.gear_slot)) if(!islist(pref.gear_list)) pref.gear_list = list() - if(pref.gear_list.len < config.loadout_slots) - pref.gear_list.len = config.loadout_slots + if(pref.gear_list.len < CONFIG_GET(number/loadout_slots)) + pref.gear_list.len = CONFIG_GET(number/loadout_slots) - for(var/index = 1 to config.loadout_slots) + for(var/index = 1 to CONFIG_GET(number/loadout_slots)) var/list/gears = pref.gear_list[index] if(istype(gears)) @@ -98,7 +98,7 @@ var/list/gear_datums = list() gears -= gear_name else var/datum/gear/G = gear_datums[gear_name] - if(total_cost + G.cost > config.max_gear_cost) + if(total_cost + G.cost > CONFIG_GET(number/max_gear_cost)) gears -= gear_name else total_cost += G.cost @@ -121,14 +121,14 @@ var/list/gear_datums = list() total_cost += G.cost var/fcolor = "#3366cc" - if(total_cost < config.max_gear_cost) + if(total_cost < CONFIG_GET(number/max_gear_cost)) fcolor = "#e67300" . += "
| |||||||||||||
| [item_list[item_name] ? "[item_list[item_name]] x " : ""][item_name] | [price_list[item_name] * item_list[item_name]] þ | ||||||||||||
| Total Amount: [transaction_amount] þ | |||||||||||||
| [item_list[item_name] ? "[item_list[item_name]] x " : ""][item_name] | [price_list[item_name] * item_list[item_name]] þ | ||||||||||||
| Total Amount: [transaction_amount] þ | |||||||||||||
" + html += "[GLOB.total_runtimes] runtimes, [GLOB.total_runtimes_skipped] skipped
" if(!linear) html += "organized | [makeLink("linear", null, 1)]
" var/datum/ErrorViewer/ErrorSource/error_source @@ -129,7 +129,7 @@ var/global/datum/ErrorViewer/ErrorCache/error_cache = null /datum/ErrorViewer/ErrorSource/showTo(var/user, var/datum/ErrorViewer/back_to, var/linear) if(!istype(back_to)) - back_to = error_cache + back_to = GLOB.error_cache var/html = buildHeader(back_to, refreshable=1) for(var/datum/ErrorViewer/ErrorEntry/error_entry in errors) html += "
[error_entry.makeLink(null, src)]
[html_encode(name)]
[desc]
"
if(srcRef)
- html += "[desc]
src: VV" + html += "
src: VV" if(ispath(srcType, /mob)) - html += " PP" - html += " Follow" + html += " [ADMIN_PP(srcRef)]" + html += " [ADMIN_FLW(srcRef)]" if(istype(srcLoc)) - html += "
src.loc: VV" - html += " JMP" + html += "
src.loc: [ADMIN_VV(srcLoc)]" + html += " [ADMIN_JMP(srcLoc)]" if(usrRef) - html += "
usr: VV" - html += " PP" - html += " Follow" + html += "
usr: [ADMIN_VV(usrRef)]" + html += " [ADMIN_PP(usrRef)]" + html += " [ADMIN_FLW(usrRef)]" if(istype(usrLoc)) - html += "
usr.loc: VV" - html += " JMP" + html += "
usr.loc: VV" + html += " [ADMIN_JMP(usrLoc)]" browseTo(user, html) /datum/ErrorViewer/ErrorEntry/makeLink(var/linktext, var/datum/ErrorViewer/back_to, var/linear) diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 72bbe729b45..b235e8a1f69 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -33,4 +33,4 @@ return ..() /mob/living/carbon/human/get_description_fluff() - return print_flavor_text(0) + return get_flavor_text(0) diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm index 77a15d639ba..a627293ffb0 100644 --- a/code/modules/ext_scripts/irc.dm +++ b/code/modules/ext_scripts/irc.dm @@ -1,10 +1,10 @@ /proc/send2irc(var/channel, var/msg) - if(config.use_irc_bot && config.irc_bot_host) - if(config.irc_bot_export) + if(CONFIG_GET(flag/use_irc_bot) && CONFIG_GET(string/irc_bot_host)) + if(CONFIG_GET(flag/irc_bot_export)) spawn(-1) // spawn here prevents hanging in the case that the bot isn't reachable - world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]") + world.Export("http://[CONFIG_GET(string/irc_bot_host)]:45678?[list2params(list(pwd=CONFIG_GET(string/comms_key), chan=channel, mesg=msg))]") else - if(config.use_lib_nudge) + if(CONFIG_GET(flag/use_lib_nudge)) var/nudge_lib if(world.system_type == MS_WINDOWS) nudge_lib = "lib\\nudge.dll" @@ -12,24 +12,24 @@ nudge_lib = "lib/nudge.so" spawn(0) - LIBCALL(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]") + LIBCALL(nudge_lib, "nudge")("[CONFIG_GET(string/comms_key)]","[CONFIG_GET(string/irc_bot_host)]","[channel]","[msg]") else spawn(0) - ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]") + ext_python("ircbot_message.py", "[CONFIG_GET(string/comms_key)] [CONFIG_GET(string/irc_bot_host)] [channel] [msg]") return /proc/send2mainirc(var/msg) - if(config.main_irc) - send2irc(config.main_irc, msg) + if(CONFIG_GET(string/main_irc)) + send2irc(CONFIG_GET(string/main_irc), msg) return /proc/send2adminirc(var/msg) - if(config.admin_irc) - send2irc(config.admin_irc, msg) + if(CONFIG_GET(string/admin_irc)) + send2irc(CONFIG_GET(string/admin_irc), msg) return /hook/startup/proc/ircNotify() - send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") + send2mainirc("Server starting up on byond://[CONFIG_GET(string/serverurl) ? CONFIG_GET(string/serverurl) : (CONFIG_GET(string/server) ? CONFIG_GET(string/server) : "[world.address]:[world.port]")]") return 1 diff --git a/code/modules/ext_scripts/python.dm b/code/modules/ext_scripts/python.dm index 9b798d80cae..3287d463ace 100644 --- a/code/modules/ext_scripts/python.dm +++ b/code/modules/ext_scripts/python.dm @@ -4,6 +4,6 @@ if(world.system_type == MS_WINDOWS) script = replacetext(script, "/", "\\") - var/command = config.python_path + " " + script + " " + args + var/command = CONFIG_GET(string/python_path) + " " + script + " " + args return shell(command) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 59474f99735..46755bf6307 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -19,7 +19,7 @@ var/list/dreams = list( spawn(0) for(var/i = rand(1,4),i > 0, i--) - to_chat(src, "\blue ... [pick(dreams)] ...") + to_chat(src, span_blue("... [pick(dreams)] ...")) sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/food/drywet.dm b/code/modules/food/drywet.dm index f957dcb6754..06d20791202 100644 --- a/code/modules/food/drywet.dm +++ b/code/modules/food/drywet.dm @@ -197,7 +197,7 @@ /obj/item/reagent_containers/drywet/attack_hand(mob/user) add_fingerprint(user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) var/obj/item/taken = pickweight_n_take(solids) if(taken) untaken_capacity += taken.get_storage_cost() ** 2 diff --git a/code/modules/games/boardgame.dm b/code/modules/games/boardgame.dm index af4016bc0a9..f92b43d18e1 100644 --- a/code/modules/games/boardgame.dm +++ b/code/modules/games/boardgame.dm @@ -141,7 +141,7 @@ var/mob/living/carbon/human/H = locate(href_list["person"]) if(!istype(H)) return - var/obj/item/O = H.get_active_hand() + var/obj/item/O = H.get_active_held_item() if(!O) return addPiece(O,H,text2num(s)) diff --git a/code/modules/genetics/stationary_scanner_console.dm b/code/modules/genetics/stationary_scanner_console.dm index 069948aac6e..e3dbb40f0fc 100644 --- a/code/modules/genetics/stationary_scanner_console.dm +++ b/code/modules/genetics/stationary_scanner_console.dm @@ -47,7 +47,7 @@ var/wires_state = "console_wires" if(!(stat & (NOPOWER|BROKEN)) && use_power) - if(SSnano.open_uis["\ref[src]"]) + if(SSnano._open_uis["\ref[src]"]) screen_state += "_on" spawn(1.5 SECONDS) .() // If UI is open - run check every 1.5 seconds until it's closed diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 472fc2d889a..f5b1b7b56f4 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(ghost_trap_users) // Fluff! /datum/ghosttrap/proc/welcome_candidate(var/mob/target) - to_chat(target, "You are a positronic brain, brought into existence on [station_name].") + to_chat(target, "You are a positronic brain, brought into existence on [station_name()].") to_chat(target, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") to_chat(target, "Remember, the purpose of your existence is to serve the crew and the ship. Above all else, do no harm.") to_chat(target, "Use say [target.get_language_prefix()]b to speak to other artificial intelligences.") diff --git a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm deleted file mode 100644 index ab3b286a949..00000000000 --- a/code/modules/goonchat/browserOutput.dm +++ /dev/null @@ -1,286 +0,0 @@ -/********************************* -For the main html chat area -*********************************/ -GLOBAL_VAR_INIT(goonchatbasehtml, file2text('code/modules/goonchat/browserassets/html/browserOutput.html')) - -//On client, created on login -/datum/chatOutput - var/client/owner //client ref - var/loaded = FALSE // Has the client loaded the browser output area? - var/list/messageQueue //If they haven't loaded chat, this is where messages will go until they do - var/cookieSent = FALSE // Has the client sent a cookie for analysis - var/broken = FALSE - var/list/connectionHistory //Contains the connection history passed from chat cookie - var/adminMusicVolume = 25 //This is for the Play Global Sound verb - -/datum/chatOutput/New(client/C) - owner = C - messageQueue = list() - connectionHistory = list() - -/datum/chatOutput/proc/start() - //Check for existing chat - if(!owner) - return FALSE - - if(!winexists(owner, "browseroutput")) // Oh goddamnit. - set waitfor = FALSE - broken = TRUE - message_admins("Couldn't start chat for [key_name_admin(owner)]!") - . = FALSE - alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.") - return - - if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup - doneLoading() - - else //Not setup - load() - - return TRUE - -/datum/chatOutput/proc/load() - set waitfor = FALSE - if(!owner) - return - - var/datum/asset/group/gc = get_asset_datum(/datum/asset/group/goonchat) - - if (gc.send(owner)) - owner.browse_queue_flush() // stall loading html until goochant actualy gets sent - - var/html = GLOB.goonchatbasehtml - html = replacetextEx(html, "%FONTAWESOME%", SSassets.transport.get_asset_url("font-awesome.css")) - - owner << browse(html, "window=browseroutput") - -/datum/chatOutput/Topic(href, list/href_list) - if(usr.client != owner) - return TRUE - - // Build arguments. - // Arguments are in the form "param[paramname]=thing" - var/list/params = list() - for(var/key in href_list) - if(length_char(key) > 7 && findtext(key, "param")) // 7 is the amount of characters in the basic param key template. - var/param_name = copytext_char(key, 7, -1) - var/item = href_list[key] - - params[param_name] = item - - var/data // Data to be sent back to the chat. - switch(href_list["proc"]) - if("doneLoading") - data = doneLoading(arglist(params)) - - if("debug") - data = debug(arglist(params)) - - if("ping") - data = ping(arglist(params)) - - if("analyzeClientData") - data = analyzeClientData(arglist(params)) - - if("setMusicVolume") - data = setMusicVolume(arglist(params)) - if("swaptodarkmode") - swaptodarkmode() - if("swaptolightmode") - swaptolightmode() - if("enable_fullscreen") - enable_fullscreen() - if("disable_fullscreen") - disable_fullscreen() - - if(data) - ehjax_send(data = data) - - -//Called on chat output done-loading by JS. -/datum/chatOutput/proc/doneLoading() - if(loaded) - return - - loaded = TRUE - showChat() - - - for(var/message in messageQueue) - // whitespace has already been handled by the original to_chat - to_chat(owner, message, handle_whitespace=FALSE) - - messageQueue = null - sendClientData() - - //do not convert to to_chat() - owner << "Failed to load fancy chat, reverting to old chat. Certain features won't work." - -/datum/chatOutput/proc/showChat() - winset(owner, "output", "is-visible=false") - winset(owner, "browseroutput", "is-disabled=false;is-visible=true") - -/datum/chatOutput/proc/ehjax_send(client/C = owner, window = "browseroutput", data) - if(islist(data)) - data = json_encode(data) - C << output("[data]", "[window]:ehjaxCallback") - -/datum/chatOutput/proc/sendMusic(music, list/extra_data) - if(!findtext(music, GLOB.is_http_protocol)) - return - var/list/music_data = list("adminMusic" = url_encode(url_encode(music))) - - if(extra_data?.len) - music_data["musicRate"] = extra_data["pitch"] - music_data["musicSeek"] = extra_data["start"] - music_data["musicHalt"] = extra_data["end"] - - ehjax_send(data = music_data) - -/datum/chatOutput/proc/stopMusic() - ehjax_send(data = "stopMusic") - -/datum/chatOutput/proc/setMusicVolume(volume = "") - if(volume) - adminMusicVolume = CLAMP(text2num(volume), 0, 100) - -//Sends client connection details to the chat to handle and save -/datum/chatOutput/proc/sendClientData() - //Get dem deets - var/list/deets = list("clientData" = list()) - deets["clientData"]["ckey"] = owner.ckey - deets["clientData"]["ip"] = owner.address - deets["clientData"]["compid"] = owner.computer_id - var/data = json_encode(deets) - ehjax_send(data = data) - -//Called by client, sent data to investigate (cookie history so far) -/datum/chatOutput/proc/analyzeClientData(cookie = "") - if(!cookie) - return - - if(cookie != "none") - var/regex/crashy_thingy = regex("^\\s*(\[\\\[\\{\\}\\\]\]\\s*){5,}") - if(crashy_thingy.Find(cookie)) - log_and_message_admins("[key_name(owner)] tried to crash the server using at least 5 \"\[\" in a row. Ban them.") - return - - var/list/connData = json_decode(cookie) - if (connData && islist(connData) && connData.len > 0 && connData["connData"]) - connectionHistory = connData["connData"] //lol fuck - var/list/found = new() - for(var/i in connectionHistory.len to 1 step -1) - var/list/row = src.connectionHistory[i] - if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object - return - if (world.IsBanned(row["ckey"], row["ip"], row["compid"], real_bans_only=TRUE)) - found = row - break - - //Uh oh this fucker has a history of playing on a banned account!! - if (found.len > 0) - //TODO: add a new evasion ban for the CURRENT client details, using the matched row details - message_admins("[key_name(src.owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") - //log_admin_private("[key_name(owner)] has a cookie from a banned account! (Matched: [found["ckey"]], [found["ip"]], [found["compid"]])") - for(var/client/A in GLOB.admins) - if(A.get_preference_value(/datum/client_preference/staff/play_adminhelp_ping) == GLOB.PREF_HEAR) - sound_to(A, 'sound/effects/adminhelp.ogg') - - cookieSent = TRUE - -//Called by js client every 60 seconds -/datum/chatOutput/proc/ping() - return "pong" - -//Called by js client on js error -/datum/chatOutput/proc/debug(error) - log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]") - -//Global chat procs -/proc/to_chat_immediate(target, message, handle_whitespace = TRUE) - if(!target || !message) - return - - if(target == world) - target = GLOB.clients - - var/original_message = message - if(handle_whitespace) - message = replacetext(message, "\n", "
") - message = replacetext(message, "\t", "[GLOB.TAB][GLOB.TAB]") - - //Replace expanded \icon macro with icon2html - //regex/Replace with a proc won't work here because icon2html takes target as an argument and there is no way to pass it to the replacement proc - //not even hacks with reassigning usr work - var/regex/i = new(@/
-
-
-
- Loading...
- If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
- If it still doesn't work, use the bug report button at the top right of the window. -
- - If this takes longer than 30 seconds, it will automatically reload a maximum of 5 times.
- If it still doesn't work, use the bug report button at the top right of the window. -
-
-
-
-
-
-
-
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
deleted file mode 100644
index 2bdbd8c3c2b..00000000000
--- a/code/modules/goonchat/browserassets/js/browserOutput.js
+++ /dev/null
@@ -1,1171 +0,0 @@
-
-/*****************************************
-*
-* FUNCTION AND VAR DECLARATIONS
-*
-******************************************/
-
-//DEBUG STUFF
-var escaper = encodeURIComponent || escape;
-var decoder = decodeURIComponent || unescape;
-window.onerror = function(msg, url, line, col, error) {
- if (document.location.href.indexOf("proc=debug") <= 0) {
- var extra = !col ? '' : ' | column: ' + col;
- extra += !error ? '' : ' | error: ' + error;
- extra += !navigator.userAgent ? '' : ' | user agent: ' + navigator.userAgent;
- var debugLine = 'Error: ' + msg + ' | url: ' + url + ' | line: ' + line + extra;
- window.location = '?_src_=chat&proc=debug¶m[error]='+escaper(debugLine);
- }
- return true;
-};
-
-//Globals
-window.status = 'Output';
-var $messages, $subOptions, $subAudio, $selectedSub, $contextMenu;
-var last_messages = [];
-var opts = {
- //General
- 'messageCount': 0, //A count...of messages...
- 'messageLimit': 2053, //A limit...for the messages...
- 'scrollSnapTolerance': 10, //If within x pixels of bottom
- 'clickTolerance': 10, //Keep focus if outside x pixels of mousedown position on mouseup
- 'imageRetryDelay': 50, //how long between attempts to reload images (in ms)
- 'imageRetryLimit': 50, //how many attempts should we make?
- 'popups': 0, //Amount of popups opened ever
- 'wasd': false, //Is the user in wasd mode?
- 'priorChatHeight': 0, //Thing for height-resizing detection
- 'restarting': false, //Is the round restarting?
- 'darkmode':false, //Are we using darkmode? If not WHY ARE YOU LIVING IN 2009???
- 'fullscreen':false, //Is fullscreen mode enabled?
-
- //Options menu
- 'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu
- 'suppressSubClose': false, //Whether or not we should be hiding the selected sub menu
- 'highlightTerms': [],
- 'highlightLimit': 5,
- 'highlightColor': '#FFFF00', //The color of the highlighted message
- 'pingDisabled': false, //Has the user disabled the ping counter
-
- //Ping display
- 'lastPang': 0, //Timestamp of the last response from the server.
- 'pangLimit': 35000,
- 'pingTime': 0, //Timestamp of when ping sent
- 'pongTime': 0, //Timestamp of when ping received
- 'noResponse': false, //Tracks the state of the previous ping request
- 'noResponseCount': 0, //How many failed pings?
-
- //Clicks
- 'mouseDownX': null,
- 'mouseDownY': null,
- 'preventFocus': false, //Prevents switching focus to the game window
-
- //Client Connection Data
- 'clientDataLimit': 5,
- 'clientData': [],
-
- //Admin music volume update
- 'volumeUpdateDelay': 5000, //Time from when the volume updates to data being sent to the server
- 'volumeUpdating': false, //True if volume update function set to fire
- 'updatedVolume': 0, //The volume level that is sent to the server
- 'musicStartAt': 0, //The position the music starts playing
- 'musicEndAt': 0, //The position the music... stops playing... if null, doesn't apply (so the music runs through)
-
- 'defaultMusicVolume': 25,
-
- 'messageCombining': true,
- 'messageCombiningCount': 20,
-
-};
-var replaceRegexes = {};
-
-function clamp(val, min, max) {
- return Math.max(min, Math.min(val, max))
-}
-
-//Polyfill for fucking date now because of course IE8 and below don't support it
-if (!Date.now) {
- Date.now = function now() {
- return new Date().getTime();
- };
-}
-//Polyfill for trim() (IE8 and below)
-if (typeof String.prototype.trim !== 'function') {
- String.prototype.trim = function () {
- return this.replace(/^\s+|\s+$/g, '');
- };
-}
-
-// Linkify the contents of a node, within its parent.
-function linkify(parent, insertBefore, text) {
- var start = 0;
- var match;
- var regex = /(?:(?:https?:\/\/)|(?:www\.))(?:[^ ]*?\.[^ ]*?)+[-A-Za-z0-9+&@#\/%?=~_|$!:,.;()]+/ig;
- while ((match = regex.exec(text)) !== null) {
- // add the unmatched text
- parent.insertBefore(document.createTextNode(text.substring(start, match.index)), insertBefore);
-
- var href = match[0];
- if (!/^https?:\/\//i.test(match[0])) {
- href = "http://" + match[0];
- }
-
- // add the link
- var link = document.createElement("a");
- link.href = href;
- link.textContent = match[0];
- parent.insertBefore(link, insertBefore);
-
- start = regex.lastIndex;
- }
- if (start !== 0) {
- // add the remaining text and remove the original text node
- parent.insertBefore(document.createTextNode(text.substring(start)), insertBefore);
- parent.removeChild(insertBefore);
- }
-}
-
-// Recursively linkify the children of a given node.
-function linkify_node(node) {
- var children = node.childNodes;
- // work backwards to avoid the risk of looping forever on our own output
- for (var i = children.length - 1; i >= 0; --i) {
- var child = children[i];
- if (child.nodeType == Node.TEXT_NODE) {
- // text is to be linkified
- linkify(node, child, child.textContent);
- } else if (child.nodeName != "A" && child.nodeName != "a") {
- // do not linkify existing links
- linkify_node(child);
- }
- }
-}
-
-//Shit fucking piece of crap that doesn't work god fuckin damn it
-function linkify_fallback(text) {
- var rex = /((?:The connection has been closed because the server is restarting. Please wait while you automatically reconnect.
', 'internal');
- } else if (data == 'stopMusic') {
- $('#adminMusic').prop('src', '');
- } else {
- //Oh we're actually being sent data instead of an instruction
- var dataJ;
- try {
- dataJ = $.parseJSON(data);
- } catch (e) {
- //But...incorrect :sadtrombone:
- window.onerror('JSON: '+e+'. '+data, 'browserOutput.html', 327);
- return;
- }
- data = dataJ;
-
- if (data.clientData) {
- if (opts.restarting) {
- opts.restarting = false;
- $('.connectionClosed.restarting:not(.restored)').addClass('restored').text('The round restarted and you successfully reconnected!');
- }
- if (!data.clientData.ckey && !data.clientData.ip && !data.clientData.compid) {
- //TODO: Call shutdown perhaps
- return;
- } else {
- handleClientData(data.clientData.ckey, data.clientData.ip, data.clientData.compid);
- }
- sendVolumeUpdate();
- } else if (data.adminMusic) {
- if (typeof data.adminMusic === 'string') {
- var adminMusic = byondDecode(data.adminMusic);
- var bindLoadedData = false;
- adminMusic = adminMusic.match(/https?:\/\/\S+/) || '';
- if (data.musicRate) {
- var newRate = Number(data.musicRate);
- if(newRate) {
- $('#adminMusic').prop('defaultPlaybackRate', newRate);
- }
- } else {
- $('#adminMusic').prop('defaultPlaybackRate', 1.0);
- }
- if (data.musicSeek) {
- opts.musicStartAt = Number(data.musicSeek) || 0;
- bindLoadedData = true;
- } else {
- opts.musicStartAt = 0;
- }
- if (data.musicHalt) {
- opts.musicEndAt = Number(data.musicHalt) || null;
- bindLoadedData = true;
- }
- if (bindLoadedData) {
- $('#adminMusic').one('loadeddata', adminMusicLoadedData);
- }
- $('#adminMusic').prop('src', adminMusic);
- $('#adminMusic').trigger("play");
- }
- } else if (data.syncRegex) {
- for (var i in data.syncRegex) {
-
- var regexData = data.syncRegex[i];
- var regexName = regexData[0];
- var regexFlags = regexData[1];
- var regexReplaced = regexData[2];
-
- replaceRegexes[i] = [new RegExp(regexName, regexFlags), regexReplaced];
- }
- }
- }
-}
-
-function createPopup(contents, width) {
- opts.popups++;
- $('body').append('');
-
- //Attach close popup event
- var $popup = $('#popup'+opts.popups);
- var height = $popup.outerHeight();
- $popup.css({'height': height+'px', 'margin': '-'+(height/2)+'px 0 0 -'+(width/2)+'px'});
-
- $popup.on('click', '.close', function(e) {
- e.preventDefault();
- $popup.remove();
- });
-}
-
-function toggleWasd(state) {
- opts.wasd = (state == 'on' ? true : false);
-}
-
-function sendVolumeUpdate() {
- opts.volumeUpdating = false;
- if(opts.updatedVolume) {
- runByond('?_src_=chat&proc=setMusicVolume¶m[volume]='+opts.updatedVolume);
- }
-}
-
-function adminMusicEndCheck(event) {
- if (opts.musicEndAt) {
- if ($('#adminMusic').prop('currentTime') >= opts.musicEndAt) {
- $('#adminMusic').off(event);
- $('#adminMusic').trigger('pause');
- $('#adminMusic').prop('src', '');
- }
- } else {
- $('#adminMusic').off(event);
- }
-}
-
-function adminMusicLoadedData(event) {
- if (opts.musicStartAt && ($('#adminMusic').prop('duration') === Infinity || (opts.musicStartAt <= $('#adminMusic').prop('duration'))) ) {
- $('#adminMusic').prop('currentTime', opts.musicStartAt);
- }
- if (opts.musicEndAt) {
- $('#adminMusic').on('timeupdate', adminMusicEndCheck);
- }
-}
-
-function subSlideUp() {
- $(this).removeClass('scroll');
- $(this).css('height', '');
-}
-
-function startSubLoop() {
- if (opts.selectedSubLoop) {
- clearInterval(opts.selectedSubLoop);
- }
- return setInterval(function() {
- if (!opts.suppressSubClose && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- }
- }, 5000); //every 5 seconds
-}
-
-function handleToggleClick($sub, $toggle) {
- if ($selectedSub !== $sub && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- }
- $selectedSub = $sub
- if ($selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- } else {
- $selectedSub.slideDown('fast', function() {
- var windowHeight = $(window).height();
- var toggleHeight = $toggle.outerHeight();
- var priorSubHeight = $selectedSub.outerHeight();
- var newSubHeight = windowHeight - toggleHeight;
- $(this).height(newSubHeight);
- if (priorSubHeight > (windowHeight - toggleHeight)) {
- $(this).addClass('scroll');
- }
- });
- opts.selectedSubLoop = startSubLoop();
- }
-}
-
-/*****************************************
-*
-* DOM READY
-*
-******************************************/
-
-if (typeof $ === 'undefined') {
- var div = document.getElementById('loading').childNodes[1];
- div += 'ERROR: Jquery did not load.'; -} - -$(function() { - $messages = $('#messages'); - $subOptions = $('#subOptions'); - $subAudio = $('#subAudio'); - $selectedSub = $subOptions; - - //Hey look it's a controller loop! - setInterval(function() { - if (opts.lastPang + opts.pangLimit < Date.now() && !opts.restarting) { //Every pingLimit - if (!opts.noResponse) { //Only actually append a message if the previous ping didn't also fail (to prevent spam) - opts.noResponse = true; - opts.noResponseCount++; - internalOutput('
You are either AFK, experiencing lag or the connection has closed.
', 'internal');
- }
- } else if (opts.noResponse) { //Previous ping attempt failed ohno
- $('.connectionClosed[data-count="'+opts.noResponseCount+'"]:not(.restored)').addClass('restored').text('Your connection has been restored (probably)!');
- opts.noResponse = false;
- }
- }, 2000); //2 seconds
-
-
- /*****************************************
- *
- * LOAD SAVED CONFIG
- *
- ******************************************/
- var savedConfig = {
- 'sfontSize': getCookie('fontsize'),
- 'slineHeight': getCookie('lineheight'),
- 'spingDisabled': getCookie('pingdisabled'),
- 'shighlightTerms': getCookie('highlightterms'),
- 'shighlightColor': getCookie('highlightcolor'),
- 'smusicVolume': getCookie('musicVolume'),
- 'smessagecombining': getCookie('messagecombining'),
- 'sdarkmode': getCookie('darkmode'),
- 'sfullscreen': getCookie('fullscreen'),
- };
-
- if (savedConfig.sfontSize) {
- $messages.css('font-size', savedConfig.sfontSize);
- internalOutput('Loaded font size setting of: '+savedConfig.sfontSize+'', 'internal');
- }
- if (savedConfig.slineHeight) {
- $("body").css('line-height', savedConfig.slineHeight);
- internalOutput('Loaded line height setting of: '+savedConfig.slineHeight+'', 'internal');
- }
- if(savedConfig.sdarkmode == 'true'){
- swap();
- }
- if(savedConfig.sfullscreen == 'true'){
- fullscreen_check();
- }
- if (savedConfig.spingDisabled) {
- if (savedConfig.spingDisabled == 'true') {
- opts.pingDisabled = true;
- $('#ping').hide();
- }
- internalOutput('Loaded ping display of: '+(opts.pingDisabled ? 'hidden' : 'visible')+'', 'internal');
- }
- if (savedConfig.shighlightTerms) {
- var savedTerms = $.parseJSON(savedConfig.shighlightTerms).filter(function (entry) {
- return entry !== null && /\S/.test(entry);
- });
- var actualTerms = savedTerms.length != 0 ? savedTerms.join(', ') : null;
- if (actualTerms) {
- internalOutput('Loaded highlight strings of: ' + actualTerms+'', 'internal');
- opts.highlightTerms = savedTerms;
- }
- }
- if (savedConfig.shighlightColor) {
- opts.highlightColor = savedConfig.shighlightColor;
- internalOutput('Loaded highlight color of: '+savedConfig.shighlightColor+'', 'internal');
- }
- if (savedConfig.smusicVolume) {
- var newVolume = clamp(savedConfig.smusicVolume, 0, 100);
- $('#adminMusic').prop('volume', newVolume / 100);
- $('#musicVolume').val(newVolume);
- opts.updatedVolume = newVolume;
- sendVolumeUpdate();
- internalOutput('Loaded music volume of: '+savedConfig.smusicVolume+'', 'internal');
- }
- else{
- $('#adminMusic').prop('volume', opts.defaultMusicVolume / 100);
- }
-
- if (savedConfig.smessagecombining) {
- if (savedConfig.smessagecombining == 'false') {
- opts.messageCombining = false;
- } else {
- opts.messageCombining = true;
- }
- }
- (function() {
- var dataCookie = getCookie('connData');
- if (dataCookie) {
- var dataJ;
- try {
- dataJ = $.parseJSON(dataCookie);
- } catch (e) {
- window.onerror('JSON '+e+'. '+dataCookie, 'browserOutput.html', 434);
- return;
- }
- opts.clientData = dataJ;
- }
- })();
-
-
- /*****************************************
- *
- * BASE CHAT OUTPUT EVENTS
- *
- ******************************************/
-
- $('body').on('click', 'a', function(e) {
- e.preventDefault();
- });
-
- $('body').on('mousedown', function(e) {
- var $target = $(e.target);
-
- if ($contextMenu && opts.hasOwnProperty('contextMenuTarget') && opts.contextMenuTarget) {
- hideContextMenu();
- return false;
- }
-
- if ($target.is('a') || $target.parent('a').length || $target.is('input') || $target.is('textarea')) {
- opts.preventFocus = true;
- } else {
- opts.preventFocus = false;
- opts.mouseDownX = e.pageX;
- opts.mouseDownY = e.pageY;
- }
- });
-
- $messages.on('mousedown', function(e) {
- if ($selectedSub && $selectedSub.is(':visible')) {
- $selectedSub.slideUp('fast', subSlideUp);
- clearInterval(opts.selectedSubLoop);
- }
- });
-
- $('body').on('mouseup', function(e) {
- if (!opts.preventFocus &&
- (e.pageX >= opts.mouseDownX - opts.clickTolerance && e.pageX <= opts.mouseDownX + opts.clickTolerance) &&
- (e.pageY >= opts.mouseDownY - opts.clickTolerance && e.pageY <= opts.mouseDownY + opts.clickTolerance)
- ) {
- opts.mouseDownX = null;
- opts.mouseDownY = null;
- runByond('byond://winset?mapwindow.map.focus=true');
- }
- });
-
- $messages.on('click', 'a', function(e) {
- var href = $(this).attr('href');
- $(this).addClass('visited');
- if (href[0] == '?' || (href.length >= 8 && href.substring(0,8) == 'byond://')) {
- runByond(href);
- } else {
- href = escaper(href);
- runByond('?action=openLink&link='+href);
- }
- });
-
- //Fuck everything about this event. Will look into alternatives.
- $('body').on('keydown', function(e) {
- if (e.target.nodeName == 'INPUT' || e.target.nodeName == 'TEXTAREA') {
- return;
- }
-
- if (e.ctrlKey || e.altKey || e.shiftKey) { //Band-aid "fix" for allowing ctrl+c copy paste etc. Needs a proper fix.
- return;
- }
-
- e.preventDefault()
-
- var k = e.which;
- // Hardcoded because else there would be no feedback message.
- if (k == 113) { // F2
- runByond('byond://winset?screenshot=auto');
- internalOutput('Screenshot taken', 'internal');
- }
-
- var c = "";
- switch (k) {
- case 8:
- c = 'BACK';
- case 9:
- c = 'TAB';
- case 13:
- c = 'ENTER';
- case 19:
- c = 'PAUSE';
- case 27:
- c = 'ESCAPE';
- case 33: // Page up
- c = 'NORTHEAST';
- case 34: // Page down
- c = 'SOUTHEAST';
- case 35: // End
- c = 'SOUTHWEST';
- case 36: // Home
- c = 'NORTHWEST';
- case 37:
- c = 'WEST';
- case 38:
- c = 'NORTH';
- case 39:
- c = 'EAST';
- case 40:
- c = 'SOUTH';
- case 45:
- c = 'INSERT';
- case 46:
- c = 'DELETE';
- case 93: // That weird thing to the right of alt gr.
- c = 'APPS';
-
- default:
- c = String.fromCharCode(k);
- }
-
- if (c.length == 0) {
- if (!e.shiftKey) {
- c = c.toLowerCase();
- }
- runByond('byond://winset?mapwindow.map.focus=true;mainwindow.input.text='+c);
- return false;
- } else {
- runByond('byond://winset?mapwindow.map.focus=true');
- return false;
- }
- });
-
- //Mildly hacky fix for scroll issues on mob change (interface gets resized sometimes, messing up snap-scroll)
- $(window).on('resize', function(e) {
- if ($(this).height() !== opts.priorChatHeight) {
- $('body,html').scrollTop($messages.outerHeight());
- opts.priorChatHeight = $(this).height();
- }
- });
-
-
- /*****************************************
- *
- * OPTIONS INTERFACE EVENTS
- *
- ******************************************/
-
- $('body').on('click', '#newMessages', function(e) {
- var messagesHeight = $messages.outerHeight();
- $('body,html').scrollTop(messagesHeight);
- $('#newMessages').remove();
- runByond('byond://winset?mapwindow.map.focus=true');
- });
-
- $('#toggleOptions').click(function(e) {
- handleToggleClick($subOptions, $(this));
- });
- $('#darkmodetoggle').click(function(e) {
- swap();
- });
- $('#fullscreentoggle').click(function(e) {
- fullscreen_check();
- });
- $('#toggleAudio').click(function(e) {
- handleToggleClick($subAudio, $(this));
- });
-
- $('.sub, .toggle').mouseenter(function() {
- opts.suppressSubClose = true;
- });
-
- $('.sub, .toggle').mouseleave(function() {
- opts.suppressSubClose = false;
- });
-
- $('#decreaseFont').click(function(e) {
- var fontSize = parseInt($messages.css('font-size'));
- fontSize = fontSize - 1 + 'px';
- $messages.css({'font-size': fontSize});
- setCookie('fontsize', fontSize, 365);
- internalOutput('Font size set to '+fontSize+'', 'internal');
- });
-
- $('#increaseFont').click(function(e) {
- var fontSize = parseInt($messages.css('font-size'));
- fontSize = fontSize + 1 + 'px';
- $messages.css({'font-size': fontSize});
- setCookie('fontsize', fontSize, 365);
- internalOutput('Font size set to '+fontSize+'', 'internal');
- });
-
- $('#decreaseLineHeight').click(function(e) {
- var Heightline = parseFloat($("body").css('line-height'));
- var Sizefont = parseFloat($("body").css('font-size'));
- var lineheightvar = Heightline / Sizefont
- lineheightvar -= 0.1;
- lineheightvar = lineheightvar.toFixed(1)
- $("body").css({'line-height': lineheightvar});
- setCookie('lineheight', lineheightvar, 365);
- internalOutput('Line height set to '+lineheightvar+'', 'internal');
- });
-
- $('#increaseLineHeight').click(function(e) {
- var Heightline = parseFloat($("body").css('line-height'));
- var Sizefont = parseFloat($("body").css('font-size'));
- var lineheightvar = Heightline / Sizefont
- lineheightvar += 0.1;
- lineheightvar = lineheightvar.toFixed(1)
- $("body").css({'line-height': lineheightvar});
- setCookie('lineheight', lineheightvar, 365);
- internalOutput('Line height set to '+lineheightvar+'', 'internal');
- });
-
- $('#togglePing').click(function(e) {
- if (opts.pingDisabled) {
- $('#ping').slideDown('fast');
- opts.pingDisabled = false;
- } else {
- $('#ping').slideUp('fast');
- opts.pingDisabled = true;
- }
- setCookie('pingdisabled', (opts.pingDisabled ? 'true' : 'false'), 365);
- });
-
- $('#saveLog').click(function(e) {
- // Requires IE 10+ to issue download commands. Just opening a popup
- // window will cause Ctrl+S to save a blank page, ignoring innerHTML.
- if (!window.Blob) {
- output('This function is only supported on IE 10+. Upgrade if possible.', 'internal');
- return;
- }
-
- $.ajax({
- type: 'GET',
- url: 'browserOutput_white.css',
- success: function(styleData) {
- var blob = new Blob(['String Highlighting
' +
- '' +
- '
';
- createPopup(popupContent, 250);
- });
-
- $('body').on('keyup', '#highlightColor', function() {
- var color = $('#highlightColor').val();
- color = color.trim();
- if (!color || color.charAt(0) != '#') return;
- $('#highlightColor').css('background-color', color);
- });
-
- $('body').on('submit', '#highlightTermForm', function(e) {
- e.preventDefault();
-
- opts.highlightTerms = [];
- for (var count = 0; count < opts.highlightLimit; count++) {
- var term = $('#highlightTermInput'+count).val();
- if (term !== null && /\S/.test(term)) {
- opts.highlightTerms.push(term.trim().toLowerCase());
- }
- }
-
- var color = $('#highlightColor').val();
- color = color.trim();
- if (color == '' || color.charAt(0) != '#') {
- opts.highlightColor = '#FFFF00';
- } else {
- opts.highlightColor = color;
- }
- var $popup = $('#highlightPopup').closest('.popup');
- $popup.remove();
-
- setCookie('highlightterms', JSON.stringify(opts.highlightTerms), 365);
- setCookie('highlightcolor', opts.highlightColor, 365);
- });
-
- $('#clearMessages').click(function() {
- $messages.empty();
- opts.messageCount = 0;
- });
-
- $('#musicVolumeSpan').hover(function() {
- $('#musicVolumeText').addClass('hidden');
- $('#musicVolume').removeClass('hidden');
- }, function() {
- $('#musicVolume').addClass('hidden');
- $('#musicVolumeText').removeClass('hidden');
- });
-
- $('#musicVolume').change(function() {
- var newVolume = $('#musicVolume').val();
- newVolume = clamp(newVolume, 0, 100);
- $('#adminMusic').prop('volume', newVolume / 100);
- setCookie('musicVolume', newVolume, 365);
- opts.updatedVolume = newVolume;
- if(!opts.volumeUpdating) {
- setTimeout(sendVolumeUpdate, opts.volumeUpdateDelay);
- opts.volumeUpdating = true;
- }
- });
-
- $('#toggleCombine').click(function(e) {
- opts.messageCombining = !opts.messageCombining;
- setCookie('messagecombining', (opts.messageCombining ? 'true' : 'false'), 365);
- });
-
- $('img.icon').error(iconError);
-
- /*****************************************
- *
- * KICK EVERYTHING OFF
- *
- ******************************************/
-
- runByond('?_src_=chat&proc=doneLoading');
- if ($('#loading').is(':visible')) {
- $('#loading').remove();
- }
- $('#userBar').show();
- opts.priorChatHeight = $(window).height();
-});
diff --git a/code/modules/goonchat/browserassets/js/json2.min.js b/code/modules/goonchat/browserassets/js/json2.min.js
deleted file mode 100644
index d867407f265..00000000000
--- a/code/modules/goonchat/browserassets/js/json2.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"object"!=typeof JSON&&(JSON={}),function(){"use strict";function f(t){return 10>t?"0"+t:t}function this_value(){return this.valueOf()}function quote(t){return rx_escapable.lastIndex=0,rx_escapable.test(t)?'"'+t.replace(rx_escapable,function(t){var e=meta[t];return"string"==typeof e?e:"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+t+'"'}function str(t,e){var r,n,o,u,f,a=gap,i=e[t];switch(i&&"object"==typeof i&&"function"==typeof i.toJSON&&(i=i.toJSON(t)),"function"==typeof rep&&(i=rep.call(e,t,i)),typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";if(gap+=indent,f=[],"[object Array]"===Object.prototype.toString.apply(i)){for(u=i.length,r=0;u>r;r+=1)f[r]=str(r,i)||"null";return o=0===f.length?"[]":gap?"[\n"+gap+f.join(",\n"+gap)+"\n"+a+"]":"["+f.join(",")+"]",gap=a,o}if(rep&&"object"==typeof rep)for(u=rep.length,r=0;u>r;r+=1)"string"==typeof rep[r]&&(n=rep[r],o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));else for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(o=str(n,i),o&&f.push(quote(n)+(gap?": ":":")+o));return o=0===f.length?"{}":gap?"{\n"+gap+f.join(",\n"+gap)+"\n"+a+"}":"{"+f.join(",")+"}",gap=a,o}}var rx_one=/^[\],:{}\s]*$/,rx_two=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,rx_three=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,rx_four=/(?:^|:|,)(?:\s*\[)+/g,rx_escapable=/[\\\"\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,rx_dangerous=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;"function"!=typeof Date.prototype.toJSON&&(Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},Boolean.prototype.toJSON=this_value,Number.prototype.toJSON=this_value,String.prototype.toJSON=this_value);var gap,indent,meta,rep;"function"!=typeof JSON.stringify&&(meta={"\b":"\\b"," ":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},JSON.stringify=function(t,e,r){var n;if(gap="",indent="","number"==typeof r)for(n=0;r>n;n+=1)indent+=" ";else"string"==typeof r&&(indent=r);if(rep=e,e&&"function"!=typeof e&&("object"!=typeof e||"number"!=typeof e.length))throw new Error("JSON.stringify");return str("",{"":t})}),"function"!=typeof JSON.parse&&(JSON.parse=function(text,reviver){function walk(t,e){var r,n,o=t[e];if(o&&"object"==typeof o)for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(n=walk(o,r),void 0!==n?o[r]=n:delete o[r]);return reviver.call(t,e,o)}var j;if(text=String(text),rx_dangerous.lastIndex=0,rx_dangerous.test(text)&&(text=text.replace(rx_dangerous,function(t){return"\\u"+("0000"+t.charCodeAt(0).toString(16)).slice(-4)})),rx_one.test(text.replace(rx_two,"@").replace(rx_three,"]").replace(rx_four,"")))return j=eval("("+text+")"),"function"==typeof reviver?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}();
\ No newline at end of file
diff --git a/code/modules/goonchat/helpers.dm b/code/modules/goonchat/helpers.dm
deleted file mode 100644
index 153d0669286..00000000000
--- a/code/modules/goonchat/helpers.dm
+++ /dev/null
@@ -1,33 +0,0 @@
-GLOBAL_VAR_INIT(TAB, " ")
-
-GLOBAL_DATUM_INIT(is_http_protocol, /regex, regex("^https?://"))
-
-GLOBAL_LIST_INIT(symbols_unicode_keys, list(
- "�" = "‚",
- "�" = "„",
- "�" = "…",
- "�" = "†",
- "�" = "‡",
- "�" = "‰",
- "�" = "‹",
- "�" = "‘",
- "�" = "’",
- "�" = "“",
- "�" = "”",
- "�" = "•",
- "�" = "–",
- "�" = "—",
- "�" = "™"
-))
-/proc/symbols_to_unicode(text)
- for(var/key in GLOB.symbols_unicode_keys)
- text = replacetext(text, key, GLOB.symbols_unicode_keys[key])
- return text
-
-/proc/color_macro_to_html(text)
- text = replacetext(text,"\red","")
- text = replacetext(text,"\blue","")
- text = replacetext(text,"\green","")
- return text
-
-
diff --git a/code/modules/hivemind/machines.dm b/code/modules/hivemind/machines.dm
index 416aa61e433..6ceafd38f4d 100755
--- a/code/modules/hivemind/machines.dm
+++ b/code/modules/hivemind/machines.dm
@@ -176,9 +176,9 @@
var/list/range_list = list()
var/list/target_list = list()
if(in_hear_range)
- range_list = hearers(range, src)
+ range_list = hearers(range, get_turf(src))
else
- range_list = range(range, src)
+ range_list = range(range, get_turf(src))
for(var/atom/movable/M in range_list)
var/mob/target = M.get_mob()
if(target)
@@ -187,7 +187,7 @@
/obj/machinery/hivemind_machine/proc/is_attackable(mob/living/target)
- if(!target.stat || target.health >= (ishuman(target) ? HEALTH_THRESHOLD_CRIT : 0))
+ if(!target.stat || target.health >= (ishuman(target) ? CONFIG_GET(number/health_threshold_crit) : 0))
return TRUE
return FALSE
diff --git a/code/modules/hivemind/mobs.dm b/code/modules/hivemind/mobs.dm
index b6d0fb286ae..f2e350ca7da 100644
--- a/code/modules/hivemind/mobs.dm
+++ b/code/modules/hivemind/mobs.dm
@@ -359,7 +359,7 @@
ranged = TRUE
rapid = FALSE //Visual Studio screamed at me for trying to use FALSE/TRUE in procs below
minimum_distance = 3 //having minimum_distance too high often resulted in the mob trying to melee
- fire_verb = "lobs a ball of goo" //reminder that the attack message is "\red [src] [fire_verb] at [target]!"
+ fire_verb = "lobs a ball of goo" //reminder that the attack message is span_red("[src] [fire_verb] at [target]!")
projectiletype = /obj/item/projectile/goo/weak //what projectile it uses. Since ranged_cooldown is 2 short seconds, it's better to have a weaker projectile
projectilesound = 'sound/effects/blobattack.ogg'
ranged_cooldown = 2 SECONDS
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index ca5eb2cae02..942b603a653 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -132,7 +132,7 @@
safety_disabled = 1
update_projections()
to_chat(user, span_notice("You vastly increase projector power and override the safety and security protocols."))
- to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [company_name] maintenance and do not use the simulator.")
+ to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call [GLOB.company_name] maintenance and do not use the simulator.")
log_game("[key_name(usr)] emagged the Holodeck Control Computer")
src.updateUsrDialog()
return 1
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index 0b373dba706..027f87e918a 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -266,7 +266,7 @@
if(src.density && istype(I, /obj/item) && !istype(I, /obj/item/card))
var/aforce = I.force
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
- visible_message("\red [src] was hit by [I].")
+ visible_message(span_red("[src] was hit by [I]."))
if(I.damtype == BRUTE || I.damtype == BURN)
take_damage(aforce)
return
diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm
index 6c239b5b712..31f49e67fde 100644
--- a/code/modules/holomap/generate_holomap.dm
+++ b/code/modules/holomap/generate_holomap.dm
@@ -24,7 +24,7 @@
/// Generates all the holo minimaps, initializing it all nicely, probably.
/datum/controller/subsystem/holomaps/proc/generateHoloMinimaps()
- var/start_time = world.timeofday
+ rustg_time_reset(SS_HOLOMAPS_TIMER_KEY)
// Build the base map for each z level
for (var/z = 1 to GLOB.maps_data.station_levels.len)
holoMiniMaps |= z // hack, todo fix
@@ -38,8 +38,13 @@
for(var/smoosh_list in GLOB.maps_data.holomap_smoosh)
smooshTetherHolomaps(smoosh_list)
+ var/time = rustg_time_milliseconds(SS_HOLOMAPS_TIMER_KEY)
+ var/seconds = round(time / 1000, 0.01)
+
holomaps_initialized = TRUE
- admin_notice(span_danger("Holomaps initialized in [round(0.1*(world.timeofday-start_time),0.1)] seconds."), R_DEBUG)
+ var/msg = "Generated Holomaps within [seconds] second[seconds == 1 ? "" : "s"]!"
+ to_chat(world, span_boldannounce(msg))
+ log_world(msg)
// TODO - Check - They had a delayed init perhaps?
for (var/obj/machinery/holomap/S in station_holomaps)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index b6eba7ec348..3d4b95bfd0d 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -27,14 +27,14 @@
if(!plantname)
return
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
- seed = plant_controller.seeds[plantname]
+ seed = SSplants.seeds[plantname]
if(!seed)
return
@@ -67,15 +67,15 @@
if(!seed)
return
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
- if(plant_controller.product_descs["[seed.uid]"])
- desc = plant_controller.product_descs["[seed.uid]"]
+ if(SSplants.product_descs["[seed.uid]"])
+ desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
@@ -127,17 +127,17 @@
desc += " mushroom"
else
desc += " fruit"
- plant_controller.product_descs["[seed.uid]"] = desc
+ SSplants.product_descs["[seed.uid]"] = desc
desc += ". Delicious! Probably."
/obj/item/reagent_containers/food/snacks/grown/update_icon()
- if(!seed || !plant_controller || !plant_controller.plant_icon_cache)
+ if(!seed || !SSplants || !SSplants.plant_icon_cache)
return
cut_overlays()
var/image/plant_icon
var/icon_key = "fruit-[seed.get_trait(TRAIT_PRODUCT_ICON)]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"
- if(plant_controller.plant_icon_cache[icon_key])
- plant_icon = plant_controller.plant_icon_cache[icon_key]
+ if(SSplants.plant_icon_cache[icon_key])
+ plant_icon = SSplants.plant_icon_cache[icon_key]
else
plant_icon = image('icons/obj/hydroponics_products.dmi',"blank")
var/image/fruit_base = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-product")
@@ -147,7 +147,7 @@
var/image/fruit_leaves = image('icons/obj/hydroponics_products.dmi',"[seed.get_trait(TRAIT_PRODUCT_ICON)]-leaf")
fruit_leaves.color = "[seed.get_trait(TRAIT_PLANT_COLOUR)]"
plant_icon.overlays |= (fruit_leaves)
- plant_controller.plant_icon_cache[icon_key] = plant_icon
+ SSplants.plant_icon_cache[icon_key] = plant_icon
overlays |= plant_icon
/obj/item/reagent_containers/food/snacks/grown/Crossed(var/mob/living/M)
diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm
index b7a458d7a78..d0724f3a18d 100644
--- a/code/modules/hydroponics/grown_inedible.dm
+++ b/code/modules/hydroponics/grown_inedible.dm
@@ -16,7 +16,7 @@
//Handle some post-spawn var stuff.
if(planttype)
plantname = planttype
- var/datum/seed/S = plant_controller.seeds[plantname]
+ var/datum/seed/S = SSplants.seeds[plantname]
if(!S || !S.chems)
return
diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
index 57cf7927914..1b71fa1b123 100644
--- a/code/modules/hydroponics/seed.dm
+++ b/code/modules/hydroponics/seed.dm
@@ -17,7 +17,7 @@
return F
/datum/computer_file/binary/plantgene/proc/update_name()
- filename = "PL_GENE_[plant_controller.gene_tag_masks[genetype]]_[genesource_uid]"
+ filename = "PL_GENE_[SSplants.gene_tag_masks[genetype]]_[genesource_uid]"
/datum/computer_file/binary/plantgene/nano_ui_data()
var/list/data = list(
@@ -26,7 +26,7 @@
"strain" = genesource_uid,
"tag" = genetype,
"size" = size,
- "mask" = plant_controller.gene_tag_masks[genetype]
+ "mask" = SSplants.gene_tag_masks[genetype]
)
return data
@@ -378,8 +378,8 @@
seed_noun = pick("spores","nodes","cuttings","seeds")
set_trait(TRAIT_POTENCY,rand(5,30),200,0)
- set_trait(TRAIT_PRODUCT_ICON,pick(plant_controller.plant_product_sprites))
- set_trait(TRAIT_PLANT_ICON,pick(plant_controller.plant_sprites))
+ set_trait(TRAIT_PRODUCT_ICON,pick(SSplants.plant_product_sprites))
+ set_trait(TRAIT_PLANT_ICON,pick(SSplants.plant_sprites))
set_trait(TRAIT_PLANT_COLOUR,get_random_colour(0,75,190))
set_trait(TRAIT_PRODUCT_COLOUR,get_random_colour(0,75,190))
update_growth_stages()
@@ -717,10 +717,10 @@
H.sanity.changeLevel(2.5)
//This may be a new line. Update the global if it is.
- if(name == "new line" || !(name in plant_controller.seeds))
- uid = plant_controller.seeds.len + 1
+ if(name == "new line" || !(name in SSplants.seeds))
+ uid = SSplants.seeds.len + 1
name = "[uid]"
- plant_controller.seeds[name] = src
+ SSplants.seeds[name] = src
if(harvest_sample)
var/obj/item/seeds/seeds = new(get_turf(user))
@@ -804,6 +804,6 @@
/datum/seed/proc/update_growth_stages()
if(get_trait(TRAIT_PLANT_ICON))
- growth_stages = plant_controller.plant_sprites[get_trait(TRAIT_PLANT_ICON)]
+ growth_stages = SSplants.plant_sprites[get_trait(TRAIT_PLANT_ICON)]
else
- growth_stages = plant_controller.plant_sprites[get_trait("bush1")]
+ growth_stages = SSplants.plant_sprites[get_trait("bush1")]
diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm
index ca4174d5700..fd7a4c4b988 100644
--- a/code/modules/hydroponics/seed_machines.dm
+++ b/code/modules/hydroponics/seed_machines.dm
@@ -102,10 +102,10 @@
if(!seed)
return 1
- if(seed.seed.name == "new line" || isnull(plant_controller.seeds[seed.seed.name]))
- seed.seed.uid = plant_controller.seeds.len + 1
+ if(seed.seed.name == "new line" || isnull(SSplants.seeds[seed.seed.name]))
+ seed.seed.uid = SSplants.seeds.len + 1
seed.seed.name = "[seed.seed.uid]"
- plant_controller.seeds[seed.seed.name] = seed.seed
+ SSplants.seeds[seed.seed.name] = seed.seed
seed.update_seed()
@@ -170,8 +170,8 @@
var/list/data = ..()
var/list/geneMasks = list()
- for(var/gene_tag in plant_controller.gene_tag_masks)
- geneMasks.Add(list(list("tag" = gene_tag, "mask" = plant_controller.gene_tag_masks[gene_tag])))
+ for(var/gene_tag in SSplants.gene_tag_masks)
+ geneMasks.Add(list(list("tag" = gene_tag, "mask" = SSplants.gene_tag_masks[gene_tag])))
data["geneMasks"] = geneMasks
if(seed && genes_processed)
@@ -266,7 +266,7 @@
stat_multiplier = min(usr.stats.getMult(STAT_BIO, STAT_LEVEL_GODLIKE), usr.stats.getMult(STAT_COG, STAT_LEVEL_GODLIKE))
seed.modified += round(rand(30, 50) * stat_multiplier)
- if(!isnull(plant_controller.seeds[seed.seed.name]))
+ if(!isnull(SSplants.seeds[seed.seed.name]))
seed.seed = seed.seed.diverge(1)
seed.seed_type = seed.seed.name
seed.update_seed()
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 8d68570c605..fd3ac666f08 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -17,8 +17,8 @@ var/global/list/plant_seed_sprites = list()
//Grabs the appropriate seed datum from the global list.
/obj/item/seeds/proc/update_seed()
- if(!seed && seed_type && !isnull(plant_controller.seeds) && plant_controller.seeds[seed_type])
- seed = plant_controller.seeds[seed_type]
+ if(!seed && seed_type && !isnull(SSplants.seeds) && SSplants.seeds[seed_type])
+ seed = SSplants.seeds[seed_type]
update_appearance()
//Updates strings and icon appropriately based on seed datum.
@@ -75,7 +75,7 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/random/New()
..()
- seed = plant_controller.create_random_seed()
+ seed = SSplants.create_random_seed()
seed_type = seed.name
update_seed()
diff --git a/code/modules/hydroponics/spreading/spacevines.dm b/code/modules/hydroponics/spreading/spacevines.dm
index daebd8e78ac..fa2f3cd07a5 100644
--- a/code/modules/hydroponics/spreading/spacevines.dm
+++ b/code/modules/hydroponics/spreading/spacevines.dm
@@ -31,7 +31,7 @@
origin.break_open()
T = get_turf(origin)
- var/datum/seed/seed = plant_controller.create_random_seed(1)
+ var/datum/seed/seed = SSplants.create_random_seed(1)
seed.set_trait(TRAIT_SPREAD,3) // So it will function properly as vines.
seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects.
seed.set_trait(TRAIT_MATURATION,rand(maturation_min, maturation_max))
diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm
index fb738cbbdf7..3cb9a18eb7d 100644
--- a/code/modules/hydroponics/spreading/spreading.dm
+++ b/code/modules/hydroponics/spreading/spreading.dm
@@ -51,10 +51,10 @@
var/near_external = FALSE
/obj/effect/plant/Destroy()
- if(plant_controller)
- plant_controller.remove_plant(src)
+ if(SSplants)
+ SSplants.remove_plant(src)
for(var/obj/effect/plant/neighbor in range(1,src))
- plant_controller.add_plant(neighbor)
+ SSplants.add_plant(neighbor)
if(seed.type == /datum/seed/mushroom/maintshroom)
GLOB.all_maintshrooms -= src
. = ..()
@@ -71,15 +71,15 @@
else
parent = newparent
- if(!plant_controller)
+ if(!SSplants)
sleep(250) // ugly hack, should mean roundstart plants are fine.
- if(!plant_controller)
+ if(!SSplants)
to_chat(world, span_danger("Plant controller does not exist and [src] requires it. Aborting."))
qdel(src)
return
if(!istype(newseed))
- newseed = plant_controller.seeds[DEFAULT_SEED]
+ newseed = SSplants.seeds[DEFAULT_SEED]
seed = newseed
if(!seed)
qdel(src)
@@ -134,7 +134,7 @@
if(seed.get_trait(TRAIT_WALL_HUGGER))
set_dir(calc_dir())
update_icon()
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
// Some plants eat through plating.
if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm
index 6f10b39aadb..b7d304011a8 100755
--- a/code/modules/hydroponics/spreading/spreading_growth.dm
+++ b/code/modules/hydroponics/spreading/spreading_growth.dm
@@ -125,7 +125,7 @@
// We shouldn't have spawned if the controller doesn't exist.
check_health(FALSE)//Dont want to update the icon every process
if(neighbors.len || health != max_health)
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
if (seed.get_trait(TRAIT_CHEM_SPRAYER) && !spray_cooldown)
var/turf/mainloc = get_turf(src)
@@ -274,7 +274,7 @@
continue
for(var/obj/effect/plant/neighbor in check_turf.contents)
neighbor.neighbors |= check_turf
- plant_controller.add_plant(neighbor)
+ SSplants.add_plant(neighbor)
QDEL_IN(src, 1)
diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm
index 16c8617df4e..91b94d3a2fa 100644
--- a/code/modules/hydroponics/spreading/spreading_response.dm
+++ b/code/modules/hydroponics/spreading/spreading_response.dm
@@ -45,7 +45,7 @@
/obj/effect/plant/attackby(var/obj/item/W, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*1.5)
- plant_controller.add_plant(src)
+ SSplants.add_plant(src)
if(istype(W, /obj/item/reagent_containers/syringe))
return
diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
index aae57527b98..16b22138795 100644
--- a/code/modules/hydroponics/trays/tray.dm
+++ b/code/modules/hydroponics/trays/tray.dm
@@ -300,7 +300,7 @@
//Remove the seed if something is already planted.
if(seed) seed = null
- seed = plant_controller.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
+ seed = SSplants.seeds[pick(list("reishi","nettles","amanita","mushrooms","plumphelmet","towercap","harebells","weeds"))]
if(!seed) return //Weed does not exist, someone fucked up.
dead = 0
@@ -330,7 +330,7 @@
// We need to make sure we're not modifying one of the global seed datums.
// If it's not in the global list, then no products of the line have been
// harvested yet and it's safe to assume it's restricted to this tray.
- if(!isnull(plant_controller.seeds[seed.name]))
+ if(!isnull(SSplants.seeds[seed.name]))
seed = seed.diverge()
seed.mutate(severity,get_turf(src))
@@ -385,8 +385,8 @@
/obj/machinery/portable_atmospherics/hydroponics/proc/mutate_species()
var/previous_plant = seed.display_name
var/newseed = seed.get_mutant_variant()
- if(newseed in plant_controller.seeds)
- seed = plant_controller.seeds[newseed]
+ if(newseed in SSplants.seeds)
+ seed = SSplants.seeds[newseed]
else
return
diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm
index 918258adddf..bf1f6a7391d 100644
--- a/code/modules/hydroponics/trays/tray_update_icons.dm
+++ b/code/modules/hydroponics/trays/tray_update_icons.dm
@@ -26,7 +26,7 @@
overlays += "over_lowhealth3"
if(dead)
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-dead"
- var/image/dead_overlay = plant_controller.plant_icon_cache["[ikey]"]
+ var/image/dead_overlay = SSplants.plant_icon_cache["[ikey]"]
if(!dead_overlay)
dead_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
dead_overlay.color = DEAD_PLANT_COLOUR
@@ -46,19 +46,19 @@
maturation = 1
overlay_stage = maturation ? max(1,round(age/maturation)) : 1
var/ikey = "[seed.get_trait(TRAIT_PLANT_ICON)]-[overlay_stage]"
- var/image/plant_overlay = plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+ var/image/plant_overlay = SSplants.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
if(!plant_overlay)
plant_overlay = image('icons/obj/hydroponics_growing.dmi', "[ikey]")
plant_overlay.color = seed.get_trait(TRAIT_PLANT_COLOUR)
- plant_controller.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
+ SSplants.plant_icon_cache["[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"] = plant_overlay
overlays |= plant_overlay
if(harvest && overlay_stage == seed.growth_stages)
ikey = "[seed.get_trait(TRAIT_PRODUCT_ICON)]"
- var/image/harvest_overlay = plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
+ var/image/harvest_overlay = SSplants.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PLANT_COLOUR)]"]
if(!harvest_overlay)
harvest_overlay = image('icons/obj/hydroponics_products.dmi', "[ikey]")
harvest_overlay.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
- plant_controller.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
+ SSplants.plant_icon_cache["product-[ikey]-[seed.get_trait(TRAIT_PRODUCT_COLOUR)]"] = harvest_overlay
overlays |= harvest_overlay
//Draw the cover.
if(closed_system)
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 8daec450b0d..5767ec31b49 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -75,7 +75,7 @@
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
return
if(ishuman(user))
- if(!user.get_active_hand())
+ if(!user.get_active_held_item())
user.put_in_hands(choice)
else
choice.loc = get_turf(src)
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index b47662a6342..6a0bd15d449 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -240,7 +240,7 @@
var/obj/item/barcodescanner/scanner = W
scanner.computer = src
to_chat(user, "[scanner]'s associated machine has been set to [src].")
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src] lets out a low, short blip.", 2)
else
..()
@@ -275,7 +275,7 @@
bibledelay = 0
else
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src]'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\"")
if("7")
@@ -354,7 +354,7 @@
if(!dbcon.IsConnected())
alert("Connection to Archive has been severed. Aborting.")
if(bibledelay)
- for (var/mob/V in hearers(src))
+ for (var/mob/V in hearers(get_turf(src)))
V.show_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
else
bibledelay = 1
diff --git a/code/modules/logging/categories/log_category_admin.dm b/code/modules/logging/categories/log_category_admin.dm
new file mode 100644
index 00000000000..713f3eb709a
--- /dev/null
+++ b/code/modules/logging/categories/log_category_admin.dm
@@ -0,0 +1,21 @@
+/datum/log_category/admin
+ category = LOG_CATEGORY_ADMIN
+ config_flag = /datum/config_entry/flag/log_admin
+
+/datum/log_category/admin_dsay
+ category = LOG_CATEGORY_ADMIN_DSAY
+ master_category = /datum/log_category/admin
+ config_flag = /datum/config_entry/flag/log_admin
+
+// private categories //
+
+/datum/log_category/admin_private
+ category = LOG_CATEGORY_ADMIN_PRIVATE
+ config_flag = /datum/config_entry/flag/log_admin
+ secret = TRUE
+
+/datum/log_category/admin_asay
+ category = LOG_CATEGORY_ADMIN_PRIVATE_ASAY
+ master_category = /datum/log_category/admin_private
+ config_flag = /datum/config_entry/flag/log_adminchat
+ secret = TRUE
diff --git a/code/modules/logging/categories/log_category_compats.dm b/code/modules/logging/categories/log_category_compats.dm
new file mode 100644
index 00000000000..2cf7343f01e
--- /dev/null
+++ b/code/modules/logging/categories/log_category_compats.dm
@@ -0,0 +1,7 @@
+/datum/log_category/game_compat
+ category = LOG_CATEGORY_COMPAT_GAME
+ master_category = /datum/log_category/game
+ config_flag = /datum/config_entry/flag/logging_compat_adminprivate
+
+/datum/config_entry/flag/logging_compat_adminprivate
+ default = FALSE
diff --git a/code/modules/logging/categories/log_category_debug.dm b/code/modules/logging/categories/log_category_debug.dm
new file mode 100644
index 00000000000..eb8d04bae30
--- /dev/null
+++ b/code/modules/logging/categories/log_category_debug.dm
@@ -0,0 +1,42 @@
+/datum/log_category/debug
+ category = LOG_CATEGORY_DEBUG
+
+/datum/log_category/debug_tgui
+ category = LOG_CATEGORY_DEBUG_TGUI
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_sql
+ category = LOG_CATEGORY_DEBUG_SQL
+ master_category = /datum/log_category/debug
+
+// #ifndef DISABLE_DREAMLUAU
+// /datum/log_category/debug_lua
+// category = LOG_CATEGORY_DEBUG_LUA
+// master_category = /datum/log_category/debug
+// #endif
+
+/datum/log_category/debug_href
+ category = LOG_CATEGORY_DEBUG_HREF
+ master_category = /datum/log_category/debug
+
+// This is not in the debug master category on purpose, do not add it
+/datum/log_category/debug_runtime
+ category = LOG_CATEGORY_RUNTIME
+ internal_formatting = FALSE
+
+/datum/log_category/debug_mapping
+ category = LOG_CATEGORY_DEBUG_MAPPING
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_mobtag
+ category = LOG_CATEGORY_DEBUG_MOBTAG
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_asset
+ category = LOG_CATEGORY_DEBUG_ASSET
+ config_flag = /datum/config_entry/flag/log_asset
+ master_category = /datum/log_category/debug
+
+/datum/log_category/debug_qdel
+ category = LOG_CATEGORY_DEBUG_QDEL
+ master_category = /datum/log_category/debug
diff --git a/code/modules/logging/categories/log_category_game.dm b/code/modules/logging/categories/log_category_game.dm
new file mode 100644
index 00000000000..4acf1fb05a2
--- /dev/null
+++ b/code/modules/logging/categories/log_category_game.dm
@@ -0,0 +1,48 @@
+/datum/log_category/game
+ category = LOG_CATEGORY_GAME
+ config_flag = /datum/config_entry/flag/log_game
+
+/datum/log_category/game_vote
+ category = LOG_CATEGORY_GAME_VOTE
+ config_flag = /datum/config_entry/flag/log_vote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_emote
+ category = LOG_CATEGORY_GAME_EMOTE
+ config_flag = /datum/config_entry/flag/log_emote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_radio_emote
+ category = LOG_CATEGORY_GAME_RADIO_EMOTE
+ config_flag = /datum/config_entry/flag/log_emote
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_topic
+ category = LOG_CATEGORY_GAME_TOPIC
+ config_flag = /datum/config_entry/flag/log_world_topic
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_say
+ category = LOG_CATEGORY_GAME_SAY
+ config_flag = /datum/config_entry/flag/log_say
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_whisper
+ category = LOG_CATEGORY_GAME_WHISPER
+ config_flag = /datum/config_entry/flag/log_whisper
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_ooc
+ category = LOG_CATEGORY_GAME_OOC
+ config_flag = /datum/config_entry/flag/log_ooc
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_prayer
+ category = LOG_CATEGORY_GAME_PRAYER
+ config_flag = /datum/config_entry/flag/log_prayer
+ master_category = /datum/log_category/game
+
+/datum/log_category/game_access
+ category = LOG_CATEGORY_GAME_ACCESS
+ config_flag = /datum/config_entry/flag/log_access
+ master_category = /datum/log_category/game
diff --git a/code/modules/logging/categories/log_category_internal.dm b/code/modules/logging/categories/log_category_internal.dm
new file mode 100644
index 00000000000..d0b363e6365
--- /dev/null
+++ b/code/modules/logging/categories/log_category_internal.dm
@@ -0,0 +1,6 @@
+/datum/log_category/internal
+ category = LOG_CATEGORY_INTERNAL_ERROR
+
+/datum/log_category/internal_unknown_category
+ category = LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND
+ master_category = /datum/log_category/internal
diff --git a/code/modules/logging/categories/log_category_misc.dm b/code/modules/logging/categories/log_category_misc.dm
new file mode 100644
index 00000000000..9488f44af77
--- /dev/null
+++ b/code/modules/logging/categories/log_category_misc.dm
@@ -0,0 +1,61 @@
+/datum/log_category/virus
+ category = LOG_CATEGORY_VIRUS
+ config_flag = /datum/config_entry/flag/log_virus
+
+// /datum/log_category/tool
+// category = LOG_CATEGORY_TOOL
+// config_flag = /datum/config_entry/flag/log_tools
+
+// TODO: LOG MECH SHTIJSD
+// /datum/log_category/mecha
+// category = LOG_CATEGORY_MECHA
+// config_flag = /datum/config_entry/flag/log_mecha
+
+/datum/log_category/silicon
+ category = LOG_CATEGORY_SILICON
+ config_flag = /datum/config_entry/flag/log_silicon
+
+/datum/log_category/paper
+ category = LOG_CATEGORY_PAPER
+
+/datum/log_category/attack
+ category = LOG_CATEGORY_ATTACK
+ config_flag = /datum/config_entry/flag/log_attack
+
+/datum/log_category/economy
+ category = LOG_CATEGORY_ECONOMY
+ config_flag = /datum/config_entry/flag/log_econ
+
+/datum/log_category/manifest
+ category = LOG_CATEGORY_MANIFEST
+ config_flag = /datum/config_entry/flag/log_manifest
+
+// TODO: LOG SHUTTLE STUFF
+// /datum/log_category/shuttle
+// category = LOG_CATEGORY_SHUTTLE
+// config_flag = /datum/config_entry/flag/log_shuttle
+
+/datum/log_category/supicious_login
+ category = LOG_CATEGORY_SUSPICIOUS_LOGIN
+ config_flag = /datum/config_entry/flag/log_suspicious_login
+
+/datum/log_category/config
+ category = LOG_CATEGORY_CONFIG
+
+/datum/log_category/filter
+ category = LOG_CATEGORY_FILTER
+
+/datum/log_category/signal
+ category = LOG_CATEGORY_SIGNAL
+
+/datum/log_category/dynamic
+ category = LOG_CATEGORY_DYNAMIC
+
+/datum/log_category/telecomms
+ category = LOG_CATEGORY_TELECOMMS
+ config_flag = /datum/config_entry/flag/log_telecomms
+
+/datum/log_category/speech_indicator
+ category = LOG_CATEGORY_SPEECH_INDICATOR
+ config_flag = /datum/config_entry/flag/log_speech_indicators
+
diff --git a/code/modules/logging/categories/log_category_pda.dm b/code/modules/logging/categories/log_category_pda.dm
new file mode 100644
index 00000000000..aefb8776f20
--- /dev/null
+++ b/code/modules/logging/categories/log_category_pda.dm
@@ -0,0 +1,11 @@
+/datum/log_category/pda
+ category = LOG_CATEGORY_PDA
+ config_flag = /datum/config_entry/flag/log_pda
+
+/datum/log_category/pda_chat
+ category = LOG_CATEGORY_PDA_CHAT
+ master_category = /datum/log_category/pda
+
+/datum/log_category/pda_comment
+ category = LOG_CATEGORY_PDA_COMMENT
+ master_category = /datum/log_category/pda
diff --git a/code/modules/logging/categories/log_category_target_zone_switch.dm b/code/modules/logging/categories/log_category_target_zone_switch.dm
new file mode 100644
index 00000000000..2e5b9cc3e1f
--- /dev/null
+++ b/code/modules/logging/categories/log_category_target_zone_switch.dm
@@ -0,0 +1,3 @@
+/datum/log_category/target_zone_switch
+ category = LOG_CATEGORY_TARGET_ZONE_SWITCH
+ config_flag = /datum/config_entry/flag/log_zone_switch
diff --git a/code/modules/logging/categories/log_category_uplink.dm b/code/modules/logging/categories/log_category_uplink.dm
new file mode 100644
index 00000000000..1418e8c2a3a
--- /dev/null
+++ b/code/modules/logging/categories/log_category_uplink.dm
@@ -0,0 +1,23 @@
+/datum/log_category/uplink
+ category = LOG_CATEGORY_UPLINK
+ config_flag = /datum/config_entry/flag/log_uplink
+
+// /datum/log_category/uplink_malf
+// category = LOG_CATEGORY_UPLINK_MALF
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_heretic
+// category = LOG_CATEGORY_UPLINK_HERETIC
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_changeling
+// category = LOG_CATEGORY_UPLINK_CHANGELING
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
+
+// /datum/log_category/uplink_spell
+// category = LOG_CATEGORY_UPLINK_SPELL
+// config_flag = /datum/config_entry/flag/log_uplink
+// master_category = /datum/log_category/uplink
diff --git a/code/modules/logging/log_category.dm b/code/modules/logging/log_category.dm
new file mode 100644
index 00000000000..c2bfd28f7a1
--- /dev/null
+++ b/code/modules/logging/log_category.dm
@@ -0,0 +1,65 @@
+/// The main datum that contains all log entries for a category
+/datum/log_category
+ /// The category name
+ var/category
+
+ /// The schema version of this log category.
+ /// Expected format of "Major.Minor.Patch"
+ var/schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ /// The master category that contains this category
+ var/datum/log_category/master_category
+
+ /// If set this config flag is checked to enable this log category
+ var/config_flag
+
+ /// Whether or not this log should not be publically visible
+ var/secret = FALSE
+
+ /// The list of header information for this category. Used for log file re-initialization
+ var/list/category_header
+
+ /// Whether the readable version of the log message is formatted internally instead of by rustg
+ var/internal_formatting = TRUE
+
+ /// List of log entries for this category
+ var/list/entries = list()
+
+ /// Total number of entries this round so far
+ var/entry_count = 0
+
+GENERAL_PROTECT_DATUM(/datum/log_category)
+
+/// Add an entry to this category. It is very important that any data you provide doesn't hold references to anything!
+/datum/log_category/proc/create_entry(message, list/data, list/semver_store, severity)
+ var/datum/log_entry/entry = new(
+ // world state contains raw timestamp
+ timestamp = logger.human_readable_timestamp(),
+ category = category,
+ message = message,
+ data = data,
+ semver_store = semver_store,
+ severity = severity
+ )
+
+ write_entry(entry)
+ entry_count += 1
+ if(entry_count <= CONFIG_MAX_CACHED_LOG_ENTRIES)
+ entries += entry
+
+/// Allows for category specific file splitting. Needs to accept a null entry for the default file.
+/// If master_category it will always return the output of master_category.get_output_file(entry)
+/datum/log_category/proc/get_output_file(list/entry, extension = "log.json")
+ if(master_category)
+ return master_category.get_output_file(entry, extension)
+ if(secret)
+ return "[GLOB.log_directory]/secret/[category].[extension]"
+ return "[GLOB.log_directory]/[category].[extension]"
+
+/// Writes an entry to the output file(s) for the category
+/datum/log_category/proc/write_entry(datum/log_entry/entry)
+ // config isn't loaded? assume we want human readable logs
+ if(isnull(config) || CONFIG_GET(flag/log_as_human_readable))
+ entry.write_readable_entry_to_file(get_output_file(entry, "log"), format_internally = internal_formatting)
+
+ entry.write_entry_to_file(get_output_file(entry))
diff --git a/code/modules/logging/log_entry.dm b/code/modules/logging/log_entry.dm
new file mode 100644
index 00000000000..65121b6db1c
--- /dev/null
+++ b/code/modules/logging/log_entry.dm
@@ -0,0 +1,123 @@
+
+// Schema version must always be the very last element in the array.
+
+// Current Schema: 1.0.0
+// [timestamp, category, message, data, world_state, semver_store, id, schema_version]
+
+/// A datum which contains log information.
+/datum/log_entry
+ /// Next id to assign to a log entry.
+ var/static/next_id = 0
+
+ /// Unique id of the log entry.
+ var/id
+
+ /// Schema version of the log entry.
+ var/schema_version = "1.0.0"
+
+ /// Unix timestamp of the log entry.
+ var/timestamp
+
+ /// Category of the log entry.
+ var/category
+
+ /// Message of the log entry.
+ var/message
+
+ /// Data of the log entry; optional.
+ var/list/data
+
+ ///severity level of this log
+ var/severity = "info"
+
+ /// Semver store of the log entry, used to store the schema of data entries
+ var/list/semver_store
+
+GENERAL_PROTECT_DATUM(/datum/log_entry)
+
+/datum/log_entry/New(timestamp, category, message, list/data, list/semver_store, severity = "info")
+ ..()
+
+ src.id = next_id++
+ src.timestamp = timestamp
+ src.category = category
+ src.message = message
+ src.severity = severity
+ with_data(data)
+ with_semver_store(semver_store)
+
+/datum/log_entry/proc/with_data(list/data)
+ if(!isnull(data))
+ if(!islist(data))
+ src.data = list("data" = data)
+ stack_trace("Log entry data was not a list, it was [data.type].")
+ else
+ src.data = data
+ return src
+
+/datum/log_entry/proc/with_semver_store(list/semver_store)
+ if(isnull(semver_store))
+ return
+ if(!islist(semver_store))
+ stack_trace("Log entry semver store was not a list, it was [semver_store.type]. We cannot reliably convert it to a list.")
+ else
+ src.semver_store = semver_store
+ return src
+
+/// Converts the log entry to a human-readable string.
+/datum/log_entry/proc/to_readable_text(format = TRUE)
+ if(format)
+ return "\[[timestamp]\] [uppertext(category)]: [message]"
+ else
+ return "[message]"
+
+#define MANUAL_JSON_ENTRY(list, key, value) list.Add("\"[key]\":[(!isnull(value)) ? json_encode(value) : "null"]")
+
+/// Converts the log entry to a JSON string.
+/datum/log_entry/proc/to_json_text()
+ // I do not trust byond's json encoder, and need to ensure the order doesn't change.
+ var/list/json_entries = list()
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_TIMESTAMP, timestamp)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ROUNDID, GLOB.game_id)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_CATEGORY, category)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_MESSAGE, message)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_DATA, data)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_WORLD_STATE, world.get_world_state_for_logging())
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SEMVER_STORE, semver_store)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_ID, id)
+ MANUAL_JSON_ENTRY(json_entries, LOG_ENTRY_KEY_SCHEMA_VERSION, schema_version)
+ MANUAL_JSON_ENTRY(json_entries, "level", severity)
+ return "{[json_entries.Join(",")]}"
+
+#undef MANUAL_JSON_ENTRY
+
+#define CHECK_AND_TRY_FILE_ERROR_RECOVERY(file) \
+ var/static/in_error_recovery = FALSE; \
+ if(!fexists(##file)) { \
+ if(in_error_recovery) { \
+ in_error_recovery = FALSE; \
+ CRASH("Failed to error recover log file: [file]"); \
+ }; \
+ in_error_recovery = TRUE; \
+ logger.Log(LOG_CATEGORY_INTERNAL_ERROR, "attempting to perform file error recovery: [file]"); \
+ logger.init_category_file(logger.log_categories[category]); \
+ call(src, __PROC__)(arglist(args)); \
+ return; \
+ }; \
+ in_error_recovery = FALSE;
+
+/// Writes the log entry to a file.
+/datum/log_entry/proc/write_entry_to_file(file)
+ CHECK_AND_TRY_FILE_ERROR_RECOVERY(file)
+ WRITE_LOG_NO_FORMAT(file, "[to_json_text()]\n")
+
+/// Writes the log entry to a file as a human-readable string.
+/datum/log_entry/proc/write_readable_entry_to_file(file, format_internally = TRUE)
+ CHECK_AND_TRY_FILE_ERROR_RECOVERY(file)
+ // If it's being formatted internally we need to manually add a newline
+ if(format_internally)
+ WRITE_LOG_NO_FORMAT(file, "[to_readable_text(format = TRUE)]\n")
+ else
+ WRITE_LOG(file, "[to_readable_text(format = FALSE)]")
+
+#undef CHECK_AND_TRY_FILE_ERROR_RECOVERY
diff --git a/code/modules/logging/log_holder.dm b/code/modules/logging/log_holder.dm
new file mode 100644
index 00000000000..d756e7ffbec
--- /dev/null
+++ b/code/modules/logging/log_holder.dm
@@ -0,0 +1,376 @@
+GLOBAL_REAL(logger, /datum/log_holder)
+/**
+ * Main datum to manage logging actions
+ */
+/datum/log_holder
+ /// Round ID, if set, that logging is initialized for
+ var/round_id
+ /// When the log_holder first initialized
+ var/logging_start_timestamp
+
+ /// Associative: category -> datum
+ var/list/datum/log_category/log_categories
+ /// typecache list for categories that exist but are disabled
+ var/list/disabled_categories
+ /// category nesting tree for ui purposes
+ var/list/category_group_tree
+
+ /// list of Log args waiting for processing pending log initialization
+ var/list/waiting_log_calls
+
+ /// Whether or not logging as human readable text is enabled
+ var/human_readable_enabled = FALSE
+
+ /// Cached ui_data
+ var/list/data_cache = list()
+
+ /// Last time the ui_data was updated
+ var/last_data_update = 0
+
+ var/initialized = FALSE
+ var/shutdown = FALSE
+
+GENERAL_PROTECT_DATUM(/datum/log_holder)
+
+/client/proc/log_viewer_new()
+ set name = "View Round Logs"
+ set category = "Admin.Logging"
+ logger.ui_interact(mob)
+
+/datum/log_holder/ui_interact(mob/user, datum/tgui/ui)
+ if(!check_rights_for(user.client, R_ADMIN))
+ return
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(isnull(ui))
+ ui = new(user, src, "LogViewer")
+ ui.set_autoupdate(FALSE)
+ ui.open()
+
+/datum/log_holder/ui_state(mob/user)
+ return GLOB.admin_state
+
+/datum/log_holder/ui_static_data(mob/user)
+ var/list/data = list(
+ "game_id" = GLOB.game_id,
+ "logging_start_timestamp" = logging_start_timestamp,
+ )
+
+ var/list/tree = list()
+ data["tree"] = tree
+ var/list/enabled_categories = list()
+ for(var/enabled in log_categories)
+ enabled_categories += enabled
+ tree["enabled"] = enabled_categories
+
+ var/list/disabled_categories = list()
+ for(var/disabled in src.disabled_categories)
+ disabled_categories += disabled
+ tree["disabled"] = disabled_categories
+
+ return data
+
+/datum/log_holder/ui_data(mob/user)
+ if(!last_data_update || (world.time - last_data_update) > LOG_UPDATE_TIMEOUT)
+ cache_ui_data()
+ return data_cache
+
+/datum/log_holder/proc/cache_ui_data()
+ var/list/category_map = list()
+ for(var/datum/log_category/category as anything in log_categories)
+ category = log_categories[category]
+ var/list/category_data = list()
+
+ var/list/entries = list()
+ for(var/datum/log_entry/entry as anything in category.entries)
+ entries += list(list(
+ "id" = entry.id,
+ "message" = entry.message,
+ "timestamp" = entry.timestamp,
+ "data" = entry.data,
+ "semver" = entry.semver_store,
+ ))
+ category_data["entries"] = entries
+ category_data["entry_count"] = category.entry_count
+
+ category_map[category.category] = category_data
+
+ data_cache.Cut()
+ last_data_update = world.time
+
+ data_cache["categories"] = category_map
+ data_cache["last_data_update"] = last_data_update
+
+/datum/log_holder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ switch(action)
+ if("refresh")
+ cache_ui_data()
+ SStgui.update_uis(src)
+ return TRUE
+
+ else
+ stack_trace("unknown ui_act action [action] for [type]")
+
+/// Assembles basic information for logging, creating the log category datums and checking for config flags as required
+/datum/log_holder/proc/init_logging()
+ if(initialized)
+ CRASH("Attempted to call init_logging twice!")
+
+ round_id = GLOB.game_id
+ logging_start_timestamp = unix_timestamp_string()
+ log_categories = list()
+ disabled_categories = list()
+
+ human_readable_enabled = CONFIG_GET(flag/log_as_human_readable)
+
+ category_group_tree = assemble_log_category_tree()
+ var/config_flag
+ for(var/datum/log_category/master_category as anything in category_group_tree)
+ var/list/sub_categories = category_group_tree[master_category]
+ sub_categories = sub_categories.Copy()
+ for(var/datum/log_category/sub_category as anything in sub_categories)
+ config_flag = initial(sub_category.config_flag)
+ if(config_flag && !config.Get(config_flag))
+ disabled_categories[initial(sub_category.category)] = TRUE
+ sub_categories -= sub_category
+ continue
+
+ config_flag = initial(master_category.config_flag)
+ if(config_flag && !config.Get(config_flag))
+ disabled_categories[initial(master_category.category)] = TRUE
+ if(!length(sub_categories))
+ continue
+ // enabled, or any of the sub categories are enabled
+ init_log_category(master_category, sub_categories)
+
+ initialized = TRUE
+
+ // process any waiting log calls and then cut the list
+ for(var/list/arg_list as anything in waiting_log_calls)
+ Log(arglist(arg_list))
+ waiting_log_calls?.Cut()
+
+ if(fexists(GLOB.config_error_log))
+ fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
+ fdel(GLOB.config_error_log)
+
+ world._initialize_log_files()
+
+/// Tells the log_holder to not allow any more logging to be done, and dumps all categories to their json file
+/datum/log_holder/proc/shutdown_logging()
+ if(shutdown)
+ CRASH("Attempted to call shutdown_logging twice!")
+ shutdown = TRUE
+
+/// Iterates over all log category types to assemble them into a tree of main category -> (sub category)[] while also checking for loops and sanity errors
+/datum/log_holder/proc/assemble_log_category_tree()
+ var/static/list/category_tree
+ if(category_tree)
+ return category_tree
+
+ category_tree = list()
+ var/list/all_types = subtypesof(/datum/log_category)
+ var/list/known_categories = list()
+ var/list/sub_categories = list()
+
+ // Assemble the master categories
+ for(var/datum/log_category/category_type as anything in all_types)
+ var/category = initial(category_type.category)
+ if(category in known_categories)
+ stack_trace("log category type '[category_type]' has duplicate category '[category]', skipping")
+ continue
+
+ if(!initial(category_type.schema_version))
+ stack_trace("log category type '[category_type]' does not have a valid schema version, skipping")
+ continue
+
+ var/master_category = initial(category_type.master_category)
+ if(master_category)
+ sub_categories[master_category] += list(category_type)
+ continue
+ category_tree[category_type] = list()
+
+ // Sort the sub categories
+ for(var/datum/log_category/master as anything in sub_categories)
+ if(!(master in category_tree))
+ stack_trace("log category [master] is an invalid master category as it's a sub category")
+ continue
+ for(var/datum/log_category/sub_category as anything in sub_categories[master])
+ if(initial(sub_category.secret) != initial(master.secret))
+ stack_trace("log category [sub_category] has a secret status that differs from its master category [master]")
+ category_tree[master] += list(sub_category)
+
+ return category_tree
+
+/// Log entry header used to mark a file is being reset
+#define LOG_CATEGORY_RESET_FILE_MARKER "{\"LOG FILE RESET -- THIS IS AN ERROR\"}"
+#define LOG_CATEGORY_RESET_FILE_MARKER_READABLE "LOG FILE RESET -- THIS IS AN ERROR"
+/// Gets a recovery file for the given path. Caches the last known recovery path for each path.
+/datum/log_holder/proc/get_recovery_file_for(path)
+ var/static/cache
+ if(isnull(cache))
+ cache = list()
+
+ var/count = cache[path] || 0
+ while(fexists("[path].rec[count]"))
+ count++
+ cache[path] = count
+
+ return "[path].rec[count]"
+
+/// Sets up the given category's file and header.
+/datum/log_holder/proc/init_category_file(datum/log_category/category)
+ var/file_path = category.get_output_file(null)
+ if(fexists(file_path)) // already exists? implant a reset marker
+ rustg_file_append(LOG_CATEGORY_RESET_FILE_MARKER, file_path)
+ fcopy(file_path, get_recovery_file_for(file_path))
+ rustg_file_write("[json_encode(category.category_header)]\n", file_path)
+
+ if(!human_readable_enabled)
+ return
+
+ file_path = category.get_output_file(null, "log")
+ if(fexists(file_path))
+ rustg_file_append(LOG_CATEGORY_RESET_FILE_MARKER_READABLE, file_path)
+ fcopy(file_path, get_recovery_file_for(file_path))
+ rustg_file_write("\[[human_readable_timestamp()]\] Starting up round ID [round_id].\n - -------------------------\n", file_path)
+
+#undef LOG_CATEGORY_RESET_FILE_MARKER
+#undef LOG_CATEGORY_RESET_FILE_MARKER_READABLE
+
+/// Initializes the given log category and populates the list of contained categories based on the sub category list
+/datum/log_holder/proc/init_log_category(datum/log_category/category_type, list/datum/log_category/sub_categories)
+ var/datum/log_category/category_instance = new category_type
+
+ var/list/contained_categories = list()
+ for(var/datum/log_category/sub_category as anything in sub_categories)
+ sub_category = new sub_category
+ var/sub_category_actual = sub_category.category
+ sub_category.master_category = category_instance
+ log_categories[sub_category_actual] = sub_category
+
+ if(!semver_to_list(sub_category.schema_version))
+ stack_trace("log category [sub_category_actual] has an invalid schema version '[sub_category.schema_version]'")
+ sub_category.schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ contained_categories += sub_category_actual
+
+ log_categories[category_instance.category] = category_instance
+
+ if(!semver_to_list(category_instance.schema_version))
+ stack_trace("log category [category_instance.category] has an invalid schema version '[category_instance.schema_version]'")
+ category_instance.schema_version = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ contained_categories += category_instance.category
+
+ var/list/category_header = list(
+ LOG_HEADER_INIT_TIMESTAMP = logging_start_timestamp,
+ LOG_HEADER_ROUND_ID = GLOB.game_id,
+ LOG_HEADER_SECRET = category_instance.secret,
+ LOG_HEADER_CATEGORY_LIST = contained_categories,
+ LOG_HEADER_CATEGORY = category_instance.category,
+ )
+
+ category_instance.category_header = category_header
+ init_category_file(category_instance, category_header)
+
+/datum/log_holder/proc/unix_timestamp_string() // pending change to rust-g
+ return RUSTG_CALL(RUST_G, "unix_timestamp")()
+
+/datum/log_holder/proc/human_readable_timestamp(precision = 3)
+ var/start = time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")
+ // now we grab the millis from the rustg timestamp
+ var/rustg_stamp = unix_timestamp_string()
+ var/list/timestamp = splittext(rustg_stamp, ".")
+#ifdef UNIT_TESTS
+ if(length(timestamp) != 2)
+ stack_trace("rustg returned illegally formatted string '[rustg_stamp]'")
+ return start
+#endif
+ var/millis = timestamp[2]
+ if(length(millis) > precision)
+ millis = copytext(millis, 1, precision + 1)
+ return "[start].[millis]"
+
+/// Adds an entry to the given category, if the category is disabled it will not be logged.
+/// If the category does not exist, we will CRASH and log to the error category.
+/// the data list is optional and will be recursively json serialized.
+/datum/log_holder/proc/Log(category, message, list/data, severity = "info")
+ // This is Log because log is a byond internal proc
+ if(shutdown)
+ return
+
+ // do not include the message because these go into the runtime log and we might be secret!
+ if(!istext(message))
+ message = "[message]"
+ stack_trace("Logging with a non-text message")
+
+ if(!category)
+ category = LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND
+ stack_trace("Logging with a null or empty category")
+
+ if(data && !islist(data))
+ data = list("data" = data)
+ stack_trace("Logging with data this is not a list, it will be converted to a list with a single key 'data'")
+
+ if(!initialized) // we are initialized during /world/proc/SetupLogging which is called in /world/New
+ waiting_log_calls += list(list(category, message, data))
+ return
+
+ if(disabled_categories[category])
+ return
+
+ var/datum/log_category/log_category = log_categories[category]
+ if(!log_category)
+ Log(LOG_CATEGORY_INTERNAL_CATEGORY_NOT_FOUND, message, data)
+ CRASH("Attempted to log to a category that doesn't exist! [category]")
+
+ var/list/semver_store = null
+ if(length(data))
+ semver_store = list()
+ data = recursive_jsonify(data, semver_store)
+ log_category.create_entry(message, data, semver_store, severity)
+
+/// Recursively converts an associative list of datums into their jsonified(list) form
+/datum/log_holder/proc/recursive_jsonify(list/data_list, list/semvers)
+ if(isnull(data_list))
+ return null
+
+ var/list/jsonified_list = list()
+ for(var/key in data_list)
+ var/datum/data = data_list[key]
+
+ if(isnull(data))
+ pass() // nulls are allowed
+
+ else if(islist(data))
+ data = recursive_jsonify(data, semvers)
+
+ else if(isdatum(data))
+ var/list/options_list = list(
+ SCHEMA_VERSION = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET,
+ )
+
+ var/list/serialization_data = data.serialize_list(options_list, semvers)
+ var/current_semver = semvers[data.type]
+ if(!semver_to_list(current_semver))
+ stack_trace("serialization of data had an invalid semver")
+ semvers[data.type] = LOG_CATEGORY_SCHEMA_VERSION_NOT_SET
+
+ if(!length(serialization_data)) // serialize_list wasn't implemented, and errored
+ stack_trace("serialization data was empty")
+ continue
+
+ data = recursive_jsonify(serialization_data, semvers)
+
+ if(islist(data) && !length(data))
+ stack_trace("recursive_jsonify got an empty list after serialization")
+ continue
+
+ jsonified_list[key] = data
+
+ return jsonified_list
diff --git a/code/modules/maps/map_template.dm b/code/modules/maps/map_template.dm
index b4866ad1fcb..43ef29fc8b4 100644
--- a/code/modules/maps/map_template.dm
+++ b/code/modules/maps/map_template.dm
@@ -218,7 +218,7 @@
specific_sanity--
var/orientation
- if(chosen_template.fixed_orientation || !config.random_submap_orientation)
+ if(chosen_template.fixed_orientation || !CONFIG_GET(flag/random_submap_orientation))
orientation = 0
else
orientation = pick(list(0, 90, 180, 270))
diff --git a/code/modules/mechs/components/frame.dm b/code/modules/mechs/components/frame.dm
index d0a56488767..f79e21fbf7b 100644
--- a/code/modules/mechs/components/frame.dm
+++ b/code/modules/mechs/components/frame.dm
@@ -387,7 +387,7 @@
return 0
if(user)
visible_message(span_notice("\The [user] begins installing \the [I] into \the [src]."))
- if(!user.canUnEquip(I) || !do_after(user, 30) || user.get_active_hand() != I)
+ if(!user.canUnEquip(I) || !do_after(user, 30) || user.get_active_held_item() != I)
return
if(!user.unEquip(I))
return
diff --git a/code/modules/mechs/mech_construction.dm b/code/modules/mechs/mech_construction.dm
index c99e3128f09..ab152232af7 100644
--- a/code/modules/mechs/mech_construction.dm
+++ b/code/modules/mechs/mech_construction.dm
@@ -87,7 +87,7 @@
var/delay = 30 - sqrt(mech_skill * 3)
if(delay > 0)
user.visible_message(span_notice("\The [user] begins trying to install \the [system] into \the [src]."))
- if(!do_after(user, delay, src) || user.get_active_hand() != system) return FALSE
+ if(!do_after(user, delay, src) || user.get_active_held_item() != system) return FALSE
if(user.unEquip(system))
to_chat(user, span_notice("You install \the [system] in \the [src]'s [system_hardpoint]."))
playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1)
diff --git a/code/modules/mechs/mech_interaction.dm b/code/modules/mechs/mech_interaction.dm
index fcc52ee5e16..b2f4b1d4ad2 100644
--- a/code/modules/mechs/mech_interaction.dm
+++ b/code/modules/mechs/mech_interaction.dm
@@ -181,7 +181,7 @@
systm.on_unselect()
selected_hardpoint = null
-/mob/living/exosuit/get_active_hand()
+/mob/living/exosuit/get_active_held_item()
var/obj/item/mech_equipment/ME = selected_system
if(istype(ME))
return ME.get_effective_obj()
diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm
index 91acccb25d8..55d1e19539f 100644
--- a/code/modules/mining/coins.dm
+++ b/code/modules/mining/coins.dm
@@ -66,7 +66,7 @@
new /obj/item/stack/cable_coil(user.loc, 1)
overlays = list()
string_attached = null
- to_chat(user, "\blue You detach the string from the coin.")
+ to_chat(user, span_blue("You detach the string from the coin."))
else ..()
/obj/item/coin/attack_self(mob/user as mob)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index c5eb43b7a9c..6f722fed5fe 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -108,7 +108,7 @@
if(..())
return
if(!allowed(user))
- to_chat(user, "\red Access denied.")
+ to_chat(user, span_red("Access denied."))
return
ui_interact(user)
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 5c3477b7938..4f9041f7621 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -52,14 +52,14 @@
..()
if (istype(W, /obj/item/coin))
var/obj/item/coin/C = W
- to_chat(user, "\blue You add the [C.name] into the bag.")
+ to_chat(user, span_blue("You add the [C.name] into the bag."))
usr.drop_item()
contents += C
if (istype(W, /obj/item/moneybag))
var/obj/item/moneybag/C = W
for (var/obj/O in C.contents)
contents += O;
- to_chat(user, "\blue You empty the [C.name] into the bag.")
+ to_chat(user, span_blue("You empty the [C.name] into the bag."))
return
/obj/item/moneybag/Topic(href, href_list)
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 2d9ec29391a..bc26b19194e 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -62,7 +62,7 @@
set src in view(1)
if(!ishuman(usr)) //Only living, intelligent creatures with hands can empty ore boxes.
- to_chat(usr, "\red You are physically incapable of emptying the ore box.")
+ to_chat(usr, span_red("You are physically incapable of emptying the ore box."))
return
if( usr.stat || usr.restrained() )
@@ -75,7 +75,7 @@
add_fingerprint(usr)
if(contents.len < 1)
- to_chat(usr, "\red The ore box is empty")
+ to_chat(usr, span_red("The ore box is empty"))
return
for (var/obj/item/ore/O in contents)
@@ -84,7 +84,7 @@
O.layer = initial(O.layer)
O.set_plane(initial(O.plane))
- to_chat(usr, "\blue You empty the ore box")
+ to_chat(usr, span_blue("You empty the ore box"))
return
diff --git a/code/modules/mob/angel/say.dm b/code/modules/mob/angel/say.dm
index a07820780e4..8fafb8a011d 100644
--- a/code/modules/mob/angel/say.dm
+++ b/code/modules/mob/angel/say.dm
@@ -8,7 +8,7 @@
if (src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- to_chat(src, "\red You cannot talk in deadchat and ANGEL chat (muted).")
+ to_chat(src, span_red("You cannot talk in deadchat and ANGEL chat (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
@@ -19,7 +19,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat and ANGEL chat are globally muted."))
return
@@ -43,7 +43,7 @@
if(src.client)
if(src.client.prefs.muted & MUTE_DEADCHAT)
- to_chat(src, "\red You cannot emote in deadchat and ANGEL chat (muted).")
+ to_chat(src, span_red("You cannot emote in deadchat and ANGEL chat (muted)."))
return
if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
@@ -58,7 +58,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat and ANGEL chat are globally muted."))
return
diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 59f46fda471..8c513051c32 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -166,7 +166,7 @@ note dizziness decrements automatically in the mob's Life() proc.
// What icon do we use for the attack?
var/image/I
- var/obj/item/T = get_active_hand()
+ var/obj/item/T = get_active_held_item()
if (T && T.icon)
I = image(T.icon, A, T.icon_state, A.layer + 1)
else // Attacked with a fist?
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index b8f2b956167..3703b3894c3 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -68,7 +68,7 @@
O.forceMove(loc)
embedded = list()
- for(var/mob/living/carbon/human/H in oviewers(src))
+ for(var/mob/living/carbon/human/H in oviewers(get_turf(src)))
H.sanity.onSeeDeath(src)
SEND_SIGNAL_OLD(H, COMSIG_MOB_DEATH, src)
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 6eb644506aa..7ad5aec3a69 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -36,7 +36,7 @@
return
if(!src.client.holder)
- if(!config.dsay_allowed)
+ if(!GLOB.dsay_allowed)
to_chat(src, span_danger("Deadchat is globally muted."))
return
@@ -79,4 +79,4 @@
message = "[message]"
for (var/mob/O in messagemobs_neardead)
- O.show_message(message, type)
\ No newline at end of file
+ O.show_message(message, type)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 0f253d773d9..bd11a7047a7 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -93,7 +93,7 @@
nverb = verb
message = language.format_message_radio(message, nverb)
else
- message = "[verb], \"[message]\""
+ message = "[verb], \"[message]\""
on_hear_radio(part_a, speaker_name, part_b, message)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index c647f21637c..a669782f49c 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -1,6 +1,6 @@
//This proc is called whenever someone clicks an inventory ui slot.
/mob/proc/attack_ui(slot)
- var/obj/item/W = get_active_hand()
+ var/obj/item/W = get_active_held_item()
var/obj/item/E = get_equipped_item(slot)
if (istype(E))
if(istype(W))
@@ -14,15 +14,23 @@
//as they handle all relevant stuff like adding it to the player's screen and updating their overlays.
//Returns the thing in our active hand
-/mob/proc/get_active_hand()
+/mob/proc/get_active_held_item()
if(hand) return l_hand
else return r_hand
//Returns the thing in our inactive hand
-/mob/proc/get_inactive_hand()
+/mob/proc/get_inactive_held_item()
if(hand) return r_hand
else return l_hand
+//Check we have an organ for this hand slot (Dismemberment), Only relevant for humans
+/mob/proc/has_hand_for_held_index(i)
+ return TRUE
+
+//Check we have an organ for our active hand slot (Dismemberment),Only relevant for humans
+/mob/proc/has_active_hand()
+ return has_hand_for_held_index(hand)
+
//Declarations. Overrided in human/robots subtypes
//Puts the Item into your l_hand/r_hand if possible and calls all necessary triggers/updates. returns TRUE on success.
/mob/proc/put_in_l_hand(obj/item/Item)
@@ -76,11 +84,11 @@
//Drops the item in our active hand. TODO: rename this to drop_active_hand or something
/mob/proc/drop_item(atom/Target)
- var/obj/item/I = get_active_hand()
+ var/obj/item/I = get_active_held_item()
unEquip(I = I, Target = Target, force = TRUE)
/mob/proc/drop_offhand(atom/Target)
- var/obj/item/I = get_inactive_hand()
+ var/obj/item/I = get_inactive_held_item()
unEquip(I = I, Target = Target, force = TRUE)
/*
@@ -184,7 +192,7 @@
return 0 //zero
//Returns the inventory slot for the current hand
-/mob/proc/get_active_hand_slot()
+/mob/proc/get_active_held_item_slot()
if (hand)
return slot_l_hand
return slot_r_hand
diff --git a/code/modules/mob/inventory/_docs.dm b/code/modules/mob/inventory/_docs.dm
index 14a19d5b54e..66b5638e373 100644
--- a/code/modules/mob/inventory/_docs.dm
+++ b/code/modules/mob/inventory/_docs.dm
@@ -65,7 +65,7 @@ Ovverided for human proc check "slot_back" first.
This proc is called whenever someone clicks an inventory ui slot.
If smth occupy slot, then reslolve_attack/attackhand will be called, else equip_to_slot_if_possible()
It calls:
- - Mob.get_active_hand()
+ - Mob.get_active_held_item()
- Mob.get_equipped_item(slot)
- Mob.equip_to_slot_if_possible(Item, slot)
- or Mob.attackhand(equippedItem)
diff --git a/code/modules/mob/inventory/equip.dm b/code/modules/mob/inventory/equip.dm
index 55fd3815fb8..c61fa3f4451 100644
--- a/code/modules/mob/inventory/equip.dm
+++ b/code/modules/mob/inventory/equip.dm
@@ -126,7 +126,7 @@ var/list/slot_equipment_priority = list(
return backpack
return ..()
/mob/living/carbon/human/proc/quick_equip_storage(obj/item/Item)
- var/potential = src.get_inactive_hand()
+ var/potential = src.get_inactive_held_item()
if(istype(src.back,/obj/item/storage))
var/obj/item/storage/backpack = src.back
if(backpack.attackby(Item,src))
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index f8248d7bfc0..76ec1653716 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -206,7 +206,7 @@
// Language handling.
/mob/proc/add_language(var/language)
- var/datum/language/new_language = all_languages[language]
+ var/datum/language/new_language = GLOB.all_languages[language]
if(!istype(new_language) || (new_language in languages))
return 0
@@ -215,12 +215,12 @@
return 1
/mob/proc/remove_language(var/rem_language)
- var/datum/language/L = all_languages[rem_language]
+ var/datum/language/L = GLOB.all_languages[rem_language]
. = (L in languages)
languages.Remove(L)
/mob/living/remove_language(rem_language)
- var/datum/language/L = all_languages[rem_language]
+ var/datum/language/L = GLOB.all_languages[rem_language]
if(default_language == L)
default_language = null
return ..()
diff --git a/code/modules/mob/language/synthetic.dm b/code/modules/mob/language/synthetic.dm
index 0917ef35296..7d929917be6 100644
--- a/code/modules/mob/language/synthetic.dm
+++ b/code/modules/mob/language/synthetic.dm
@@ -37,7 +37,7 @@
S.show_message("[message_start] [message_body]", 2)
- var/list/listening = hearers(1, src)
+ var/list/listening = hearers(1, get_turf(src))
listening -= src
for (var/mob/living/M in listening)
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 8e48acafb9a..deec11d0eb1 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -40,10 +40,10 @@
var/obj/item/organ/internal/vital/brain/B = O
if(B.health <= 0)
- to_chat(user, "\red That brain is well and truly dead.")
+ to_chat(user, span_red("That brain is well and truly dead."))
return
else if(!B.brainmob)
- to_chat(user, "\red You aren't sure where this brain came from, but you're pretty sure it's a useless brain.")
+ to_chat(user, span_red("You aren't sure where this brain came from, but you're pretty sure it's a useless brain."))
return
var/mob/living/carbon/brain/BM = B.brainmob
if(!BM.client)
@@ -55,8 +55,8 @@
to_chat(user, span_warning("\The [src] indicates that \the [B] is unresponsive."))
return
- for(var/mob/V in viewers(src, null))
- V.show_message(text("\blue [user] sticks \a [O] into \the [src]."))
+ for(var/mob/V in viewers(get_turf(src)))
+ V.show_message(span_blue("[user] sticks \a [O] into \the [src]."))
brainmob = B.brainmob
brainmob.loc = src
@@ -81,9 +81,9 @@
if((istype(O,/obj/item/card/id)||istype(O,/obj/item/modular_computer/pda)) && brainmob)
if(allowed(user))
locked = !locked
- to_chat(user, "\blue You [locked ? "lock" : "unlock"] the brain holder.")
+ to_chat(user, span_blue("You [locked ? "lock" : "unlock"] the brain holder."))
else
- to_chat(user, "\red Access denied.")
+ to_chat(user, span_red("Access denied."))
return
if(brainmob)
O.attack(brainmob, user)//Oh noooeeeee
@@ -93,11 +93,11 @@
//TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data.
/obj/item/device/mmi/attack_self(mob/user as mob)
if(!brainmob)
- to_chat(user, "\red You upend the MMI, but there's nothing in it.")
+ to_chat(user, span_red("You upend the MMI, but there's nothing in it."))
else if(locked)
- to_chat(user, "\red You upend the MMI, but the brain is clamped into place.")
+ to_chat(user, span_red("You upend the MMI, but the brain is clamped into place."))
else
- to_chat(user, "\blue You upend the MMI, spilling the brain onto the floor.")
+ to_chat(user, span_blue("You upend the MMI, spilling the brain onto the floor."))
var/obj/item/organ/internal/vital/brain/brain
if (brainobj) //Pull brain organ out of MMI.
brainobj.loc = user.loc
@@ -168,7 +168,7 @@
to_chat(brainmob, "Can't do that while incapacitated or dead.")
radio.broadcasting = radio.broadcasting==1 ? 0 : 1
- to_chat(brainmob, "\blue Radio is [radio.broadcasting==1 ? "now" : "no longer"] broadcasting.")
+ to_chat(brainmob, span_blue("Radio is [radio.broadcasting==1 ? "now" : "no longer"] broadcasting."))
/obj/item/device/mmi/radio_enabled/verb/Toggle_Listening()
set name = "Toggle Listening"
@@ -181,7 +181,7 @@
to_chat(brainmob, "Can't do that while incapacitated or dead.")
radio.listening = radio.listening==1 ? 0 : 1
- to_chat(brainmob, "\blue Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.")
+ to_chat(brainmob, span_blue("Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."))
/obj/item/device/mmi/emp_act(severity)
if(!brainmob)
diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm
index 43f094ac982..d985e429735 100644
--- a/code/modules/mob/living/carbon/brain/emote.dm
+++ b/code/modules/mob/living/carbon/brain/emote.dm
@@ -17,7 +17,7 @@
return
if (src.client)
if (client.prefs.muted & MUTE_IC)
- to_chat(src, "\red You cannot send IC messages (muted).")
+ to_chat(src, span_red("You cannot send IC messages (muted)."))
return
if (src.client.handle_spam_prevention(message,MUTE_IC))
return
@@ -62,9 +62,9 @@
if ("help")
to_chat(src, "alarm,alert,notice,flash,blink,whistle,beep,boop")
else
- to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.")
+ to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list."))
if (message)
log_emote("[name]/[key] : [message]")
- send_emote(message, m_type)
\ No newline at end of file
+ send_emote(message, m_type)
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index c9ab7ad2677..f59a5540300 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -6,9 +6,9 @@
if(radiation > 100)
radiation = 100
if(!container)//If it's not in an MMI
- to_chat(src, "\red You feel weak.")
+ to_chat(src, span_red("You feel weak."))
else//Fluff-wise, since the brain can't detect anything itself, the MMI handles thing like that
- to_chat(src, "\red STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.")
+ to_chat(src, span_red("STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED."))
switch(radiation)
if(1 to 49)
@@ -23,9 +23,9 @@
if(prob(5))
radiation -= 5
if(!container)
- to_chat(src, "\red You feel weak.")
+ to_chat(src, span_red("You feel weak."))
else
- to_chat(src, "\red STATUS: DANGEROUS LEVELS OF RADIATION DETECTED.")
+ to_chat(src, span_red("STATUS: DANGEROUS LEVELS OF RADIATION DETECTED."))
updatehealth()
if(75 to 100)
@@ -99,7 +99,7 @@
blinded = TRUE
silent = 0
else //ALIVE. LIGHTS ARE ON
- if( !container && (health < HEALTH_THRESHOLD_DEAD || ((world.time - timeofhostdeath) > config.revival_brain_life)) )
+ if( !container && (health < CONFIG_GET(number/health_threshold_dead) || ((world.time - timeofhostdeath) > CONFIG_GET(number/revival_brain_life))) )
death()
blinded = TRUE
silent = 0
@@ -121,7 +121,7 @@
silent = 1
if(!alert)//Sounds an alarm, but only once per 'level'
emote("alarm")
- to_chat(src, "\red Major electrical distruption detected: System rebooting.")
+ to_chat(src, span_red("Major electrical distruption detected: System rebooting."))
alert = 1
if(prob(75))
emp_damage -= 1
@@ -137,7 +137,7 @@
ear_damage = 1
if(!alert)
emote("alert")
- to_chat(src, "\red Primary systems are now online.")
+ to_chat(src, span_red("Primary systems are now online."))
alert = 1
if(prob(50))
emp_damage -= 1
@@ -149,13 +149,13 @@
if(2 to 9)//Low level of EMP damage, has few effects(handled elsewhere)
if(!alert)
emote("notice")
- to_chat(src, "\red System reboot nearly complete.")
+ to_chat(src, span_red("System reboot nearly complete."))
alert = 1
if(prob(25))
emp_damage -= 1
if(1)
alert = 0
- to_chat(src, "\red All systems restored.")
+ to_chat(src, span_red("All systems restored."))
emp_damage -= 1
//Other
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 9b297253668..935dd76d5a9 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -48,7 +48,7 @@
/obj/item/device/mmi/digital/posibrain/examine(mob/user, extra_description = "")
if(get_dist(user, src) < 2)
- var/msg = "[span_info("*---------*")]\nThis is \icon[src] \a [src]!\n[desc]\n"
+ var/msg = "[span_info("*---------*")]\nThis is [icon2html(src, user)] \a [src]!\n[desc]\n"
msg += ""
if(brainmob && brainmob.key)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 934f685a1bb..e156023ecab 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -45,7 +45,7 @@
if(user.last_special <= world.time)
user.last_special = world.time + 50
src.visible_message(span_danger("You hear something rumbling inside [src]'s stomach..."))
- var/obj/item/I = user.get_active_hand()
+ var/obj/item/I = user.get_active_held_item()
if(I && I.force)
var/d = rand(round(I.force / 4), I.force)
if(ishuman(src))
@@ -71,9 +71,9 @@
if(M in src.stomach_contents)
src.stomach_contents.Remove(M)
M.loc = src.loc
- for(var/mob/N in viewers(src, null))
+ for(var/mob/N in viewers(get_turf(src)))
if(N.client)
- N.show_message(text("\red [M] bursts out of [src]!"), 2)
+ N.show_message(span_red("[M] bursts out of [src]!"), 2)
..()
/mob/living/carbon/attack_hand(mob/M as mob)
@@ -83,7 +83,7 @@
if (H.hand)
temp = H.organs_by_name[BP_L_ARM]
if(temp && !temp.is_usable())
- to_chat(H, "\red You can't use your [temp.name]")
+ to_chat(H, span_red("You can't use your [temp.name]"))
return
@@ -97,17 +97,17 @@
playsound(loc, "sparks", 50, 1, -1)
if (shock_damage > 15)
src.visible_message(
- "\red [src] was shocked by the [source]!", \
- "\red You feel a powerful shock course through your body!", \
- "\red You hear a heavy electrical crack." \
+ span_red("[src] was shocked by the [source]!"), \
+ span_red("You feel a powerful shock course through your body!"), \
+ span_red("You hear a heavy electrical crack.") \
)
SEND_SIGNAL_OLD(src, COMSIG_CARBON_ELECTROCTE)
Weaken(max(min(10,round(shock_damage / 10 )), 2) SECONDS)
else
src.visible_message(
- "\red [src] was mildly shocked by the [source].", \
- "\red You feel a mild shock course through your body.", \
- "\red You hear a light zapping." \
+ span_red("[src] was mildly shocked by the [source]."), \
+ span_red("You feel a mild shock course through your body."), \
+ span_red("You hear a light zapping.") \
)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -120,7 +120,7 @@
//We cache the held items before and after swapping using get active hand.
//This approach is future proof and will support people who possibly have >2 hands
- var/obj/item/prev_held = get_active_hand()
+ var/obj/item/prev_held = get_active_held_item()
if(prev_held)
if(prev_held.wielded)
@@ -131,7 +131,7 @@
for (var/obj/screen/inventory/hand/H in src.HUDinventory)
H.update_icon()
- var/obj/item/new_held = get_active_hand()
+ var/obj/item/new_held = get_active_held_item()
//Tell the old and new held items that they've been swapped
@@ -157,7 +157,7 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
- if (src.health >= HEALTH_THRESHOLD_CRIT)
+ if (src.health >= CONFIG_GET(number/health_threshold_crit))
if(src == M && ishuman(src))
var/mob/living/carbon/human/H = src
H.check_self_for_injuries()
@@ -204,12 +204,14 @@
if(show_ssd && !client && !teleop)
M.visible_message(span_notice("[M] shakes [src] trying to wake [t_him] up!"), \
span_notice("You shake [src], but they do not respond... Maybe they have S.S.D?"))
+ jiggle()
else if(lying || src.sleeping)
src.sleeping = max(0,src.sleeping-5)
if(src.sleeping == 0)
src.resting = 0
M.visible_message(span_notice("[M] shakes [src] trying to wake [t_him] up!"), \
span_notice("You shake [src] trying to wake [t_him] up!"))
+ jiggle()
else if((M.targeted_organ == BP_HEAD) && target_organ_exists)
M.visible_message(span_notice("[M] pats [src]'s head."), \
span_notice("You pat [src]'s head."))
@@ -217,6 +219,7 @@
if(target_organ_exists)
M.visible_message(span_notice("[M] shakes hands with [src]."), \
span_notice("You shake hands with [src]."))
+ animate_interact(src, INTERACT_GENERIC)
else
M.visible_message(span_notice("[M] holds out \his hand to [src]."), \
span_notice("You hold out your hand to [src]."))
@@ -227,6 +230,7 @@
else
M.visible_message(span_notice("[M] hugs [src] to make [t_him] feel better!"), \
span_notice("You hug [src] to make [t_him] feel better!"))
+ animate_interact(src, INTERACT_HELP)
if(M.fire_stacks >= (src.fire_stacks + 3))
src.fire_stacks += 1
M.fire_stacks -= 1
@@ -261,7 +265,7 @@
return
if(target.type == /obj/screen) return
- var/atom/movable/item = src.get_active_hand()
+ var/atom/movable/item = src.get_active_held_item()
if(!item) return
@@ -285,7 +289,7 @@
M.attack_log += text("\[[time_stamp()]\] Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
usr.attack_log += text("\[[time_stamp()]\] Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]")
- msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (JMP)")
+ msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] [ADMIN_JMP(usr)]")
item.throw_at(target, item.throw_range, item.throw_speed, src)
return
@@ -350,7 +354,7 @@
set category = "IC"
if(usr.sleeping)
- to_chat(usr, "\red You are already sleeping")
+ to_chat(usr, span_red("You are already sleeping"))
return
if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
usr.sleeping = 20 //Short nap
@@ -391,7 +395,7 @@
if(!species)
return null
- return species.default_language ? all_languages[species.default_language] : null
+ return species.default_language ? GLOB.all_languages[species.default_language] : null
/mob/living/carbon/show_inv(mob/user as mob)
user.set_machine(src)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 38789de4702..1df02b93803 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,4 +1,6 @@
+#define SHAKE_ANIMATION_OFFSET 4
+
//Called when the mob is hit with an item in combat.
/mob/living/carbon/resolve_item_attack(obj/item/I, mob/living/user, var/hit_zone)
if(check_attack_throat(I, user))
@@ -72,7 +74,7 @@ true, and the mob is not yet deleted, so we need to check that as well*/
return 0
damage_through_armor(W.force, W.damtype, BP_HEAD, wounding_multiplier = 2, sharp = W.sharp, edge = W.edge, used_weapon = W)
-
+
user.visible_message(span_danger("\The [user] cuts [src]'s neck with \the [W]!"), span_danger("You cut [src]'s neck with \the [W]!"))
if(W.hitsound)
@@ -88,3 +90,12 @@ true, and the mob is not yet deleted, so we need to check that as well*/
else
return 0
+
+/mob/living/carbon/proc/jiggle()
+ if (incapacitated())
+ var/direction = prob(50) ? -1 : 1
+ animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
+ animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
+ animate(pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_IN)
+
+#undef SHAKE_ANIMATION_OFFSET
diff --git a/code/modules/mob/living/carbon/carbon_powers.dm b/code/modules/mob/living/carbon/carbon_powers.dm
index 5c6899b963d..8c04a5f6436 100644
--- a/code/modules/mob/living/carbon/carbon_powers.dm
+++ b/code/modules/mob/living/carbon/carbon_powers.dm
@@ -10,7 +10,7 @@
var/mob/living/simple_animal/borer/B = get_brain_worms()
if(B && B.host_brain)
- to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]")
+ to_chat(src, span_red("You withdraw your probosci, releasing control of [B.host_brain]"))
B.detach()
@@ -22,7 +22,7 @@
/mob/living/carbon/proc/talk_host))
else
- to_chat(src, "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !")
+ to_chat(src, span_red("ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !"))
//Brain slug proc for talking to the host.
/mob/living/carbon/proc/talk_host()
@@ -39,7 +39,7 @@
if(B.host_brain.ckey)
text = input("What would you like to say?", "Speak to captive host", null, null)
text = capitalize(sanitize(text))
- if(!text)
+ if(!text)
return
log_say("Borer said to its host [text]")
@@ -57,8 +57,8 @@
return
if(B.chemicals >= reproduce_cost)
- to_chat(src, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")
- visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")
+ to_chat(src, span_red("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body."))
+ visible_message(span_red("[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!"))
B.chemicals -= reproduce_cost
B.has_reproduced = 1
if(istype(B.host, /mob/living/carbon/human/) && !B.host.isMonkey())// this is a mess but host's var grabs "[human_name] (mob/living/carbon/human/)"
@@ -73,4 +73,4 @@
else
to_chat(src, "You do not have enough chemicals stored to reproduce. (You need [reproduce_cost]).")
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm
index af68b76dbcf..cdd32dff098 100644
--- a/code/modules/mob/living/carbon/give.dm
+++ b/code/modules/mob/living/carbon/give.dm
@@ -7,9 +7,9 @@
if(!istype(target) || target.incapacitated() || target.client == null)
return
- var/obj/item/I = usr.get_active_hand()
+ var/obj/item/I = usr.get_active_held_item()
if(!I)
- I = usr.get_inactive_hand()
+ I = usr.get_inactive_held_item()
if(!I)
to_chat(usr, span_warning("You don't have anything in your hands to give to \the [target]."))
return
diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
index c07eacef9e6..68b3577fb34 100644
--- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
+++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- to_chat(H, "\blue [cure_message]")
+ to_chat(H, span_blue("[cure_message]"))
return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm
index e3c8bbbb8fc..067f0416b2f 100644
--- a/code/modules/mob/living/carbon/human/appearance.dm
+++ b/code/modules/mob/living/carbon/human/appearance.dm
@@ -10,7 +10,7 @@
if(species == new_species)
return
- if(!(new_species in all_species))
+ if(!(new_species in GLOB.all_species))
return
set_species(new_species)
@@ -136,7 +136,7 @@
return 1
/mob/living/carbon/human/proc/generate_valid_species()
- return all_species
+ return GLOB.all_species
/mob/living/carbon/human/proc/generate_valid_hairstyles(var/check_gender = 1)
. = list()
diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm
index 62f9cf75f80..1895c63fb8f 100644
--- a/code/modules/mob/living/carbon/human/chem_side_effects.dm
+++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm
@@ -24,7 +24,7 @@
for(var/R in cures)
if(H.reagents.has_reagent(R))
if (cure_message)
- H <<"\blue [cure_message]"
+ H <Choose up to '+opts.highlightLimit+' strings that will highlight the line when they appear in chat.
' +
- '' +
- '[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(href_list["medical"]) if(hasHUD(usr,"medical")) @@ -563,7 +563,7 @@ var/list/rank_prefix = list(\ U.handle_regular_hud_updates() if(!modified) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecord"]) if(hasHUD(usr,"medical")) @@ -596,7 +596,7 @@ var/list/rank_prefix = list(\ read = 1 if(!read) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecordComment"]) if(hasHUD(usr,"medical")) @@ -628,7 +628,7 @@ var/list/rank_prefix = list(\ to_chat(usr, "\[Add comment\]") if(!read) - to_chat(usr, "\red Unable to locate a data core entry for this person.") + to_chat(usr, span_red("Unable to locate a data core entry for this person.")) if(href_list["medrecordadd"]) if(hasHUD(usr,"medical")) @@ -656,10 +656,10 @@ var/list/rank_prefix = list(\ counter++ if(ishuman(usr)) var/mob/living/carbon/human/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.get_authentification_name()] ([U.get_assignment()]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") + R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [CURRENT_SHIP_YEAR]
[t1]") if(href_list["lookitem"]) var/obj/item/I = locate(href_list["lookitem"]) @@ -736,7 +736,11 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/play_xylophone() if(!src.xylophone) - visible_message("\red \The [src] begins playing \his ribcage like a xylophone. It's quite spooky.","\blue You begin to play a spooky refrain on your ribcage.","\red You hear a spooky xylophone melody.") + visible_message( + span_red("\The [src] begins playing \his ribcage like a xylophone. It's quite spooky."), + span_blue("You begin to play a spooky refrain on your ribcage."), + span_red("You hear a spooky xylophone melody.") + ) var/song = pick('sound/effects/xylophone1.ogg','sound/effects/xylophone2.ogg','sound/effects/xylophone3.ogg') playsound(loc, song, 50, 1, -1) xylophone = 1 @@ -928,7 +932,7 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/set_species(new_species, default_colour) // No more invisible screaming wheelchairs because of set_species() typos. - if(!all_species[new_species]) + if(!GLOB.all_species[new_species]) new_species = SPECIES_HUMAN if(species) @@ -943,7 +947,7 @@ var/list/rank_prefix = list(\ species.remove_inherent_verbs(src) holder_type = null - species = all_species[new_species] + species = GLOB.all_species[new_species] if(species.language) add_language(species.language) @@ -1211,7 +1215,7 @@ var/list/rank_prefix = list(\ fail_msg = "There is no exposed flesh or thin material [target_zone == BP_HEAD ? "on their head" : "on their body"] to inject into." to_chat(user, span_warning(fail_msg)) -/mob/living/carbon/human/print_flavor_text(shrink = 1) +/mob/living/carbon/human/get_flavor_text(shrink = 1) var/list/equipment = list(src.head,src.wear_mask,src.glasses,src.w_uniform,src.wear_suit,src.gloves,src.shoes) for(var/obj/item/clothing/C in equipment) @@ -1302,8 +1306,8 @@ var/list/rank_prefix = list(\ var/obj/item/clothing/under/U = w_uniform if(U.accessories.len) for(var/obj/item/clothing/accessory/holster/H in U.accessories) - if(get_active_hand())//do we hold something? - H.attackby(get_active_hand(), src) + if(get_active_held_item())//do we hold something? + H.attackby(get_active_held_item(), src) else H.attack_hand(src) holster_found = TRUE @@ -1376,8 +1380,11 @@ var/list/rank_prefix = list(\ /mob/living/carbon/human/proc/check_self_for_injuries() if(stat) return + visible_message(span_notice("You examine yourself."), span_notice("[src] examines themself.")) - to_chat(src, span_notice("You check yourself for injuries.")) + var/list/combined_msg = list() + + combined_msg += span_boldnotice("I check myself for injuries.") for(var/obj/item/organ/external/org in organs) var/list/status = list() @@ -1421,7 +1428,25 @@ var/list/rank_prefix = list(\ if(status.len) status_text = span_warning(english_list(status)) - src.show_message("My [org.name] is [status_text].",1) + combined_msg += "My [org.name] is [status_text]." + + combined_msg += "\n" + + switch(nutrition) + if(NUTRITION_LEVEL_FULL to INFINITY) + combined_msg += span_info("I'm completely stuffed!") + if(NUTRITION_LEVEL_WELL_FED to NUTRITION_LEVEL_FULL) + combined_msg += span_info("I'm well fed!") + if(NUTRITION_LEVEL_FED to NUTRITION_LEVEL_WELL_FED) + combined_msg += span_info("I'm not hungry.") + if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FED) + combined_msg += span_info("I could use a bite to eat.") + if(NUTRITION_LEVEL_STARVING to NUTRITION_LEVEL_HUNGRY) + combined_msg += span_info("I feel quite hungry.") + if(0 to NUTRITION_LEVEL_STARVING) + combined_msg += span_danger("I'm starving!") + + to_chat(src, boxed_message(combined_msg.Join("\n"))) /mob/living/carbon/human/need_breathe() // if(!(mNobreath in mutations)) @@ -1458,7 +1483,7 @@ var/list/rank_prefix = list(\ if(oxyLoss > 20) setOxyLoss(20) - if(getBruteLoss() + getFireLoss() >= abs(HEALTH_THRESHOLD_DEAD)) + if(getBruteLoss() + getFireLoss() >= abs(CONFIG_GET(number/health_threshold_dead))) resuscitate_notify(5) timeofdeath = 0 return 0 diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index f87c28d1c89..fa7ad227366 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -16,7 +16,7 @@ if(H.hand) temp = H.organs_by_name[BP_L_ARM] if(!temp || !temp.is_usable()) - to_chat(H, "\red You can't use your hand.") + to_chat(H, span_red("You can't use your hand.")) return H.stop_blocking() @@ -33,7 +33,7 @@ var/damage = rand(0, 9) if(!damage) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - visible_message("\red [H] has attempted to punch [src]!") + visible_message(span_red("[H] has attempted to punch [src]!")) return 0 var/obj/item/organ/external/affecting = get_organ(ran_zone(H.targeted_organ)) @@ -42,11 +42,11 @@ playsound(loc, "punch", 25, 1, -1) - visible_message("\red [H] has punched [src]!") + visible_message(span_red("[H] has punched [src]!")) damage_through_armor(damage, HALLOSS, affecting, ARMOR_MELEE) if(damage >= 9) - visible_message("\red [H] has weakened [src]!") + visible_message(span_red("[H] has weakened [src]!")) apply_effect(4, WEAKEN, getarmor(affecting, ARMOR_MELEE)) return @@ -55,7 +55,7 @@ if(I_HELP) if(can_operate(src, M) == CAN_OPERATE_ALL && do_surgery(src, M, null, TRUE)) return 1 - else if(istype(H) && health < HEALTH_THRESHOLD_CRIT && health > HEALTH_THRESHOLD_DEAD) + else if(istype(H) && health < CONFIG_GET(number/health_threshold_crit) && health > CONFIG_GET(number/health_threshold_dead)) if(H == src) to_chat(H, span_notice("You can't perform CPR on yourself.")) return @@ -215,8 +215,8 @@ //Try to reduce damage by blocking if(blocking) - if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. - var/obj/item/grab/G = get_active_hand() + if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. + var/obj/item/grab/G = get_active_held_item() grab_redirect_attack(M, G) return else @@ -247,7 +247,7 @@ if(w_uniform) w_uniform.add_fingerprint(M) - var/list/holding = list(get_active_hand() = 40, get_inactive_hand = 20) + var/list/holding = list(get_active_held_item() = 40, get_inactive_held_item = 20) //See if they have any guns that might go off for(var/obj/item/gun/W in holding) @@ -277,7 +277,7 @@ visible_message(span_warning("[M] attempted to disarm [src]")) return if(istype(I, /obj/item/twohanded/offhand)) //did someone dare to switch to offhand to not get disarmed? - unEquip(src.get_inactive_hand()) + unEquip(src.get_inactive_held_item()) visible_message(span_danger("[M] has disarmed [src]!")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) return diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index bddcb92592d..e9dff6ebfcf 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -304,7 +304,6 @@ This function restores all organs. return 0 return - /mob/living/carbon/human/proc/get_organ(zone) RETURN_TYPE(/obj/item/organ/external) if(!zone) @@ -313,6 +312,14 @@ This function restores all organs. zone = BP_HEAD return organs_by_name[zone] +/mob/living/carbon/human/proc/get_hand_organs() + RETURN_TYPE(/obj/item/organ/external) + + return list( + organs_by_name[BP_R_ARM], + organs_by_name[BP_L_ARM], + ) + /mob/living/carbon/human/apply_damage(damage = 0, damagetype = BRUTE, def_zone, armor_divisor = 1, wounding_multiplier = 1, sharp = FALSE, edge = FALSE, obj/used_weapon, armor_divisor) //visible_message("Hit debug. [damage] | [damagetype] | [def_zone] | [blocked] | [sharp] | [used_weapon]") diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 992cbba89a1..c5d9cce7b0e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -212,8 +212,8 @@ meteor_act var/item_size_affect = 0 //the bigger the thing you hold is, the more damage you can block var/toughness = max(1, stats.getStat(STAT_TGH)) //passive blocking with shields is handled differently(code is above this proc) - if(get_active_hand())//are we blocking with an item? - var/obj/item/I = get_active_hand() + if(get_active_held_item())//are we blocking with an item? + var/obj/item/I = get_active_held_item() if(istype(I)) item_size_affect = I.w_class * 5 stat_affect = 0.2 @@ -281,8 +281,8 @@ meteor_act return FALSE if(blocking) - if(istype(get_active_hand(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. - var/obj/item/grab/G = get_active_hand() + if(istype(get_active_held_item(), /obj/item/grab))//we are blocking with a human shield! We redirect the attack. You know, because grab doesn't exist as an item. + var/obj/item/grab/G = get_active_held_item() grab_redirect_attack(G, I) return FALSE else @@ -379,7 +379,7 @@ meteor_act visible_message(span_warning("[src] is winded!"), span_danger("You feel disoriented!")) confused = max(confused, 2) external_recoil(40) - var/obj/item/item_in_active_hand = get_active_hand() + var/obj/item/item_in_active_hand = get_active_held_item() if(recoil >= 60 && item_in_active_hand) if(istype(item_in_active_hand, /obj/item/grab)) break_all_grabs(user) //See about breaking grips or pulls @@ -409,7 +409,7 @@ meteor_act if(istype(AM,/obj/)) var/obj/O = AM - if(in_throw_mode && !get_active_hand() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode + if(in_throw_mode && !get_active_held_item() && speed <= THROWFORCE_SPEED_DIVISOR) //empty active hand and we're in throw mode if(canmove && !restrained()) if(isturf(O.loc)) put_in_active_hand(O) @@ -447,7 +447,7 @@ meteor_act if (O.is_hot() >= HEAT_MOBIGNITE_THRESHOLD) IgniteMob() - src.visible_message("\red [src] has been hit in the [hit_area] by [O].") + src.visible_message(span_red("[src] has been hit in the [hit_area] by [O].")) damage_through_armor(throw_damage, dtype, null, ARMOR_MELEE, null, used_weapon = O, sharp = is_sharp(O), edge = has_edge(O)) @@ -458,7 +458,7 @@ meteor_act src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") if(!ismouse(src)) - msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]") //thrown weapon embedded object code. if(istype(O,/obj/item)) @@ -486,7 +486,7 @@ meteor_act if(O.throw_source && momentum >= THROWNOBJ_KNOCKBACK_SPEED) var/dir = get_dir(O.throw_source, src) - visible_message("\red [src] staggers under the impact!","\red You stagger under the impact!") + visible_message(span_red("[src] staggers under the impact!"), span_red("You stagger under the impact!")) src.throw_at(get_edge_target_turf(src,dir),1,momentum) if(!O || !src) return diff --git a/code/modules/mob/living/carbon/human/human_hud.dm b/code/modules/mob/living/carbon/human/human_hud.dm index e7d5cb063e4..fd173631ba3 100644 --- a/code/modules/mob/living/carbon/human/human_hud.dm +++ b/code/modules/mob/living/carbon/human/human_hud.dm @@ -103,7 +103,7 @@ var/slotID = get_inventory_slot(I) I.screen_loc = find_inv_position(slotID) - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(I) I.update_hud_actions() /* update_inv_w_uniform(0) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 89dbe288ca9..a3a876d05aa 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -26,8 +26,8 @@ tally += 1 if(recoil) - var/obj/item/gun/GA = get_active_hand() - var/obj/item/gun/GI = get_inactive_hand() + var/obj/item/gun/GA = get_active_held_item() + var/obj/item/gun/GI = get_inactive_held_item() var/brace_recoil = 0 if(istype(GA)) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index c39592a7f57..3df095ecbcc 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -45,9 +45,9 @@ if(failed) src.Weaken(rand(2,4)) - for(var/mob/O in viewers(src, null)) + for(var/mob/O in viewers(get_turf(src))) if ((O.client && !( O.blinded ))) - O.show_message(text("\red [] [failed ? "tried to tackle" : "has tackled"] down []!", src, T), 1) + O.show_message(span_red(text("[] [failed ? "tried to tackle" : "has tackled"] down []!", src, T)), 1) /mob/living/carbon/human/proc/leap(mob/living/carbon/human/T) if(last_special > world.time) @@ -87,16 +87,16 @@ return if(stat || paralysis || stunned || weakened || lying) - to_chat(src, "\red You cannot do that in your current state.") + to_chat(src, span_red("You cannot do that in your current state.")) return var/obj/item/grab/G = locate() in src if(!G || !istype(G)) - to_chat(src, "\red You are not grabbing anyone.") + to_chat(src, span_red("You are not grabbing anyone.")) return if(G.state < GRAB_AGGRESSIVE) - to_chat(src, "\red You must have an aggressive grab to gut your prey!") + to_chat(src, span_red("You must have an aggressive grab to gut your prey!")) return last_special = world.time + 50 @@ -143,7 +143,7 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text]") - to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.species.name == src.species.name) @@ -163,7 +163,7 @@ if(M in stomach_contents) stomach_contents.Remove(M) M.loc = loc - src.visible_message("\red [src] hurls out the contents of their stomach!") + src.visible_message(span_red("[src] hurls out the contents of their stomach!")) return /mob/living/carbon/human/proc/psychic_whisper(mob/M as mob in oview()) @@ -174,8 +174,8 @@ var/msg = sanitize(input("Message:", "Psychic Whisper") as text|null) if(msg) log_say("PsychicWhisper: [key_name(src)]->[M.key] : [msg]") - to_chat(M, "\green You hear a strange, alien voice in your head... \italic [msg]") - to_chat(src, "\green You said: \"[msg]\" to [M]") + to_chat(M, span_green("You hear a strange, alien voice in your head... \italic [msg]")) + to_chat(src, span_green("You said: \"[msg]\" to [M]")) return @@ -249,7 +249,11 @@ gender = FEMALE regenerate_icons() - visible_message("\blue \The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!", "\blue You change your appearance!", "\red Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + visible_message( + span_blue("\The [src] morphs and changes [get_visible_gender() == MALE ? "his" : get_visible_gender() == FEMALE ? "her" : "their"] appearance!"), + span_blue("You change your appearance!"), + span_red("Oh, god! What the hell was that? It sounded like flesh getting squished and bone ground into a different shape!") + ) /mob/living/carbon/human/proc/phaze_trough() set name = "Phaze" @@ -344,10 +348,10 @@ var/say = sanitize(input("What do you wish to say")) if(get_active_mutation(target, MUTATION_REMOTESAY)) - target.show_message("\blue You hear [real_name]'s voice: [say]") + target.show_message(span_blue("You hear [real_name]'s voice: [say]")) else - target.show_message("\blue You hear a voice that seems to echo around the room: [say]") - show_message("\blue You project your mind into [target.real_name]: [say]") + target.show_message(span_blue("You hear a voice that seems to echo around the room: [say]")) + show_message(span_blue("You project your mind into [target.real_name]: [say]")) log_say("[key_name(usr)] sent a telepathic message to [key_name(target)]: [say]") for(var/mob/observer/ghost/G in world) G.show_message("Telepathic message from [src] to [target]: [say]") diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index afc258eccd2..01f17640f1f 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -7,7 +7,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "quick-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(!I) to_chat(src, span_notice("You are not holding anything to equip.")) return @@ -33,7 +33,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "belt-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(!I) to_chat(src, span_notice("You are not holding anything to equip.")) return @@ -43,7 +43,7 @@ This saves us from having to call add_fingerprint() any time something is put in set name = "suit-storage-equip" set hidden = 1 - var/obj/item/I = get_active_hand() + var/obj/item/I = get_active_held_item() if(I) if(src.s_store) to_chat(src, span_notice("You have no room to equip or draw.")) @@ -68,7 +68,7 @@ This saves us from having to call add_fingerprint() any time something is put in var/obj/item/storage/S - for(var/i in list(get_inactive_hand(), back, get_active_hand())) + for(var/i in list(get_inactive_held_item(), back, get_active_held_item())) if(istype(i, /obj/item/storage)) S = i break @@ -80,7 +80,7 @@ This saves us from having to call add_fingerprint() any time something is put in break if(S && (!istype(S, /obj/item/storage/backpack) || S:worn_check())) - equip_to_from_bag(get_active_hand(), S) + equip_to_from_bag(get_active_held_item(), S) //Puts the item into our active hand if possible. returns 1 on success. @@ -240,7 +240,7 @@ This saves us from having to call add_fingerprint() any time something is put in update_action_buttons() return 1 -/mob/living/carbon/human/proc/get_active_hand_organ() +/mob/living/carbon/human/proc/get_active_held_item_organ() if(hand) return get_organ(BP_L_ARM) else @@ -257,7 +257,7 @@ This saves us from having to call add_fingerprint() any time something is put in SEND_SIGNAL_OLD(src, COMSING_HUMAN_EQUITP, W) switch(slot) if(slot_in_backpack) - if(src.get_active_hand() == W) + if(src.get_active_held_item() == W) src.remove_from_mob(W) W.forceMove(src.back) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f3de8e1a4bc..f2265e87ea2 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -200,7 +200,7 @@ to_chat(src, span_warning("It becomes hard to see for some reason.")) eye_blurry = 10 if(getBrainLoss() >= 35) - if(7 <= rn && rn <= 9) if(get_active_hand()) + if(7 <= rn && rn <= 9) if(get_active_held_item()) to_chat(src, span_danger("Your hand won't respond properly, you drop what you're holding!")) drop_item() if(getBrainLoss() >= 45) @@ -329,7 +329,7 @@ failed_last_breath = 1 if(prob(20)) emote("gasp") - if(health > HEALTH_THRESHOLD_CRIT) + if(health > CONFIG_GET(number/health_threshold_crit)) adjustOxyLoss(HUMAN_MAX_OXYLOSS) else adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS) @@ -791,7 +791,7 @@ blinded = TRUE silent = 0 return 1 - if(health <= HEALTH_THRESHOLD_DEAD) //No health = death + if(health <= CONFIG_GET(number/health_threshold_dead)) //No health = death if(stats.getPerk(PERK_UNFINISHED_DELIVERY) && prob(33)) //Unless you have this perk heal_organ_damage(20, 20) adjustOxyLoss(-100) @@ -968,7 +968,7 @@ var/external_health = (1 - (limb_health ? limb_damage / limb_health : 0)) * 100 var/internal_health = (1 - (organ_health ? organ_damage / organ_health : 0)) * 100 - var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-HEALTH_THRESHOLD_CRIT)/(maxHealth-HEALTH_THRESHOLD_CRIT)*100) + var/percentage_health = RoundHealth(min(crit_health, external_health, internal_health)) // Old: RoundHealth((health-CONFIG_GET(number/health_threshold_crit))/(maxHealth-CONFIG_GET(number/health_threshold_crit))*100) holder.icon_state = "hud[percentage_health]" hud_list[HEALTH_HUD] = holder diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 1b97f088687..281fedf99c9 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -219,9 +219,9 @@ else return capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name(gender) @@ -233,9 +233,9 @@ else return capitalize(pick(GLOB.first_names_male)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name(gender) @@ -244,9 +244,9 @@ if(!name_language) return capitalize(pick(GLOB.last_names)) - var/datum/language/species_language = all_languages[name_language] + var/datum/language/species_language = GLOB.all_languages[name_language] if(!species_language) - species_language = all_languages[default_language] + species_language = GLOB.all_languages[default_language] if(!species_language) return "unknown" return species_language.get_random_name() @@ -346,7 +346,7 @@ if(H.equipment_tint_total >= TINT_BLIND) H.eye_blind = max(H.eye_blind, 1) - if(config.welder_vision) + if(CONFIG_GET(flag/welder_vision)) if(H.equipment_tint_total == TINT_HEAVY) H.client.screen |= global_hud.darkMask else if((!H.equipment_prescription && (H.sdisabilities & NEARSIGHTED)) || H.equipment_tint_total == TINT_MODERATE) diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 0ee70610054..5b17016c3d3 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -55,7 +55,7 @@ // Are we placing or stripping? var/stripping - var/obj/item/held = user.get_active_hand() + var/obj/item/held = user.get_active_held_item() if(!istype(held) || is_robot_module(held)) if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here? return @@ -78,7 +78,7 @@ if(!do_mob(user,src,HUMAN_STRIP_DELAY,progress = 1)) return - if(!stripping && user.get_active_hand() != held) + if(!stripping && user.get_active_held_item() != held) return if(stripping) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 97f71f20298..166077f56ae 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -6,7 +6,7 @@ var/alt_name = "" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return message = sanitize(message) @@ -14,7 +14,7 @@ if (src.client) if (src.client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot whisper (muted).") + to_chat(src, span_red("You cannot whisper (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) @@ -112,7 +112,7 @@ message = replacetext(message, "u", "�") message = replacetext(message, "b", "�") - var/list/listening = hearers(message_range, src) + var/list/listening = hearers(message_range, get_turf(src)) listening |= src //ghosts @@ -134,11 +134,11 @@ if (O) O.hear_talk(src, message, verb, speaking, 1) - var/list/eavesdropping = hearers(eavesdropping_range, src) + var/list/eavesdropping = hearers(eavesdropping_range, get_turf(src)) eavesdropping -= src eavesdropping -= listening - var/list/watching = hearers(watching_range, src) + var/list/watching = hearers(watching_range, get_turf(src)) watching -= src watching -= listening watching -= eavesdropping diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index 1cfd98ba454..27d34a1d529 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -16,7 +16,7 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot send IC messages (muted).") + to_chat(src, span_red("You cannot send IC messages (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -88,9 +88,9 @@ to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate. You can also set your face with: \n\nnomood, pout, sad, angry, frown, smile") else - to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list.")) if ((message && src.stat == 0)) send_emote(message, m_type) if(updateicon) regenerate_icons() - return \ No newline at end of file + return diff --git a/code/modules/mob/living/carbon/superior_animal/ai.dm b/code/modules/mob/living/carbon/superior_animal/ai.dm index 6a171210ae2..99089e75d91 100644 --- a/code/modules/mob/living/carbon/superior_animal/ai.dm +++ b/code/modules/mob/living/carbon/superior_animal/ai.dm @@ -71,7 +71,7 @@ /mob/living/carbon/superior_animal/proc/isValidAttackTarget(var/atom/O) if (isliving(O)) var/mob/living/L = O - if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends)) + if((L.stat != CONSCIOUS) || (L.health <= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0)) || (!attack_same && (L.faction == src.faction)) || (L in friends)) return return 1 diff --git a/code/modules/mob/living/carbon/superior_animal/defense.dm b/code/modules/mob/living/carbon/superior_animal/defense.dm index 2de9a6fb1cd..7e64f9196be 100644 --- a/code/modules/mob/living/carbon/superior_animal/defense.dm +++ b/code/modules/mob/living/carbon/superior_animal/defense.dm @@ -72,13 +72,13 @@ if (I_DISARM) if (!weakened && prob(30)) - M.visible_message("\red [M] has shoved \the [src]") + M.visible_message(span_red("[M] has shoved \the [src]")) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) Weaken(3) return 1 else - M.visible_message("\red [M] failed to shove \the [src]") + M.visible_message(span_red("[M] failed to shove \the [src]")) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) M.do_attack_animation(src) @@ -87,7 +87,7 @@ var/damage = 3 if ((stat == CONSCIOUS) && prob(10)) playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1) - M.visible_message("\red [M] missed \the [src]") + M.visible_message(span_red("[M] missed \the [src]")) else if (istype(H)) damage += max(0, (H.stats.getStat(STAT_ROB) / 10)) @@ -95,7 +95,7 @@ // damage *= 2 playsound(loc, "punch", 25, 1, -1) - M.visible_message("\red [M] has punched \the [src]") + M.visible_message(span_red("[M] has punched \the [src]")) adjustBruteLoss(damage) updatehealth() diff --git a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm index 0f0121ee196..9ae55391a75 100644 --- a/code/modules/mob/living/carbon/superior_animal/roach/attack.dm +++ b/code/modules/mob/living/carbon/superior_animal/roach/attack.dm @@ -5,7 +5,7 @@ if(ishuman(L)) H = L if(H) - var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_hand() + var/obj/item/reagent_containers/food/snacks/grown/howdoitameahorseinminecraft = H.get_active_held_item() if(istype(howdoitameahorseinminecraft)) if(try_tame(H, howdoitameahorseinminecraft)) return FALSE //If they manage to tame the roach, stop the attack diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 26dea366e43..ab1bb501764 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -30,6 +30,6 @@ if (istype(langname, /datum/language)) L = langname else - L = all_languages[langname] + L = GLOB.all_languages[langname] languages |= L default_language = L diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index dcb7213b3cd..8595d05da94 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -4,7 +4,7 @@ . = FALSE ..() - if(config.enable_mob_sleep) + if(CONFIG_GET(flag/enable_mob_sleep)) if(stat != DEAD && !mind) // Check for mind so player-driven, nonhuman mobs don't sleep if(life_cycles_before_scan > 0) life_cycles_before_scan-- diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f42a6e04a90..7c417797fb8 100755 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -170,7 +170,7 @@ default behaviour is: if (health < 0) adjustOxyLoss(health + maxHealth * 2) // Deal 2x health in OxyLoss damage, as before but variable. health = -maxHealth - to_chat(src, "\blue You have given up life and succumbed to death.") + to_chat(src, span_blue("You have given up life and succumbed to death.")) /mob/living/proc/updatehealth() @@ -561,7 +561,7 @@ default behaviour is: var/obj/item/grab/G = pick(M.grabbed_by) if (istype(G, /obj/item/grab)) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [] has been pulled from []'s grip by []", G.affecting, G.assailant, src), 1) + O.show_message(span_red(text("[] has been pulled from []'s grip by []", G.affecting, G.assailant, src)), 1) //G = null qdel(G) else @@ -834,7 +834,7 @@ default behaviour is: if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.pull_damage()) - to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.") + to_chat(src, span_red("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)) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index fe497a0c620..338dd293485 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -175,7 +175,7 @@ if (P.is_hot() >= HEAT_MOBIGNITE_THRESHOLD) IgniteMob() - if(config.z_level_shooting && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency + if(CONFIG_GET(flag/z_level_shooting) && P.height) // If the bullet came from above or below, limit what bodyparts can be hit for consistency if(resting || lying) return PROJECTILE_CONTINUE // Bullet flies overhead @@ -186,8 +186,8 @@ def_zone_hit = pick(list(BP_CHEST, BP_GROIN, BP_L_LEG, BP_R_LEG)) //Being hit while using a deadman switch - if(istype(get_active_hand(),/obj/item/device/assembly/signaler)) - var/obj/item/device/assembly/signaler/signaler = get_active_hand() + if(istype(get_active_held_item(),/obj/item/device/assembly/signaler)) + var/obj/item/device/assembly/signaler/signaler = get_active_held_item() if(signaler.deadman && prob(80)) log_and_message_admins("has triggered a signaler deadman's switch") src.visible_message(span_warning("[src] triggers their deadman's switch!")) @@ -297,7 +297,7 @@ src.attack_log += text("\[[time_stamp()]\] Has been hit with a [O], thrown by [M.name] ([assailant.ckey])") M.attack_log += text("\[[time_stamp()]\] Hit [src.name] ([src.ckey]) with a thrown [O]") if(!ismouse(src)) - msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (JMP)") + msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) [ADMIN_JMP(src)]") // Begin BS12 momentum-transfer code. var/mass = 1.5 diff --git a/code/modules/mob/living/living_recoil.dm b/code/modules/mob/living/living_recoil.dm index 83b51a9a62c..de88f39be74 100644 --- a/code/modules/mob/living/living_recoil.dm +++ b/code/modules/mob/living/living_recoil.dm @@ -34,7 +34,7 @@ //Called after setting recoil /mob/living/proc/update_recoil() - var/obj/item/gun/G = get_active_hand() + var/obj/item/gun/G = get_active_held_item() if(istype(G) && G) G.check_safety_cursor(src) @@ -48,7 +48,7 @@ return /mob/living/update_cursor() - var/obj/item/gun/G = get_active_hand() + var/obj/item/gun/G = get_active_held_item() if(get_preference_value(/datum/client_preference/gun_cursor) != GLOB.PREF_YES || (!istype(G, /obj/item/gun) || G.safety)) remove_cursor() return diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 7c4d631f728..616900c67ce 100755 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -137,7 +137,7 @@ var/list/channel_to_radio_key = new /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="") if(client) if(client.prefs.muted&MUTE_IC) - to_chat(src, "\red You cannot speak in IC (Muted).") + to_chat(src, span_red("You cannot speak in IC (Muted).")) return if(stat) @@ -298,7 +298,7 @@ var/list/channel_to_radio_key = new INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(animate_speechbubble), speech_bubble, speech_bubble_recipients, 30) INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, animate_chat), message, speaking, italics, speech_bubble_recipients, 40, verb) - if(config.tts_enabled && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src))) + if(CONFIG_GET(flag/tts_enabled) && !message_mode && (!client || !BITTEST(client.prefs.muted, MUTE_TTS)) && (tts_seed || ishuman(src))) //TO DO: Remove need for that damn copypasta var/seed = tts_seed if(istype(back, /obj/item/rig)) @@ -339,7 +339,7 @@ var/list/channel_to_radio_key = new /mob/living/proc/say_signlang(var/message, var/verb="gestures", var/datum/language/language) - for (var/mob/O in viewers(src, null)) + for (var/mob/O in viewers(get_turf(src))) O.hear_signlang(message, verb, language, src) return 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 46f683d1b0d..32f4cb2327a 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -393,11 +393,11 @@ var/list/ai_verbs_default = list( if(emergency_message_cooldown) to_chat(usr, span_warning("Arrays recycling. Please stand by.")) return - var/input = sanitize(input(usr, "Please choose a message to transmit to [boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + var/input = sanitize(input(usr, "Please choose a message to transmit to [GLOB.boss_short] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) if(!input) return to_chat(usr, span_notice("No response from the remote server. Please, contact your system administrator.")) - log_say("[key_name(usr)] has made an IA [boss_short] announcement: [input]") + log_say("[key_name(usr)] has made an IA [GLOB.boss_short] announcement: [input]") emergency_message_cooldown = 1 spawn(300) emergency_message_cooldown = 0 @@ -445,7 +445,7 @@ var/list/ai_verbs_default = list( if(target && (!ishuman(target) || target.real_name == target.get_face_name())) ai_actual_track(target) else - to_chat(src, "\red System error. Cannot locate [href_list["trackname"]].") + to_chat(src, span_red("System error. Cannot locate [href_list["trackname"]].")) return return diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index e4bda7e3cf4..536190c105e 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -112,7 +112,7 @@ // Returns percentage of AI's remaining hardware integrity (maxhealth - (bruteloss + fireloss)) /mob/living/silicon/ai/proc/hardware_integrity() - return max(0,(health-HEALTH_THRESHOLD_DEAD)/2) + return max(0,(health-CONFIG_GET(number/health_threshold_dead))/2) // Cleaner proc for creating powersupply for an AI. /mob/living/silicon/ai/proc/create_powersupply() diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm index 6b615ce500b..df8627c954d 100644 --- a/code/modules/mob/living/silicon/decoy/life.dm +++ b/code/modules/mob/living/silicon/decoy/life.dm @@ -2,7 +2,7 @@ if (src.stat == 2) return else - if (src.health <= HEALTH_THRESHOLD_DEAD && src.stat != 2) + if (src.health <= CONFIG_GET(number/health_threshold_dead) && src.stat != 2) death() return diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index ca033aa94c0..a2d3b9b538d 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -9,8 +9,8 @@ extra_description += "\n[span_deadsay("It looks completely unsalvageable.")]" extra_description += "\n*---------*" - if(print_flavor_text()) - extra_description += "\n[print_flavor_text()]\n" + if(get_flavor_text()) + extra_description += "\n[get_flavor_text()]\n" if(pose) if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 ) diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 659ce0bbef3..9fda53ff847 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -6,7 +6,7 @@ if(get_dist(src, src.cable) > 1) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2) + M.show_message(span_red("The data cable rapidly retracts back into its spool."), 3, span_red("You hear a click and the sound of wire spooling rapidly."), 2) qdel(src.cable) src.cable = null @@ -33,4 +33,4 @@ health = 100 stat = CONSCIOUS else - health = 100 - getBruteLoss() - getFireLoss() \ No newline at end of file + health = 100 - getBruteLoss() - getFireLoss() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 4ff76d6891c..3cf09140dcd 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -121,7 +121,7 @@ if(prob(20)) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) - M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2) + 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) return src.death(0) switch(pick(1,2,3)) diff --git a/code/modules/mob/living/silicon/robot/analyzer.dm b/code/modules/mob/living/silicon/robot/analyzer.dm index c5513644f95..c5abb3fdddd 100644 --- a/code/modules/mob/living/silicon/robot/analyzer.dm +++ b/code/modules/mob/living/silicon/robot/analyzer.dm @@ -21,13 +21,13 @@ if(!cell_use_check(5, user)) return /* if((CLUMSY in user.mutations) && prob(50)) - to_chat(user, text("\red You try to analyze the floor's vitals!")) + to_chat(user, text(span_red("You try to analyze the floor's vitals!"))) for(var/mob/O in viewers(M, null)) - O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) - user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) - user.show_message(text("\blue \t Damage Specifics: [0]-[0]-[0]-[0]"), 1) - user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue Body Temperature: ???", 1) + O.show_message(text(span_red("[user] has analyzed the floor's vitals!")), 1) + user.show_message(text(span_blue("Analyzing Results for The floor:\n\t Overall Status: Healthy")), 1) + user.show_message(text(span_blue("\t Damage Specifics: [0]-[0]-[0]-[0]")), 1) + user.show_message(span_blue("Key: Suffocation/Toxin/Burns/Brute"), 1) + user.show_message(span_blue("Body Temperature: ???"), 1) return */ var/scan_type @@ -36,7 +36,7 @@ else if(ishuman(M)) scan_type = "prosthetics" else - to_chat(user, "\red You can't analyze non-robotic things!") + to_chat(user, span_red("You can't analyze non-robotic things!")) return user.visible_message(span_notice("\The [user] has analyzed [M]'s components."),span_notice("You have analyzed [M]'s components.")) @@ -44,28 +44,28 @@ if("robot") var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - user.show_message("\blue Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health - M.halloss]% functional"]") + 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: Electronics/Brute", 1) user.show_message("\t Damage Specifics: [BU] - [BR]") if(M.timeofdeath && M.stat == DEAD) - user.show_message("\blue Time of Disable: [worldtime2stationtime(M.timeofdeath)]") + user.show_message(span_blue("Time of Disable: [worldtime2stationtime(M.timeofdeath)]")) var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) - user.show_message("\blue Localized Damage:",1) + user.show_message(span_blue("Localized Damage:"),1) if(length(damaged)>0) for(var/datum/robot_component/org in damaged) - user.show_message(text("\blue \t []: [][] - [] - [] - []", \ + user.show_message(span_blue(text("\t []: [][] - [] - [] - []", \ capitalize(org.name), \ (org.installed == -1) ? "DESTROYED " :"",\ (org.electronics_damage > 0) ? "[org.electronics_damage]" :0, \ (org.brute_damage > 0) ? "[org.brute_damage]" :0, \ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ - (org.powered) ? "Power ON" : "Power OFF"),1) + (org.powered) ? "Power ON" : "Power OFF")),1) else - user.show_message("\blue \t Components are OK.",1) + user.show_message(span_blue("\t Components are OK."),1) if(H.HasTrait(CYBORG_TRAIT_EMAGGED) && prob(5)) - user.show_message("\red \t ERROR: INTERNAL SYSTEMS COMPROMISED",1) - user.show_message("\blue Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + user.show_message(span_red("\t ERROR: INTERNAL SYSTEMS COMPROMISED"),1) + user.show_message(span_blue("Operating Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)"), 1) if("prosthetics") var/mob/living/carbon/human/H = M diff --git a/code/modules/mob/living/silicon/robot/drone/_drone.dm b/code/modules/mob/living/silicon/robot/drone/_drone.dm index ddd5ac3bb2f..6de8b52e9b4 100644 --- a/code/modules/mob/living/silicon/robot/drone/_drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/_drone.dm @@ -68,7 +68,7 @@ var/list/mob_hat_cache = list() /mob/living/silicon/robot/drone/can_be_possessed_by(var/mob/observer/ghost/possessor) if(!istype(possessor) || !possessor.client || !possessor.ckey) return 0 - if(!config.allow_drone_spawn) + if(!CONFIG_GET(flag/allow_drone_spawn)) to_chat(src, span_danger("Playing as drones is not currently permitted.")) return 0 if(too_many_active_drones()) @@ -134,7 +134,7 @@ var/list/mob_hat_cache = list() additional_law_channels["Drone"] = "d" if(!laws) laws = new law_type - flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" + flavor_text = "A tiny little repair drone. The casing is stamped with an corporate logo and the subscript: '[GLOB.company_name] Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'" playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) //Redefining some robot procs... @@ -191,7 +191,7 @@ var/list/mob_hat_cache = list() if(stat == 2) - if(!config.allow_drone_spawn || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave. + if(!CONFIG_GET(flag/allow_drone_spawn) || HasTrait(CYBORG_TRAIT_EMAGGED) || health < -35) //It's dead, Dave. to_chat(user, span_danger("The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")) return @@ -337,7 +337,7 @@ var/list/mob_hat_cache = list() for(var/mob/living/silicon/robot/drone/D in SSmobs.mob_list) if(D.key && D.client) drones++ - return drones >= config.max_maint_drones + return drones >= CONFIG_GET(number/max_maint_drones) /mob/living/silicon/robot/drone/verb/choose_eyecolor() set name = "Choose Light Color" 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 d56994581e5..09783e7fea6 100755 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -149,9 +149,9 @@ dat += {" Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"} @@ -168,7 +168,7 @@ else if(activated(O)) module_string += text("[O]: Activated
") else - module_string += text("[O]: Activate
") + module_string += text("[O]: Activate
") if((istype(O,/obj/item) || istype(O,/obj/item/device)) && !(istype(O,/obj/item/stack/cable_coil))) tools += module_string @@ -183,7 +183,7 @@ else if(activated(module.emag)) dat += text("[module.emag]: Activated
") else - dat += text("[module.emag]: Activate
") + dat += text("[module.emag]: Activate
") dat += resources diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 700ea615380..5037154a3d0 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -47,13 +47,13 @@ icon_state = "drone_fab_active" var/elapsed = world.time - time_last_drone - drone_progress = round((elapsed/config.drone_build_time)*100) + drone_progress = round((elapsed/CONFIG_GET(number/drone_build_time))*100) if(drone_progress >= 100) visible_message("\The [src] voices a strident beep, indicating a drone chassis is prepared.") /obj/machinery/drone_fabricator/examine(mob/user, extra_description = "") - if(produce_drones && drone_progress >= 100 && isghost(user) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) + if(produce_drones && drone_progress >= 100 && isghost(user) && CONFIG_GET(flag/allow_drone_spawn) && count_drones() < CONFIG_GET(number/max_maint_drones)) extra_description += "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone." ..(user, extra_description) @@ -62,7 +62,7 @@ if(stat & NOPOWER) return - if(!produce_drones || !config.allow_drone_spawn || count_drones() >= config.max_maint_drones) + if(!produce_drones || !CONFIG_GET(flag/allow_drone_spawn) || count_drones() >= CONFIG_GET(number/max_maint_drones)) return if(!player || (!isghost(player.mob) && !aibound)) @@ -105,7 +105,7 @@ to_chat(user, span_danger("The game hasn't started yet!")) return - if(!(config.allow_drone_spawn)) + if(!CONFIG_GET(flag/allow_drone_spawn)) to_chat(user, span_danger("That verb is not currently permitted.")) return 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 012b537dfd8..ab2995f6211 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -16,7 +16,7 @@ return emote(copytext(message,2)) if(copytext(message,1,2) == ";") - var/datum/language/L = all_languages[communication_channel] + var/datum/language/L = GLOB.all_languages[communication_channel] if(istype(L)) return L.broadcast(src,trim(copytext(message,2))) @@ -24,7 +24,7 @@ if (stat) return 0 - var/list/listeners = hearers(5,src) + var/list/listeners = hearers(5, get_turf(src)) listeners |= src for(var/mob/living/silicon/D in listeners) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 1bbb185d6d2..8bbd6600c8d 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -208,7 +208,7 @@ if ("help") to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt") else - to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + to_chat(src, span_blue("Unusable emote '[act]'. Say *help for a list.")) if ((message && src.stat == 0)) custom_emote(m_type, message) diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 2160f483dcc..479174648dc 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -29,10 +29,10 @@ if(DEAD) extra_description += "[span_deadsay("It's completely broken, but looks repairable.")]\n" //TODO: add no_soul status or flag if(module_active) - extra_description += "It is wielding \icon[module_active] [module_active].\n" + extra_description += "It is wielding [icon2html(module_active, user)] [module_active].\n" extra_description += "*---------*" - if(print_flavor_text()) extra_description += "\n[print_flavor_text()]\n" + if(get_flavor_text()) extra_description += "\n[get_flavor_text()]\n" if(pose) if( findtext(pose,".",length(pose)) == 0 && findtext(pose,"!",length(pose)) == 0 && findtext(pose,"?",length(pose)) == 0 ) diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index ab63957e78c..b1eff90c936 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -2,7 +2,7 @@ //as they handle all relevant stuff like adding it to the player's screen and such //Returns the thing in our active hand (whatever is in our active module-slot, in this case) -/mob/living/silicon/robot/get_active_hand() +/mob/living/silicon/robot/get_active_held_item() return module_active /*-------TODOOOOOOOOOO--------*/ diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index a571f1c3ea0..061ed1742bd 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -62,7 +62,7 @@ src.has_power = 1 else if (src.has_power) - to_chat(src, "\red You are now running on emergency backup power.") + to_chat(src, span_red("You are now running on emergency backup power.")) src.has_power = 0 if(lights_on) // Light is on but there is no power! lights_on = 0 @@ -87,7 +87,7 @@ if(src.resting) Weaken(5) - if(health < HEALTH_THRESHOLD_DEAD && src.stat != 2) //die only once + if(health < CONFIG_GET(number/health_threshold_dead) && src.stat != 2) //die only once death() diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 2c9826d4062..2b3c4cc04ba 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -872,9 +872,9 @@ dat += {" Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
+ Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
+ Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
+ Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
Installed Modules
"} @@ -885,17 +885,17 @@ else if(activated(obj)) dat += text("[obj]: Activated
") else - dat += text("[obj]: Activate
") + dat += text("[obj]: Activate
") if (HasTrait(CYBORG_TRAIT_EMAGGED)) if(activated(module.emag)) dat += text("[module.emag]: Activated
") else - dat += text("[module.emag]: Activate
") + dat += text("[module.emag]: Activate
") /* if(activated(obj)) - dat += text("[obj]: \[Activated | Deactivate\]
") + dat += text("[obj]: \[Activated | Deactivate\]
") else - dat += text("[obj]: \[Activate | Deactivated\]
") + dat += text("[obj]: \[Activate | Deactivated\]
") */ src << browse(HTML_SKELETON_TITLE("Modules", dat), "window=robotmod") @@ -1048,7 +1048,7 @@ set category = "IC" set src = usr - var/obj/item/W = get_active_hand() + var/obj/item/W = get_active_held_item() if(W) W.attack_self(src) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index ee9d900f7e8..6786d541929 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -75,13 +75,13 @@ var/absorb_burn_cost = (burn*shield.shield_level)*100 if(cell.is_empty()) - to_chat(src, "\red Your shield has overloaded!") + to_chat(src, span_red("Your shield has overloaded!")) else var/absorb_brute = cell.use(absorb_brute_cost)/100 var/absorb_burn = cell.use(absorb_burn_cost)/100 brute -= absorb_brute burn -= absorb_burn - to_chat(src, "\red Your shield absorbs some of the impact!") + to_chat(src, span_red("Your shield absorbs some of the impact!")) if(!emp) var/datum/robot_component/armour/A = get_armour() @@ -120,13 +120,13 @@ var/absorb_burn_cost = (burn*shield.shield_level)*100 if(cell.is_empty()) - to_chat(src, "\red Your shield has overloaded!") + to_chat(src, span_red("Your shield has overloaded!")) else var/absorb_brute = cell.use(absorb_brute_cost)/100 var/absorb_burn = cell.use(absorb_burn_cost)/100 brute -= absorb_brute burn -= absorb_burn - to_chat(src, "\red Your shield absorbs some of the impact!") + to_chat(src, span_red("Your shield absorbs some of the impact!")) var/datum/robot_component/armour/A = get_armour() if(A) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index c51d3184962..3a18a1a949f 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -172,7 +172,7 @@ overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer) addedSomething = 1 if ( addedSomething ) - user.visible_message("\blue [user] load some items onto their service tray.") + user.visible_message(span_blue("[user] load some items onto their service tray.")) return @@ -212,9 +212,9 @@ sleep(rand(2,4)) if ( droppedSomething ) if ( foundtable ) - user.visible_message("\blue [user] unloads their service tray.") + user.visible_message(span_blue("[user] unloads their service tray.")) else - user.visible_message("\blue [user] drops all the items on their tray.") + user.visible_message(span_blue("[user] drops all the items on their tray.")) return ..() @@ -292,7 +292,7 @@ deploy_paper(get_turf(src)) /obj/item/form_printer/proc/deploy_paper(var/turf/T) - T.visible_message("\blue \The [src.loc] dispenses a sheet of crisp white paper.") + T.visible_message(span_blue("\The [src.loc] dispenses a sheet of crisp white paper.")) new /obj/item/paper(T) diff --git a/code/modules/mob/living/silicon/robot/robot_parts.dm b/code/modules/mob/living/silicon/robot/robot_parts.dm index 5c3fa064e01..f761bbcebb0 100644 --- a/code/modules/mob/living/silicon/robot/robot_parts.dm +++ b/code/modules/mob/living/silicon/robot/robot_parts.dm @@ -121,7 +121,7 @@ var/obj/item/secbot_assembly/ed209_assembly/B = new(loc) B.forceMove(get_turf(src)) to_chat(user, span_notice("You armed the robot frame.")) - if (user.get_inactive_hand() == src) + if (user.get_inactive_held_item() == src) user.remove_from_mob(src) user.put_in_inactive_hand(B) qdel(src) @@ -290,7 +290,7 @@ ..() if(istype(W, /obj/item/device/flash)) if(isrobot(user)) - var/current_module = user.get_active_hand() + var/current_module = user.get_active_held_item() if(current_module == W) to_chat(user, span_warning("How do you propose to do that?")) return diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 6c28d85e25f..618c07efeb9 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -102,9 +102,9 @@ shock_damage *= 0.75 //take reduced damage take_overall_damage(0, shock_damage) - visible_message("\red [src] was shocked by \the [source]!", \ - "\red Energy pulse detected, system damaged!", \ - "\red You hear an electrical crack") + visible_message(span_red("[src] was shocked by \the [source]!"), \ + span_red("Energy pulse detected, system damaged!"), \ + span_red("You hear an electrical crack")) if(prob(20)) Stun(2) return @@ -158,7 +158,7 @@ return universal_speak || (speaking in speech_synthesizer_langs) //need speech synthesizer support to vocalize a language /mob/living/silicon/add_language(var/language, var/can_speak=1) - var/datum/language/added_language = all_languages[language] + var/datum/language/added_language = GLOB.all_languages[language] if(!added_language) return @@ -168,7 +168,7 @@ return 1 /mob/living/silicon/remove_language(var/rem_language) - var/datum/language/removed_language = all_languages[rem_language] + var/datum/language/removed_language = GLOB.all_languages[rem_language] if(!removed_language) return @@ -254,7 +254,7 @@ to_chat(src, "\The [A.alarm_name()].") if(alarm_raised) - to_chat(src, "\[Show Alerts\]") + to_chat(src, "\[Show Alerts\]") for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] diff --git a/code/modules/mob/living/simple_animal/borer/borer.dm b/code/modules/mob/living/simple_animal/borer/borer.dm index da7e92776bf..a69fdfbb7dc 100644 --- a/code/modules/mob/living/simple_animal/borer/borer.dm +++ b/code/modules/mob/living/simple_animal/borer/borer.dm @@ -158,7 +158,7 @@ if(invisibility) chemicals -= invisibility_cost if(chemicals <= max_chemicals/2 && (max_chemicals/2) - invisibility_cost <= chemicals) - to_chat(src, to_chat(src, "\red Your invisibility will run out soon!")) + to_chat(src, to_chat(src, span_red("Your invisibility will run out soon!"))) if(chemicals <= invisibility_cost + 1) invisible() // Disable invisibility chemicals = 0 diff --git a/code/modules/mob/living/simple_animal/borer/borer_captive.dm b/code/modules/mob/living/simple_animal/borer/borer_captive.dm index 72b6240a55d..ce3250f04db 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_captive.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_captive.dm @@ -9,7 +9,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot speak in IC (muted).") + to_chat(src, span_red("You cannot speak in IC (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 4106b2061f5..2608b75d087 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -238,7 +238,7 @@ return if(world.time - used_dominate < 1 MINUTE) // a one minutes cooldown. - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(is_ventcrawling) @@ -263,7 +263,7 @@ var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices if(world.time - used_dominate < 1 MINUTE) - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(!M || !Adjacent(M)) return @@ -503,7 +503,7 @@ return if(!host) - to_chat(src, "\red You cannot do this without a host.") + to_chat(src, span_red("You cannot do this without a host.")) return if(docile) @@ -541,11 +541,11 @@ return if(world.time - used_dominate < 1 MINUTE) - to_chat(src, "\red You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.") + to_chat(src, span_red("You cannot use that ability again so soon. It will be ready in [(1 MINUTE - (world.time - used_dominate))/ (1 SECOND)] seconds.")) return if(host) - to_chat(src, "\red You cannot do this inside a host.") + to_chat(src, span_red("You cannot do this inside a host.")) return if(invisibility) @@ -592,12 +592,12 @@ return if(!host) - to_chat(src, "\red You cannot do this without a host.") + to_chat(src, span_red("You cannot do this without a host.")) return var/reproduce_cost = (round(max_chemicals_inhost * 0.75)) // literally max chems but 75% of it if(chemicals >= reproduce_cost) - to_chat(host, "\red Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.") - visible_message("\red [host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") + to_chat(host, span_red("Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.")) + visible_message(span_red("[host.name] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!")) has_reproduced = TRUE chemicals -= reproduce_cost if(istype(host, /mob/living/carbon/human/) && !host.isMonkey()) @@ -645,7 +645,7 @@ log_say("[key_name(src)] communed to [key_name(M)]: [text]") - to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + to_chat(M, span_blue("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]")) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/modules/mob/living/simple_animal/borer/say.dm b/code/modules/mob/living/simple_animal/borer/say.dm index 5446b3aa361..03e40896940 100644 --- a/code/modules/mob/living/simple_animal/borer/say.dm +++ b/code/modules/mob/living/simple_animal/borer/say.dm @@ -14,7 +14,7 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - to_chat(src, "\red You cannot speak in IC (muted).") + to_chat(src, span_red("You cannot speak in IC (muted).")) return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index e76f1e43675..1da76f86b17 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -158,7 +158,7 @@ /mob/living/simple_animal/cat/fluff/handle_movement_target() if (friend) var/follow_dist = 5 - if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT) //danger + if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) //danger follow_dist = 1 else if (friend.stat || friend.health <= 50) //danger or just sleeping follow_dist = 2 @@ -192,7 +192,7 @@ if (stat || !friend) return if (get_dist(src, friend) <= 1) - if (friend.stat >= DEAD || friend.health <= HEALTH_THRESHOLD_SOFTCRIT) + if (friend.stat >= DEAD || friend.health <= CONFIG_GET(number/health_threshold_softcrit)) if (prob((friend.stat < DEAD)? 50 : 15)) var/verb = pick("meows", "mews", "mrowls") visible_emote(pick("[verb] in distress.", "[verb] anxiously.")) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index e8b63560b75..cc775134805 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -109,7 +109,7 @@ //pupplies cannot wear anything. /mob/living/simple_animal/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "\red You can't fit this on [src]") + to_chat(usr, span_red("You can't fit this on [src]")) return ..() @@ -129,7 +129,7 @@ //Lisa already has a cute bow! /mob/living/simple_animal/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - to_chat(usr, "\red [src] already has a cute bow!") + to_chat(usr, span_red("[src] already has a cute bow!")) return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 5460eaf109a..916d556c940 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -38,7 +38,7 @@ if(enemies.len && prob(10)) enemies = list() LoseTarget() - src.visible_message("\blue [src] calms down.") + src.visible_message(span_blue("[src] calms down.")) if(stat == CONSCIOUS) if(udder && prob(5)) @@ -76,9 +76,9 @@ user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - to_chat(user, "\red The [O] is full.") + to_chat(user, span_red("The [O] is full.")) if(!transfered) - to_chat(user, "\red The udder is dry. Wait a bit longer...") + to_chat(user, span_red("The udder is dry. Wait a bit longer...")) else ..() //cow @@ -114,9 +114,9 @@ user.visible_message(span_notice("[user] milks [src] using \the [O].")) var/transfered = udder.trans_id_to(G, "milk", rand(5,10)) if(G.reagents.total_volume >= G.volume) - to_chat(user, "\red The [O] is full.") + to_chat(user, span_red("The [O] is full.")) if(!transfered) - to_chat(user, "\red The udder is dry. Wait a bit longer...") + to_chat(user, span_red("The udder is dry. Wait a bit longer...")) else ..() @@ -227,12 +227,12 @@ var/global/chicken_count = 0 var/obj/item/reagent_containers/food/snacks/grown/G = O if(G.seed && G.seed.kitchen_tag == "wheat") if(!stat && eggsleft < 8) - user.visible_message("\blue [user] feeds [O] to [name]! It clucks happily.","\blue You feed [O] to [name]! It clucks happily.") + user.visible_message(span_blue("[user] feeds [O] to [name]! It clucks happily."), span_blue("You feed [O] to [name]! It clucks happily.")) user.drop_item() qdel(O) eggsleft += rand(1, 4) else - to_chat(user, "\blue [name] doesn't seem hungry!") + to_chat(user, span_blue("[name] doesn't seem hungry!")) else to_chat(user, "[name] doesn't seem interested in that.") else diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c434df7267c..959a433d774 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -225,7 +225,7 @@ if( ishuman(AM) ) if(!stat) var/mob/M = AM - to_chat(M, span_notice("\icon[src] Squeek!")) + to_chat(M, span_notice("[icon2html(src, M)] Squeek!")) poke(1) //Wake up if stepped on if (prob(95)) squeak(0) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 30f9da72d7f..1eced813ab7 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -45,7 +45,7 @@ /mob/living/simple_animal/spiderbot/New() ..() add_language(LANGUAGE_COMMON) - default_language = all_languages[LANGUAGE_COMMON] + default_language = GLOB.all_languages[LANGUAGE_COMMON] add_verb(src, /mob/living/proc/ventcrawl) add_verb(src, /mob/living/proc/hide) @@ -218,7 +218,7 @@ return if(!held_item) - to_chat(usr, "\red You have nothing to drop!") + to_chat(usr, span_red("You have nothing to drop!")) return 0 if(istype(held_item, /obj/item/grenade)) @@ -275,7 +275,7 @@ /mob/living/simple_animal/spiderbot/examine(mob/user, extra_description = "") if(held_item) - extra_description += "\nIt is carrying \icon[src.held_item] \a [src.held_item]." + extra_description += "\nIt is carrying [icon2html(src.held_item, user)] \a [src.held_item]." ..(user, extra_description) /mob/living/simple_animal/spiderbot/cannot_use_vents() diff --git a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm index 06609e863e2..96eb9f8635d 100644 --- a/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm +++ b/code/modules/mob/living/simple_animal/hostile/commanded/commanded.dm @@ -104,7 +104,7 @@ //returns a list of everybody we wanna do stuff with. /mob/living/simple_animal/hostile/commanded/proc/get_targets_by_name(var/text, var/filter_friendlies = 0) - var/list/possible_targets = hearers(src,10) + var/list/possible_targets = hearers(10, get_turf(src)) . = list() for(var/mob/M in possible_targets) if(filter_friendlies && ((M in friends) || M.faction == faction || M == master)) @@ -187,4 +187,4 @@ allowed_targets += M stance = HOSTILE_STANCE_ATTACK if(M in friends) - friends -= M \ No newline at end of file + friends -= M diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index bd83011c16c..ebe28496050 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -174,7 +174,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST /mob/living/simple_animal/hostile/proc/ListTargets(var/dist = 7) - var/list/L = hearers(src, dist) + var/list/L = hearers(dist, get_turf(src)) for (var/mob/living/exosuit/M in GLOB.mechas_list) if (M.z == z && get_dist(src, M) <= dist) @@ -209,7 +209,7 @@ var/list/mydirs = list(NORTH, SOUTH, EAST, WEST, SOUTHWEST, NORTHWEST, NORTHEAST /mob/living/simple_animal/hostile/proc/OpenFire(target_mob) var/target = target_mob - visible_message("\red [src] [fire_verb] at [target]!", 1) + visible_message(span_danger("[src] [fire_verb] at [target]!"), 1) if(rapid) spawn(1) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm index a9fbb55f22b..0459e90e7c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm @@ -71,6 +71,7 @@ //self repair systems have a chance to bring the drone back to life /mob/living/simple_animal/hostile/retaliate/malf_drone/Life() + var/htmlicon = icon2html(src, viewers(get_turf(src))) //emps and lots of damage can temporarily shut us down if(disabled > 0) stat = UNCONSCIOUS @@ -86,7 +87,7 @@ //repair a bit of damage if(prob(1)) - src.visible_message("\red \icon[src] [src] shudders and shakes as some of it's damaged systems come back online.") + src.visible_message(span_red("[htmlicon] [src] shudders and shakes as some of it's damaged systems come back online.")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -101,10 +102,10 @@ //sometimes our targetting sensors malfunction, and we attack anyone nearby if(prob(disabled ? 0 : 1)) if(hostile_drone) - src.visible_message("\blue \icon[src] [src] retracts several targetting vanes, and dulls it's running lights.") + src.visible_message(span_blue("[htmlicon] [src] retracts several targetting vanes, and dulls it's running lights.")) hostile_drone = 0 else - src.visible_message("\red \icon[src] [src] suddenly lights up, and additional targetting vanes slide into place.") + src.visible_message(span_red("[htmlicon] [src] suddenly lights up, and additional targetting vanes slide into place.")) hostile_drone = 1 if(health / maxHealth > 0.9) @@ -125,17 +126,17 @@ exploding = 0 if(!disabled) if(prob(50)) - src.visible_message("\blue \icon[src] [src] suddenly shuts down!") + src.visible_message(span_blue("[htmlicon] [src] suddenly shuts down!")) else - src.visible_message("\blue \icon[src] [src] suddenly lies still and quiet.") + src.visible_message(span_blue("[htmlicon] [src] suddenly lies still and quiet.")) disabled = rand(150, 600) walk(src,0) if(exploding && prob(20)) if(prob(50)) - src.visible_message("\red \icon[src] [src] begins to spark and shake violenty!") + src.visible_message(span_red("[htmlicon] [src] begins to spark and shake violenty!")) else - src.visible_message("\red \icon[src] [src] sparks and shakes like it's about to explode!") + src.visible_message(span_red("[htmlicon] [src] sparks and shakes like it's about to explode!")) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm index 2132641dd44..03a6b4ba17b 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/exoplanet.dm @@ -44,7 +44,7 @@ set category = "Exploration" set src in view() - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return if(!CanInteract(usr, GLOB.conscious_state)) return diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 97468201f07..6d4fa6dbdd0 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -63,13 +63,13 @@ if (O.damtype == HALLOSS) damage = 0 health -= damage - visible_message("\red \b [src] has been attacked with the [O] by [user]. ") + visible_message(span_red("\b [src] has been attacked with the [O] by [user]. ")) else - visible_message("\red \b [src] blocks the [O] with its shield! ") + visible_message(span_red("\b [src] blocks the [O] with its shield! ")) //user.do_attack_animation(src) else - to_chat(usr, "\red This weapon is ineffective, it does no damage.") - visible_message("\red [user] gently taps [src] with the [O]. ") + to_chat(usr, span_red("This weapon is ineffective, it does no damage.")) + visible_message(span_red("[user] gently taps [src] with the [O]. ")) /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj) @@ -77,7 +77,7 @@ if(prob(65)) ..() else - visible_message("\red [src] blocks [Proj] with its shield!") + visible_message(span_red("[src] blocks [Proj] with its shield!")) return 0 diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index b56d94c4b54..908ccafad15 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -156,27 +156,27 @@ if(copytext_char(possible_phrase,1,2) == get_prefix_key(/decl/prefix/radio_channel_selection) && (copytext_char(possible_phrase,2,3) in department_radio_keys)) possible_phrase = copytext_char(possible_phrase,3,length(possible_phrase)) else - to_chat(usr, "\red There is nothing to remove from its [remove_from].") + to_chat(usr, span_red("There is nothing to remove from its [remove_from].")) return //Adding things to inventory else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] - if(!usr.get_active_hand()) - to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") + if(!usr.get_active_held_item()) + to_chat(usr, span_red("You have nothing in your hand to put on its [add_to].")) return switch(add_to) if("ears") if(ears) - to_chat(usr, "\red It's already wearing something.") + to_chat(usr, span_red("It's already wearing something.")) return else - var/obj/item/item_to_add = usr.get_active_hand() + var/obj/item/item_to_add = usr.get_active_held_item() if(!item_to_add) return if( !istype(item_to_add, /obj/item/device/radio/headset) ) - to_chat(usr, "\red This object won't fit.") + to_chat(usr, span_red("This object won't fit.")) return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -406,7 +406,7 @@ if(!parrot_perch || parrot_interest.loc != parrot_perch.loc) held_item = parrot_interest parrot_interest.loc = src - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") parrot_interest = null parrot_state = PARROT_SWOOP | PARROT_RETURN @@ -566,7 +566,7 @@ return -1 if(held_item) - to_chat(src, "\red You are already holding the [held_item]") + to_chat(src, span_red("You are already holding the [held_item]")) return 1 for(var/obj/item/I in view(1,src)) @@ -579,10 +579,10 @@ held_item = I I.loc = src - visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") + visible_message(span_danger("[src] grabs the [held_item]!"), span_blue("You grab the [held_item]!"), "You hear the sounds of wings flapping furiously.") return held_item - to_chat(src, "\red There is nothing of interest to take.") + to_chat(src, span_red("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -594,7 +594,7 @@ return -1 if(held_item) - to_chat(src, "\red You are already holding the [held_item]") + to_chat(src, span_red("You are already holding the [held_item]")) return 1 var/obj/item/stolen_item = null @@ -617,7 +617,7 @@ ) return held_item - to_chat(src, "\red There is nothing of interest to take.") + to_chat(src, span_red("There is nothing of interest to take.")) return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -641,7 +641,7 @@ return -1 if(!held_item) - to_chat(usr, "\red You have nothing to drop!") + to_chat(usr, span_red("You have nothing to drop!")) return 0 if(!drop_gently) @@ -674,7 +674,7 @@ src.loc = AM.loc icon_state = "parrot_sit" return - to_chat(src, "\red There is no perch nearby to sit on.") + to_chat(src, span_red("There is no perch nearby to sit on.")) return /* diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index ba7b0b63a88..33bbbef0185 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -352,10 +352,10 @@ if(I_HELP) if (health > 0) - M.visible_message("\blue [M] [response_help] \the [src]") + M.visible_message(span_blue("[M] [response_help] \the [src]")) if(I_DISARM) - M.visible_message("\blue [M] [response_disarm] \the [src]") + M.visible_message(span_blue("[M] [response_disarm] \the [src]")) M.do_attack_animation(src) //TODO: Push the mob away or something @@ -373,13 +373,13 @@ G.affecting = src LAssailant = M - M.visible_message("\red [M] has grabbed [src] passively!") + M.visible_message(span_red("[M] has grabbed [src] passively!")) M.do_attack_animation(src) if(I_HURT) adjustBruteLoss(harm_intent_damage) playsound(src, pick(punch_sound),60,1) - M.visible_message("\red [M] [response_harm] \the [src]") + M.visible_message(span_red("[M] [response_harm] \the [src]")) M.do_attack_animation(src) return @@ -450,7 +450,7 @@ var/mob/living/exosuit/M = _target_mob if(length(M.pilots)) return FALSE - else if(!L.stat || L.health >= (ishuman(L) ? HEALTH_THRESHOLD_CRIT : 0)) + else if(!L.stat || L.health >= (ishuman(L) ? CONFIG_GET(number/health_threshold_crit) : 0)) return FALSE if(istype(_target_mob, /obj/machinery/bot)) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 295184da74e..6afa2e87abd 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -4,7 +4,7 @@ lastKnownIP = client.address computer_id = client.computer_id log_access("Login: [key_name(src)] from [lastKnownIP ? lastKnownIP : "localhost"]-[computer_id] || BYOND v[client.byond_version]") - if(config.log_access) + if(CONFIG_GET(flag/log_access)) var/is_multikeying = 0 for(var/mob/M in GLOB.player_list) if(M == src) continue diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 6180016f651..fa02b7335f9 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -52,31 +52,35 @@ /mob/GenerateTag() tag = "mob_[next_mob_id++]" -/mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) +/mob/proc/show_message(msg, type, alt_msg, alt_type, avoid_highlighting = FALSE)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) if(!client) return + msg = copytext_char(msg, 1, MAX_MESSAGE_LEN) + if(type) - if(type & 1 && (sdisabilities & BLIND || blinded || paralysis)) //Vision related - if(!alt) + if(type & MSG_VISUAL && is_blind())//Vision related + if(!alt_msg) return else - msg = alt + msg = alt_msg type = alt_type - if(type & 2 && (sdisabilities & DEAF || ear_deaf)) //Hearing related - if(!alt) + + if(type & MSG_AUDIBLE && ear_deaf)//Hearing related + if(!alt_msg) return else - msg = alt + msg = alt_msg type = alt_type - if((type & 1 && sdisabilities & BLIND)) + if(type & MSG_VISUAL && is_blind()) return + // voice muffling + if(stat == UNCONSCIOUS || stat == HARDCRIT) + if(type & MSG_AUDIBLE) //audio + to_chat(src, "... You can almost hear something ...") + return + to_chat(src, msg, avoid_highlighting = avoid_highlighting) - // Added voice muffling for Issue 41. - if(stat == UNCONSCIOUS || sleeping > 0) - to_chat(src, "... You can almost hear someone talking ...") - else - to_chat(src, msg) // Show a message to all mobs and objects in sight of this one // This would be for visible actions by the src mob @@ -364,7 +368,7 @@ if(incapacitated()) return - var/obj/item/W = get_active_hand() + var/obj/item/W = get_active_held_item() if (W) W.attack_self(src) @@ -376,7 +380,7 @@ if(incapacitated()) return - var/obj/item/item = get_active_hand() + var/obj/item/item = get_active_held_item() if(!item) return @@ -442,7 +446,7 @@ if(msg != null) flavor_text = msg -/mob/proc/print_flavor_text() +/mob/proc/get_flavor_text() if (flavor_text && flavor_text != "") var/msg = trim(replacetext(flavor_text, "\n", " ")) if(!msg) return "" @@ -466,7 +470,7 @@ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || isnewplayer(src)) - to_chat(usr, "\blue You must be observing to use this!") + to_chat(usr, span_blue("You must be observing to use this!")) return if(is_admin && stat == DEAD) @@ -566,7 +570,7 @@ /mob/proc/pull_damage() if(ishuman(src)) var/mob/living/carbon/human/H = src - if(H.health - H.halloss <= HEALTH_THRESHOLD_SOFTCRIT) + if(H.health - H.halloss <= CONFIG_GET(number/health_threshold_softcrit)) for(var/name in H.organs_by_name) var/obj/item/organ/external/e = H.organs_by_name[name] if(e && H.lying) @@ -589,6 +593,7 @@ set category = "IC" if(pulling) + animate_interact(pulling, INTERACT_UNPULL) pulling.pulledby = null pulling = null if(HUDneed.Find("pull")) @@ -654,13 +659,12 @@ src.pulling = AM AM.pulledby = src - /*if(pullin) - pullin.icon_state = "pull1"*/ + animate_interact(AM, INTERACT_PULL) if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(H.pull_damage()) - to_chat(src, "\red Pulling \the [H] in their current condition would probably be a bad idea.") + to_chat(src, span_boldwarning("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)) @@ -1272,6 +1276,12 @@ All Canmove setting in this proc is temporary. This var should not be set from h return var/obj/screen/zone_sel/selector = mob.HUDneed["damage zone"] selector.set_selected_zone(next_list_item(mob.targeted_organ,zones)) + logger.Log( + LOG_CATEGORY_TARGET_ZONE_SWITCH, + "[key_name(src)] manually changed selected zone", + data = zones + ) + /mob/proc/set_stat(var/new_stat) . = stat != new_stat stat = new_stat diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b303851678d..e377336892c 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -48,7 +48,7 @@ var/other_mobs var/next_move var/transforming //Carbon - var/hand + var/hand = 0 var/real_name var/bhunger = 0 //Carbon diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 67cf64d40a6..9c66f532867 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -328,10 +328,11 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) /proc/broadcast_hud_message(var/message, var/broadcast_source, var/list/targets, var/icon) var/turf/sourceturf = get_turf(broadcast_source) + var/htmlicon = icon2html(icon, targets) for(var/mob/M in targets) var/turf/targetturf = get_turf(M) if((targetturf.z == sourceturf.z)) - M.show_message(span_info("\icon[icon] [message]"), 1) + M.show_message(span_info("[htmlicon] [message]"), 1) /proc/mobs_in_area(var/area/A) var/list/mobs = new @@ -383,7 +384,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[span_name("[lname]")] " - to_chat(M, span_deadsay("" + create_text_tag("dead", "DEAD:", M.client) + " [lname][follow][message]")) + to_chat(M, span_deadsay("DEAD: [lname][follow][message]")) //Announces that a ghost has joined/left, mainly for use with wizards /proc/announce_ghost_joinleave(O, var/joined_ghosts = 1, var/message = "") @@ -393,7 +394,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) var/mob/M = O if(M.client) C = M.client - else if(istype(O, /client)) + else if(isclient(O)) C = O else if(istype(O, /datum/mind)) var/datum/mind/M = O @@ -521,10 +522,10 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) return can_admin_interact() && ..(ghost_multitool) /mob/living/carbon/human/get_multitool() - return ..(get_active_hand()) + return ..(get_active_held_item()) /mob/living/silicon/robot/get_multitool() - return ..(get_active_hand()) + return ..(get_active_held_item()) /mob/living/silicon/ai/get_multitool() return ..(aiMulti) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 2abd1b02f10..498eb701407 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -67,12 +67,12 @@ to_chat(usr, span_warning("This mob type cannot drop items.")) /mob/living/carbon/hotkey_drop() - if(!get_active_hand()) + if(!get_active_held_item()) to_chat(usr, span_warning("You have nothing to drop in your hand.")) if (!isturf(loc)) return else - unEquip(get_active_hand(), loc) + unEquip(get_active_held_item(), loc) //This gets called when you press the delete button. /client/verb/delete_key_pressed() diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index b9f769d4020..876f82c9dc5 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,7 @@ /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/subspecies) if(isnewplayer(src)) - to_chat(usr, "\red cannot convert players who have not entered yet.") + to_chat(usr, span_red("cannot convert players who have not entered yet.")) return if(!new_type) @@ -19,7 +19,7 @@ return if( new_type == /mob/new_player ) - to_chat(usr, "\red cannot convert into a new_player mob type.") + to_chat(usr, span_red("cannot convert into a new_player mob type.")) return var/mob/M diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 1bfb05355cb..b32108d9944 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -17,8 +17,8 @@ // return FALSE if(join_motd) - to_chat(src, "
[join_motd]
")
- to_chat(src, "Game ID:
")
+ to_chat(src, "[game_id]
[join_motd]
")
+ to_chat(src, "Game ID:
")
loc = null
my_client = client
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 53635846ba2..e1d9a3d48e1 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -31,19 +31,29 @@
/mob/new_player/proc/new_player_panel_proc()
var/output = "[GLOB.game_id]
New Player Options"
output +="
" - output += "" + output += "" if(SSticker.current_state <= GAME_STATE_PREGAME) if(ready) - output += "
" - output += "" + output += "View the Crew Manifest
" + output += "" - output += "" + output += "" + + if (src.client.holder) + output += "
" + output += "
" + dat += "[job.title] ([job.current_positions]) (Active: [active])
" dat += "" src << browse(HTML_SKELETON_TITLE("Late join", dat), "window=latechoices;size=400x640;can_close=1") @@ -343,7 +378,7 @@ var/use_species_name var/datum/species/chosen_species if(client.prefs.species) - chosen_species = all_species[client.prefs.species] + chosen_species = GLOB.all_species[client.prefs.species] use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm. if(chosen_species && use_species_name) @@ -355,7 +390,7 @@ new_character.lastarea = get_area(NULLSPACE) for(var/lang in client.prefs.alternate_languages) - var/datum/language/chosen_language = all_languages[lang] + var/datum/language/chosen_language = GLOB.all_languages[lang] if(chosen_language) if(!(chosen_language.flags & WHITELISTED) || has_admin_rights() \ || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) @@ -401,7 +436,7 @@ return new_character /mob/new_player/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, var/glide_size_override = 0) - return 0 + return FALSE /mob/new_player/proc/close_spawn_windows() src << browse(null, "window=latechoices") //closes late choices window @@ -410,7 +445,7 @@ /mob/new_player/get_species() var/datum/species/chosen_species if(client.prefs.species) - chosen_species = all_species[client.prefs.species] + chosen_species = GLOB.all_species[client.prefs.species] if(!chosen_species) return SPECIES_HUMAN diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index d60be96b030..4aff695fc4a 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -2,8 +2,8 @@ /datum/preferences //The mob should have a gender you want before running this proc. Will run fine without H /datum/preferences/proc/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) - var/datum/species/current_species = all_species[species] - if(!current_species) current_species = all_species[SPECIES_HUMAN] + var/datum/species/current_species = GLOB.all_species[species] + if(!current_species) current_species = GLOB.all_species[SPECIES_HUMAN] gender = pick(current_species.genders) h_style = random_hair_style(gender, species) f_style = random_facial_hair_style(gender, species) diff --git a/code/modules/mob/observer/ghost/ghost.dm b/code/modules/mob/observer/ghost/ghost.dm index 1953f88243c..bbf5b8d5a25 100755 --- a/code/modules/mob/observer/ghost/ghost.dm +++ b/code/modules/mob/observer/ghost/ghost.dm @@ -168,7 +168,7 @@ Works together with spawning an observer, noted above. ghost.client = client ghost.client.init_verbs() ghost.initialise_postkey() - 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. + if(ghost.client && !ghost.client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed. remove_verb(ghost, /mob/observer/ghost/verb/toggle_antagHUD) ghost.client?.create_UI(ghost.type) @@ -196,7 +196,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") if(response == "Ghost") - message_admins("[key_name_admin(usr)] has ghosted. (JMP)") + message_admins("[key_name_admin(usr)] has ghosted. [ADMIN_JMP(src)]") log_game("[key_name_admin(usr)] has ghosted.") ghostize(0) announce_ghost_joinleave(client) @@ -233,10 +233,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return if(medHUD) medHUD = 0 - to_chat(src, "\blue Medical HUD Disabled") + to_chat(src, span_blue("Medical HUD Disabled")) else medHUD = 1 - to_chat(src, "\blue Medical HUD Enabled") + to_chat(src, span_blue("Medical HUD Enabled")) /mob/observer/ghost/verb/toggle_antagHUD() set category = "Ghost" @@ -246,14 +246,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!client) return var/mentor = is_mentor(usr.client) - if(!config.antag_hud_allowed && (!client.holder || mentor)) - to_chat(src, "\red Admins have disabled this for this round.") + if(!CONFIG_GET(flag/antag_hud_allowed) && (!client.holder || mentor)) + to_chat(src, span_red("Admins have disabled this for this round.")) return var/mob/observer/ghost/M = src if(jobban_isbanned(M, "AntagHUD")) - to_chat(src, "\red You have been banned from using this feature") + to_chat(src, span_red("You have been banned from using this feature")) return - if(config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || mentor)) + if(CONFIG_GET(flag/antag_hud_restricted) && !M.has_enabled_antagHUD && (!client.holder || mentor)) var/response = 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?","Yes","No") if(response == "No") return M.can_reenter_corpse = 0 @@ -261,10 +261,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp M.has_enabled_antagHUD = 1 if(M.antagHUD) M.antagHUD = 0 - to_chat(src, "\blue AntagHUD Disabled") + to_chat(src, span_blue("AntagHUD Disabled")) else M.antagHUD = 1 - to_chat(src, "\blue AntagHUD Enabled") + to_chat(src, span_blue("AntagHUD Enabled")) /mob/observer/ghost/proc/dead_tele(A in SSmapping.ghostteleportlocs) set category = "Ghost" @@ -385,11 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/observer/ghost/memory() set hidden = 1 - to_chat(src, "\red You are dead! You have no mind to store memory!") + to_chat(src, span_red("You are dead! You have no mind to store memory!")) /mob/observer/ghost/add_memory() set hidden = 1 - to_chat(src, "\red You are dead! You have no mind to store memory!") + to_chat(src, span_red("You are dead! You have no mind to store memory!")) /mob/observer/ghost/verb/analyze_air() @@ -407,16 +407,16 @@ 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 - to_chat(src, "\blue Results:") + to_chat(src, span_blue("Results:")) if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa") + to_chat(src, span_blue("Pressure: [round(pressure,0.1)] kPa")) else - to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa") + to_chat(src, span_red("Pressure: [round(pressure,0.1)] kPa")) if(total_moles) for(var/g in environment.gas) - to_chat(src, "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)") - to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") - to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]") + to_chat(src, span_blue("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)")) + to_chat(src, span_blue("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)")) + to_chat(src, span_blue("Heat Capacity: [round(environment.heat_capacity(),0.1)]")) /mob/observer/verb/become_mouse() @@ -453,7 +453,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, span_warning("Unable to find any safe, unwelded vents to spawn mice at. The ship must be quite a mess! Trying again might work, if you think there's still a safe place. ")) if(host) - if(config.uneducated_mice) + if(CONFIG_GET(flag/uneducated_mice)) host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = src.ckey @@ -561,7 +561,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ..() /mob/observer/ghost/proc/try_possession(var/mob/living/M) - if(!config.ghosts_can_possess_animals) + if(!CONFIG_GET(flag/ghosts_can_possess_animals)) to_chat(usr, span_warning("Ghosts are not permitted to possess animals.")) return 0 if(!M.can_be_possessed_by(src)) @@ -690,25 +690,25 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/observer/ghost/MayRespawn(var/feedback = 0, var/respawn_type = 0) if(!client) return FALSE - if(config.antag_hud_restricted && has_enabled_antagHUD == 1) + if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) if(feedback) to_chat(src, span_warning("antagHUD restrictions prevent you from respawning.")) return FALSE - if(!config.respawn_delay) + if(!CONFIG_GET(number/respawn_delay)) return TRUE var/timedifference = world.time- get_death_time(respawn_type) var/respawn_time = 0 if (respawn_type == CREW) - respawn_time = config.respawn_delay MINUTES + respawn_time = CONFIG_GET(number/respawn_delay) MINUTES //Here we factor in bonuses added from cryosleep and similar things timedifference += get_respawn_bonus() else if (respawn_type == ANIMAL) - respawn_time = min(ANIMAL_SPAWN_DELAY, config.respawn_delay) + respawn_time = min(ANIMAL_SPAWN_DELAY, CONFIG_GET(number/respawn_delay)) else if (respawn_type == MINISYNTH) - respawn_time = min(DRONE_SPAWN_DELAY, config.respawn_delay) + respawn_time = min(DRONE_SPAWN_DELAY, CONFIG_GET(number/respawn_delay)) timedifference = max(timedifference, 0) if(respawn_time && timedifference > respawn_time) @@ -765,7 +765,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Respawn" set category = "OOC" - if (!( config.abandon_allowed )) + if (!( CONFIG_GET(flag/abandon_allowed) )) to_chat(usr, span_notice("Respawn is disabled.")) return @@ -777,7 +777,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, span_notice("You must be dead to use this!")) return else if(!MayRespawn(1, CREW)) - if(!check_rights(0, 0) || alert("Normal players must wait at least [config.respawn_delay] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok") + if(!check_rights(0, 0) || alert("Normal players must wait at least [CONFIG_GET(number/respawn_delay)] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok") return //Wipe any bonuses gained in the previous (after)life diff --git a/code/modules/mob/observer/ghost/say.dm b/code/modules/mob/observer/ghost/say.dm index dfa5a9e8355..3cb646ad60d 100644 --- a/code/modules/mob/observer/ghost/say.dm +++ b/code/modules/mob/observer/ghost/say.dm @@ -8,7 +8,7 @@ if(src.client) if(src.client.prefs.muted&MUTE_DEADCHAT) - to_chat(src, "\red You cannot talk in deadchat (muted).") + to_chat(src, span_red("You cannot talk in deadchat (muted).")) return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) @@ -42,7 +42,7 @@ if(src.client) if(src.client.prefs.muted&MUTE_DEADCHAT) - to_chat(src, "\red You cannot emote in deadchat (muted).") + to_chat(src, span_red("You cannot emote in deadchat (muted).")) return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 36d2852f708..cb1e4a72959 100755 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -6,7 +6,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return if(ishuman(src)) @@ -30,7 +30,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return if(ishuman(src)) @@ -57,7 +57,7 @@ if(say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) return - if(src.client && !src.client.holder && !config.dsay_allowed) + if(src.client && !src.client.holder && !GLOB.dsay_allowed) to_chat(src, span_danger("Deadchat is globally muted.")) return @@ -157,11 +157,11 @@ var/prefix = copytext(message, 1, 2) if(length(message) >= 1 && prefix == get_prefix_key(/decl/prefix/audible_emote)) - return all_languages["Noise"] + return GLOB.all_languages["Noise"] if(length(message) >= 2 && is_language_prefix(prefix)) var/language_prefix = copytext(message, 2, 3) - var/datum/language/L = language_keys[language_prefix] + var/datum/language/L = GLOB.language_keys[language_prefix] if(can_speak(L)) return L diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm index 9846593a23a..756d2d3f1a1 100644 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ b/code/modules/modular_computers/NTNet/NTNet.dm @@ -195,7 +195,7 @@ var/global/datum/ntnet/ntnet_global = new() add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.") if(NTNET_SYSTEMCONTROL) setting_systemcontrol = !setting_systemcontrol - add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name]'s systems.") + add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name()]'s systems.") /datum/ntnet/proc/find_email_by_login(var/login) for(var/datum/computer_file/data/email_account/A in ntnet_global.email_accounts) diff --git a/code/modules/modular_computers/file_system/binary/design.dm b/code/modules/modular_computers/file_system/binary/design.dm index 7ff1bddf949..50c7289bb60 100644 --- a/code/modules/modular_computers/file_system/binary/design.dm +++ b/code/modules/modular_computers/file_system/binary/design.dm @@ -14,7 +14,7 @@ return F /datum/computer_file/binary/design/proc/set_filename(new_name) - filename = sanitizeFileName("[new_name]") + filename = SANITIZE_FILENAME("[new_name]") if(findtext(filename, "datum_design_") == 1) filename = copytext(filename, 14) diff --git a/code/modules/modular_computers/file_system/binary/research.dm b/code/modules/modular_computers/file_system/binary/research.dm index 61e58195347..d7bc2013e81 100644 --- a/code/modules/modular_computers/file_system/binary/research.dm +++ b/code/modules/modular_computers/file_system/binary/research.dm @@ -11,7 +11,7 @@ /datum/computer_file/binary/tech/proc/set_tech(datum/technology/new_tech) node = new_tech - filename = sanitizeFileName(lowertext(node.name)) + filename = SANITIZE_FILENAME(lowertext(node.name)) // R&D research points file diff --git a/code/modules/modular_computers/file_system/catalog.dm b/code/modules/modular_computers/file_system/catalog.dm index 8f61e85ccd7..db15640db34 100644 --- a/code/modules/modular_computers/file_system/catalog.dm +++ b/code/modules/modular_computers/file_system/catalog.dm @@ -12,78 +12,6 @@ GLOBAL_LIST_EMPTY(catalogs) GLOBAL_LIST_EMPTY(all_catalog_entries_by_type) -/hook/startup/proc/createCatalogs() - // Reagents - for(var/V in GLOB.chemical_reagents_list) - var/datum/reagent/D = GLOB.chemical_reagents_list[V] - if(D.appear_in_default_catalog) - create_catalog_entry(D, CATALOG_REAGENTS) - create_catalog_entry(D, CATALOG_ALL) - if(istype(D, /datum/reagent/drink) || istype(D, /datum/reagent/alcohol)) - create_catalog_entry(D, CATALOG_DRINKS) - else - create_catalog_entry(D, CATALOG_CHEMISTRY) - // second run to add decompose results - for(var/V in GLOB.chemical_reagents_list) - var/datum/reagent/D = GLOB.chemical_reagents_list[V] - if(D.heating_products && D.heating_point) - for(var/id in D.heating_products) - var/datum/catalog_entry/reagent/E = get_catalog_entry(get_reagent_type_by_id(id)) - if(E) - E.add_decomposition_from(D.type) - - if(D.chilling_products && D.chilling_point) - for(var/id in D.chilling_point) - var/datum/catalog_entry/reagent/E = get_catalog_entry(D.type) - if(E) - E.add_decomposition_from(D.type) - - var/datum/catalog/C = GLOB.catalogs[CATALOG_REAGENTS] - C.associated_template = "catalog_list_reagents.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - C = GLOB.catalogs[CATALOG_CHEMISTRY] - C.associated_template = "catalog_list_reagents.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_chem) - C = GLOB.catalogs[CATALOG_DRINKS] - C.associated_template = "catalog_list_drinks.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - C = GLOB.catalogs[CATALOG_ALL] - C.associated_template = "catalog_list_general.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - createCookingCatalogs() - return TRUE - -/proc/create_catalog_entry(var/datum/thing, var/catalog_id) - if(catalog_id && !GLOB.catalogs[catalog_id]) - GLOB.catalogs[catalog_id] = new /datum/catalog(catalog_id) - if(!GLOB.all_catalog_entries_by_type[thing.type]) - if(istype(thing, /datum/reagent)) - if(istype(thing, /datum/reagent/drink) || (istype(thing, /datum/reagent/alcohol) && thing.type != /datum/reagent/alcohol)) - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/drink(thing) - else - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/reagent(thing) - else if(istype(thing, /atom)) - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/atom(thing) - else - var/list/element = GLOB.catalogs[catalog_id] - if(!element.len) - qdel(element) - GLOB.catalogs.Remove(catalog_id) - return FALSE - error("Unsupported type passed to /proc/create_catalog_entry()") - return FALSE - if(catalog_id) - var/datum/catalog/C = GLOB.catalogs[catalog_id] - C.add_entry(GLOB.all_catalog_entries_by_type[thing.type]) - else if(catalog_id) - var/datum/catalog/C = GLOB.catalogs[catalog_id] - if(!C.entry_list.Find(GLOB.all_catalog_entries_by_type[thing.type])) - C.add_entry(GLOB.all_catalog_entries_by_type[thing.type]) - return TRUE - -/proc/get_catalog_entry(var/type) - if(GLOB.all_catalog_entries_by_type[type]) - return GLOB.all_catalog_entries_by_type[type] /datum/catalog var/id diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index cb62e0aee79..00407ba259c 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -28,7 +28,7 @@ var/list/data = host.initial_data() data["src"] = "\ref[src]" - data["station_name"] = station_name + data["station_name()"] = station_name() data["manifest"] = html_crew_manifest() data["assignments"] = show_assignments if(program && program.computer) @@ -187,7 +187,7 @@ if(computer.card_slot && computer.card_slot.stored_card) computer.proc_eject_id(user) else - computer.attackby(user.get_active_hand(), user) + computer.attackby(user.get_active_held_item(), user) if("terminate") if(!authorized(user_id_card, ACCESS_REGION_COMMAND)) to_chat(user, span_warning("Access denied.")) diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 756ae88b629..7e876618b1d 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -136,7 +136,7 @@ if(announcment_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements") return TRUE - var/input = input(usr, "Please write a message to announce to the [station_name].", "Priority Announcement") as null|text + var/input = input(usr, "Please write a message to announce to the [station_name()].", "Priority Announcement") as null|text if(!input || !can_still_topic()) return 1 if(GLOB.in_character_filter.len) //I don't want to read announcements about sending people to brazil. diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm index 6a7de53b1cc..2e305034e79 100644 --- a/code/modules/modular_computers/file_system/programs/generic/records.dm +++ b/code/modules/modular_computers/file_system/programs/generic/records.dm @@ -130,8 +130,8 @@ return 1 /datum/nano_module/records/proc/get_photo(var/mob/user) - if(istype(user.get_active_hand(), /obj/item/photo)) - var/obj/item/photo/photo = user.get_active_hand() + if(istype(user.get_active_held_item(), /obj/item/photo)) + var/obj/item/photo/photo = user.get_active_held_item() return photo.img if(istype(user, /mob/living/silicon)) var/mob/living/silicon/tempAI = usr diff --git a/code/modules/modular_computers/file_system/programs/generic/signaller.dm b/code/modules/modular_computers/file_system/programs/generic/signaller.dm index 0c65ae76712..bec5f499afc 100644 --- a/code/modules/modular_computers/file_system/programs/generic/signaller.dm +++ b/code/modules/modular_computers/file_system/programs/generic/signaller.dm @@ -101,5 +101,7 @@ /datum/computer_file/program/signaller/proc/receive_signal(datum/signal/signal) if(signal.encryption == code) - for(var/mob/O in hearers(1, computer.loc)) - O.show_message("\icon[computer] *beep* *beep*", 3, "*beep* *beep*", 2) + var/our_hearers = hearers(1, get_turf(computer)) + var/htmlicon = icon2html(computer, our_hearers) + for(var/mob/O in our_hearers) + O.show_message("[htmlicon] *beep* *beep*", 3, "*beep* *beep*", 2) diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 134e01e37cc..19be303cd23 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -258,7 +258,7 @@ return var/t = "" - t += "
" + t += "
" t += "INDEX: #[O.ordernum]
" t += "REQUESTED BY: [O.orderedby]
" t += "RANK: [O.orderedrank]
" @@ -272,7 +272,7 @@ /datum/nano_module/supply/proc/print_summary(var/mob/user) var/t = "" - t += "
[maps_data.station_name]
[station_date]
Export overview
" + t += "
[maps_data.station_name()]
[station_date]
Export overview
" for(var/source in SSsupply.point_source_descriptions) t += "[SSsupply.point_source_descriptions[source]]: [SSsupply.point_sources[source] || 0]
" print_text(t, user) diff --git a/code/modules/modular_computers/file_system/programs/generic/trade.dm b/code/modules/modular_computers/file_system/programs/generic/trade.dm index daec921afa8..ae254f69cd8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/trade.dm +++ b/code/modules/modular_computers/file_system/programs/generic/trade.dm @@ -68,13 +68,13 @@ var/list/category_list = list() var/list/inventory_list = list() - LAZYDISTINCTADD(shoppinglist, station) // Add the station reference to the shopping list if it doesn't already exist + shoppinglist |= station // Add the station reference to the shopping list if it doesn't already exist if(!islist(shoppinglist[station])) // If nothing has been added under this station, create an empty list shoppinglist[station] = list() category_list = shoppinglist[station] // Make the category list point to the current station's category list - LAZYDISTINCTADD(category_list, chosen_category) // Add the category to the shopping list if it doesn't already exist + category_list |= chosen_category // Add the category to the shopping list if it doesn't already exist if(!islist(category_list[chosen_category])) // If nothing has been added under this category, create an empty list category_list[chosen_category] = list() @@ -103,7 +103,7 @@ if(!path) return var/list/inventory_list = open_shop_list() // Get reference to inventory list - LAZYDISTINCTADD(inventory_list, path) + inventory_list |= path LAZYAPLUS(inventory_list, path, max(0, amount)) if(inventory_list[path] > limit) @@ -143,7 +143,7 @@ var/list_name = name ? name : "Saved Cart #[++saved_cart_id]" - LAZYDISTINCTADD(saved_shopping_lists, list_name) + saved_shopping_lists |= list_name LAZYSET(saved_shopping_lists, list_name, list_to_save) /datum/computer_file/program/trade/proc/load_shop_list(name) @@ -609,7 +609,7 @@ .["sending_index"] = SStrade.beacons_sending.Find(PRG.sending) if(PRG.station) - .["station_name"] = PRG.station.name + .["station_name()"] = PRG.station.name .["station_desc"] = PRG.station.desc .["station_id"] = PRG.station.uid .["station_index"] = SStrade.discovered_stations.Find(PRG.station) diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index f75b3f72ddc..9d86902886d 100755 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -107,7 +107,7 @@ see multiz/movement.dm for some info. /turf/open/fallThrough(var/atom/movable/mover) // If the target is open space or a shadow, the projectile traverses down - if( config.z_level_shooting && istype(mover,/obj/item/projectile) ) + if( CONFIG_GET(flag/z_level_shooting) && istype(mover,/obj/item/projectile) ) var/obj/item/projectile/P = mover if(isnull(P.height) && ( istype(P.original, /turf/open) || (istype(mover, /mob/shadow)) ) && get_dist(P.starting, P.original) <= get_dist(P.starting, src)) P.Move(below) // We want proc/Enter to get called on the turf, so we can't use forcemove() diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 2e20b56a0b6..aa2aa2ac24f 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -69,4 +69,4 @@ return list() // Not implemented. // Used by SSnano (/datum/controller/subsystem/processing/nano) to track UIs opened by this mob -/mob/var/list/open_uis +// /mob/var/list/open_uis diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index b0d87508210..9b2e5238e3f 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -232,7 +232,7 @@ nanoui is used to open and update nano browser uis var/list/potential_catalog_data = list() for(var/type in types) - var/datum/catalog_entry/E = get_catalog_entry(type) + var/datum/catalog_entry/E = SScwj.get_catalog_entry(type) if(E) potential_catalog_data.Add(list(list("entry_name" = E.title, "entry_img_path" = E.image_path, "entry_type" = E.thing_type))) @@ -393,7 +393,7 @@ nanoui is used to open and update nano browser uis initial_data_json = strip_improper(initial_data_json); var/url_parameters_json = json_encode(list("src" = "\ref[src]")) - + // This prevents the so-called white screens spawn(1) retrieving_html = FALSE diff --git a/code/modules/onestar/os_cash.dm b/code/modules/onestar/os_cash.dm index 2a594d305b9..4226f824571 100644 --- a/code/modules/onestar/os_cash.dm +++ b/code/modules/onestar/os_cash.dm @@ -38,7 +38,7 @@ ..() /obj/item/stack/os_cash/attack_hand(mob/user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) split_cash(user) else ..() diff --git a/code/modules/organs/body_modifications.dm b/code/modules/organs/body_modifications.dm index e133a971edd..644d6d943cc 100644 --- a/code/modules/organs/body_modifications.dm +++ b/code/modules/organs/body_modifications.dm @@ -240,7 +240,7 @@ var/global/list/modifications_types = list( replace_limb = /obj/item/organ/internal/eyes/oneeye /datum/body_modification/organ/oneeye/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_l") I.Blend(color, ICON_ADD) return I @@ -257,7 +257,7 @@ var/global/list/modifications_types = list( replace_limb = /obj/item/organ/internal/eyes/oneeye/right /datum/body_modification/organ/oneeye/right/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_r") I.Blend(color, ICON_ADD) return I @@ -271,7 +271,7 @@ var/global/list/modifications_types = list( hascolor = TRUE /datum/body_modification/organ/heterochromia/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_l") I.Blend(color, ICON_ADD) return I diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm index be70eeda9d8..e6179d9bee7 100644 --- a/code/modules/organs/external/_external.dm +++ b/code/modules/organs/external/_external.dm @@ -20,7 +20,7 @@ // Strings var/damage_state = "00" // Modifier used for generating the on-mob damage overlay for this limb. - var/damage_msg = "\red You feel an intense pain" + var/damage_msg = span_red("You feel an intense pain") // Damage vars. var/brute_mod = 1 // Multiplier for incoming brute damage. diff --git a/code/modules/organs/external/damage.dm b/code/modules/organs/external/damage.dm index 2d6955c8051..57eedce27ae 100644 --- a/code/modules/organs/external/damage.dm +++ b/code/modules/organs/external/damage.dm @@ -72,7 +72,7 @@ //If limb took enough damage and is broken, try to cut or tear it off if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER)) + if(!cannot_amputate && CONFIG_GET(flag/limbs_can_break) && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER)) //organs can come off in four cases //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. diff --git a/code/modules/organs/internal/bones.dm b/code/modules/organs/internal/bones.dm index af3c5e340c0..d3112d7b130 100644 --- a/code/modules/organs/internal/bones.dm +++ b/code/modules/organs/internal/bones.dm @@ -134,3 +134,12 @@ icon_state = "metal_left_leg" nature = MODIFICATION_SILICON matter = list(MATERIAL_STEEL = 2, MATERIAL_PLASTIC = 2) + +/mob/living/carbon/human/has_hand_for_held_index(i) + var/hand_bodyparts = get_hand_organs() + if(!length(hand_bodyparts)) + return FALSE + var/obj/item/organ/external/hand_instance = hand_bodyparts[i + 1] + if(hand_instance && !(hand_instance.status & ORGAN_DEAD)) + return hand_instance + return FALSE diff --git a/code/modules/organs/internal/carrion.dm b/code/modules/organs/internal/carrion.dm index 87f34b6b7b2..1db65a93b27 100644 --- a/code/modules/organs/internal/carrion.dm +++ b/code/modules/organs/internal/carrion.dm @@ -370,7 +370,7 @@ return src = maw - var/food = owner.get_active_hand() + var/food = owner.get_active_held_item() if(!food) to_chat(owner, span_warning("You can't eat nothing.")) @@ -446,7 +446,7 @@ var/organ_rotten = FALSE if (O.status & ORGAN_DEAD) organ_rotten = TRUE - if(O.species != all_species[SPECIES_HUMAN]) + if(O.species != GLOB.all_species[SPECIES_HUMAN]) chemgain = 5 taste_description = "this non-human organ is very bland." // no removal of hunger here, getting and storing a ton of monkey organs isn't too easy, and 5 chem points isn't terribly much. else diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index ddd2da8bed3..5fbe9a54a7c 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -91,7 +91,7 @@ blood_DNA = list() blood_DNA.Cut() blood_DNA[C.dna_trace] = C.b_type - species = all_species[C.species.name] + species = GLOB.all_species[C.species.name] /obj/item/organ/proc/die() if(BP_IS_ROBOTIC(src) || status & ORGAN_DEAD) @@ -106,7 +106,7 @@ owner.death() /obj/item/organ/get_item_cost() - if((status & ORGAN_DEAD) || species != all_species[SPECIES_HUMAN]) //No dead or monkey organs! + if((status & ORGAN_DEAD) || species != GLOB.all_species[SPECIES_HUMAN]) //No dead or monkey organs! return FALSE return ..() @@ -154,7 +154,7 @@ if(B && prob(40)) reagents.remove_reagent("blood",0.1) blood_splatter(src,B,1) - if(config.organs_decay) + if(CONFIG_GET(flag/organs_can_decay)) if(prob(5)) take_damage(12, TOX) // Will cause toxin accumulation wounds else diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 20e86e4740a..1fb3b46a8cf 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -29,23 +29,23 @@ if(burning) switch(amount) if(1 to 10) - msg = "\red Your [partname] burns." + msg = span_warning("Your [partname] burns.") if(11 to 90) flash_weak_pain() - msg = "\red Your [partname] burns badly!" + msg = span_warning("Your [partname] burns badly!") if(91 to 10000) flash_pain() - msg = "\red OH GOD! Your [partname] is on fire!" + msg = span_danger("OH GOD! Your [partname] is on fire!") else switch(amount) if(1 to 10) - msg = "Your [partname] hurts." + msg = span_warning("Your [partname] hurts.") if(11 to 90) flash_weak_pain() - msg = "Your [partname] hurts badly." + msg = span_warning("Your [partname] hurts badly.") if(91 to 10000) flash_pain() - msg = "OH GOD! Your [partname] is hurting terribly!" + msg = span_danger("OH GOD! Your [partname] is hurting terribly!") if(msg && (msg != last_pain_message || prob(10))) last_pain_message = msg to_chat(src, msg) @@ -67,9 +67,9 @@ if(flash_strength < 0) return - var/msg = "\red [message]" + var/msg = span_warning("[message]") if(flash_strength >= 1) - msg = "\red [message]" + msg = span_danger("[message]") // Anti message spam checks if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time))) diff --git a/code/modules/overmap/events/movable.dm b/code/modules/overmap/events/movable.dm index e2ca8f0843d..ed833b96eb3 100644 --- a/code/modules/overmap/events/movable.dm +++ b/code/modules/overmap/events/movable.dm @@ -106,7 +106,7 @@ start_y = rand(2, GLOB.maps_data.overmap_size - rand(5,10)) moving_vector = pick(NORTH, WEST, NORTHWEST) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) @@ -165,7 +165,7 @@ icon_stages[1] = pick(list("meteors0", "meteors1", "meteors2", "meteors3")) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return walk(src,turn(moving_vector, pick(45,-45,90,-90)),rand(100,160),0) @@ -198,10 +198,10 @@ icon_stages[1] = pick(list("dust0", "dust1", "dust2", "dust3")) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return spawn(450) del_event() qdel(src) -////// SPACE_COMET%%%::::::........ \ No newline at end of file +////// SPACE_COMET%%%::::::........ diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index bd68ab48553..e7fb5bf6823 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -58,7 +58,7 @@ habitability_class = HABITABILITY_BAD /obj/effect/overmap/sector/exoplanet/New(nloc, max_x, max_y) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return maxx = max_x ? max_x : world.maxx diff --git a/code/modules/overmap/exoplanets/planet_types/grass.dm b/code/modules/overmap/exoplanets/planet_types/grass.dm index 138f24a6bf9..a54a6034515 100644 --- a/code/modules/overmap/exoplanets/planet_types/grass.dm +++ b/code/modules/overmap/exoplanets/planet_types/grass.dm @@ -71,7 +71,7 @@ /turf/floor/exoplanet/grass/Initialize() . = ..() - if(config.use_overmap) + if(CONFIG_GET(flag/use_overmap)) var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"] if(istype(E) && E.grass_color) color = E.grass_color diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm index 37b48d18163..73840632d26 100644 --- a/code/modules/overmap/exoplanets/turfs.dm +++ b/code/modules/overmap/exoplanets/turfs.dm @@ -11,7 +11,7 @@ return FALSE */ /turf/floor/exoplanet/New() - if(config.use_overmap) + if(CONFIG_GET(flag/use_overmap)) var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"] if(istype(E)) if(E.atmosphere) diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 160e54e9fd1..6d4dc7a852d 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -30,7 +30,7 @@ /obj/effect/overmap/Initialize() . = ..() - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return map_z = GetConnectedZlevels(z) @@ -42,7 +42,7 @@ start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) start_y = start_y || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) - if ((!eris_start_set) && (name == config.start_location)) + if ((!eris_start_set) && (name == CONFIG_GET(string/start_location))) var/obj/effect/overmap/ship/eris/E = (locate(/obj/effect/overmap/ship/eris) in GLOB.ships) start_x = E.start_x start_y = E.start_y @@ -113,4 +113,4 @@ H.get_known_sectors() /obj/effect/overmap/proc/add_landmark(obj/effect/shuttle_landmark/landmark) - generic_waypoints += landmark \ No newline at end of file + generic_waypoints += landmark diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index f539850dc02..ef0284449cd 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -85,7 +85,7 @@ user.reset_view(linked) user.client.view = "[2*NAVIGATION_VIEW_RANGE+1]x[2*NAVIGATION_VIEW_RANGE+1]" - else if(!config.use_overmap && user?.client?.holder) + else if(!CONFIG_GET(flag/use_overmap) && user?.client?.holder) // Let the new developers know why the helm console is unresponsive // (it's disabled by default on local server to make it start a bit faster) to_chat(user, "NOTE: overmap generation is disabled in server configuration.") diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 77a02790b3e..817740ff6c0 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -82,7 +82,7 @@ else if(href_list["addpen"]) if(!haspen) - var/obj/item/pen/W = usr.get_active_hand() + var/obj/item/pen/W = usr.get_active_held_item() if(istype(W, /obj/item/pen)) usr.drop_item() W.loc = src @@ -94,7 +94,7 @@ if(P && (P.loc == src) && istype(P, /obj/item/paper) && (P == toppaper) ) - var/obj/item/I = usr.get_active_hand() + var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/pen)) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index b7be8b7c06c..8c5d27f75ba 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -146,9 +146,9 @@ while(locid < MAX_FIELDS) var/istart = 0 if(links) - istart = findtext(info_links, "", laststart) + istart = findtext(info_links, "", laststart) else - istart = findtext(info, "", laststart) + istart = findtext(info, "", laststart) if(istart == 0) return // No field found with matching id @@ -229,7 +229,7 @@ //Count the fields var/laststart = 1 while(fields < MAX_FIELDS) - var/i = findtext(t, "", laststart) // + var/i = findtext(t, "", laststart) // if(i == 0) break laststart = i + 1 @@ -248,18 +248,18 @@ "You hold \the [P] up to \the [src], burning it slowly.") spawn(20) - if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) + if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit) user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) user.drop_from_inventory(src) new /obj/effect/decal/cleanable/ash(src.loc) qdel(src) else - to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper/Topic(href, href_list) @@ -268,7 +268,7 @@ return if(href_list["write"]) - if(!config.paper_input) + if(!CONFIG_GET(flag/paper_input)) to_chat(usr, span_warning("No matter how hard you try to write on \the [src], nothing shows up! (Paper input disabled in config.)")) return @@ -284,7 +284,7 @@ if(!t) return - var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. + var/obj/item/i = usr.get_active_held_item() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. var/iscrayon = 0 if(!istype(i, /obj/item/pen)) return @@ -393,7 +393,7 @@ return else if(istype(P, /obj/item/stamp)) - if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) + if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_held_item() != P)) return playsound(src,'sound/effects/Stamp.ogg',40,1) stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 6963c22da86..b75ab4f6b3f 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -79,18 +79,18 @@ "You hold \the [P] up to \the [src], burning it slowly.") spawn(20) - if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) + if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit) user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) user.drop_from_inventory(src) new /obj/effect/decal/cleanable/ash(src.loc) qdel(src) else - to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper_bundle/examine(mob/user, extra_description = "") if(get_dist(user, src) < 2) @@ -145,7 +145,7 @@ ..() if((src in usr.contents) || (istype(src.loc, /obj/item/folder) && (src.loc in usr.contents))) usr.set_machine(src) - var/obj/item/in_hand = usr.get_active_hand() + var/obj/item/in_hand = usr.get_active_held_item() if(href_list["next_page"]) if(in_hand && (istype(in_hand, /obj/item/paper) || istype(in_hand, /obj/item/photo))) insert_sheet_at(usr, page+1, in_hand) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 528842a7cce..92a2e9b6d27 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -15,7 +15,7 @@ /obj/item/paper_bin/MouseDrop(mob/user as mob) if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) if(!isslime(usr) && !isanimal(usr)) - if( !usr.get_active_hand() ) //if active hand is empty + if( !usr.get_active_held_item() ) //if active hand is empty var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_ARM] diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 4fe48cf6153..fd6e0dcf119 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -64,10 +64,10 @@ if(!ismob(M)) return to_chat(user, span_warning("You stab [M] with the pen.")) -// M << "\red You feel a tiny prick!" //That's a whole lot of meta! +// M << span_red("You feel a tiny prick!") //That's a whole lot of meta! M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") - msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) [ADMIN_JMP(user)]") return /* diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 24f44288dd8..4e51a868fa7 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -45,7 +45,7 @@ src.state = STATE_DEFAULT if("login") var/mob/M = usr - var/obj/item/card/id/I = M.get_active_hand() + var/obj/item/card/id/I = M.get_active_held_item() if (I && istype(I)) if(src.check_access(I)) authenticated = 1 diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 393cb0bb3ae..c5820be292c 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -130,7 +130,7 @@ if(QUALITY_BOLT_TURNING in I.tool_qualities) if(anchored || linked_shielding.len) - to_chat(user, "\red Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!") + to_chat(user, span_red("Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!")) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) if(!anchored) user.visible_message("[user.name] secures the [src.name] to the floor.", \ @@ -148,7 +148,7 @@ if(istype(I, /obj/item/am_containment)) if(fueljar) - to_chat(user, "\red There is already a [fueljar] inside!") + to_chat(user, span_red("There is already a [fueljar] inside!")) return fueljar = I user.remove_from_mob(I) diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 00cfa5b2222..5330fb81feb 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -108,8 +108,8 @@ H_fuel = 0 antiH_fuel = residual_matter - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud bang!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("You hear a loud bang!"))) //Q = k x (delta T) @@ -160,8 +160,8 @@ if(energy > convert2energy(8e-12)) //TOO MUCH ENERGY - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud whirring!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("You hear a loud whirring!"))) sleep(20) //Q = k x (delta T) @@ -179,8 +179,8 @@ antiH_fuel += antiH if(energy > convert2energy(8e-12)) //FAR TOO MUCH ENERGY STILL - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red BANG!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("BANG!"))) new /obj/effect/bhole(src.loc) else //this amount of energy is okay so it does the proper output thing @@ -204,4 +204,4 @@ stopping = 0 - return \ No newline at end of file + return diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index f1273cdaef7..3b690c775e9 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -66,7 +66,7 @@ /obj/machinery/am_shielding/Destroy() if(control_unit) control_unit.remove_shielding(src) if(processing) shutdown_core() - visible_message("\red The [src.name] melts!") + visible_message(span_red("The [src.name] melts!")) //Might want to have it leave a mess on the floor but no sprites for now return ..() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6519e3d6411..928156d19b5 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -751,7 +751,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - user.visible_message("\red [user.name] slashes at the [name]!", "\blue You slash at the [name]!") + user.visible_message(span_danger("[user.name] slashes at the [name]!"), span_danger("You slash at the [name]!")) playsound(loc, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.IsAllCut() @@ -759,12 +759,12 @@ if(beenhit >= pick(3, 4) && wiresexposed != 1) wiresexposed = 1 update_icon() - visible_message("\red The [name]'s cover flies open, exposing the wires!") + visible_message(span_red("The [name]'s cover flies open, exposing the wires!")) else if(wiresexposed == 1 && allcut == 0) wires.CutAll() update_icon() - visible_message("\red The [name]'s wires are shredded!") + visible_message(span_red("The [name]'s wires are shredded!")) else beenhit += 1 return diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 511210cd276..f93665a5ba1 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -23,7 +23,7 @@ if(get_dist(user, src) < 2) extra_description += span_notice("\nClick any cell below to remove them from \the [src]:") for(var/obj/item/cell/battery in component_parts) - extra_description += span_notice("\n\icon[battery] [battery.name]") + extra_description += span_notice("\n[icon2html(battery, user)] [battery.name]") else extra_description += span_notice("\nThe hatch needs to be opened with a screwdriver to interact with the cells inside!") extra_description += span_notice("\nIt currently has [capacitors_amount] capacitors installed.") diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 10d2fa439dc..d6a5df3b214 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -51,10 +51,10 @@ return busy = 1 - to_chat(user, "\green Updating power settings..") + to_chat(user, span_green("Updating power settings..")) if(do_after(user, 50, src)) set_state(!on) - to_chat(user, "\green Update Completed. New setting:[on ? "on": "off"]") + to_chat(user, span_green("Update Completed. New setting:[on ? "on": "off"]")) update_locked = 1 spawn(600) update_locked = 0 @@ -72,7 +72,7 @@ busy = 1 for(var/mob/O in viewers(user)) - O.show_message(text("\red [user] started reprogramming [src]!"), 1) + O.show_message(span_red("[user] started reprogramming [src]!"), 1) if(do_after(user, 50,src)) set_state(!on) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 47da4472194..c0f4b60ea28 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list( else new/obj/item/stack/cable_coil(T, 1, color) - for(var/mob/O in viewers(src, null)) + for(var/mob/O in viewers(get_turf(src))) O.show_message(span_warning("[user] cuts the cable."), 1) if(d1 == DOWN || d2 == DOWN) @@ -642,14 +642,14 @@ var/list/possible_cable_coil_colours = list( if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - to_chat(usr, "\red You need at least 15 lengths to make restraints!") + to_chat(usr, span_red("You need at least 15 lengths to make restraints!")) return var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc) B.color = color to_chat(usr, span_notice("You wind some cable together to make some restraints.")) src.use(15) else - to_chat(usr, "\blue You cannot do that.") + to_chat(usr, span_blue("You cannot do that.")) /obj/item/stack/cable_coil/cyborg/verb/set_colour() set name = "Change Colour" diff --git a/code/modules/power/diesel_gen.dm b/code/modules/power/diesel_gen.dm index e81cafc1bb5..802f76f8137 100644 --- a/code/modules/power/diesel_gen.dm +++ b/code/modules/power/diesel_gen.dm @@ -170,9 +170,9 @@ var/obj/item/stack/addstack = I var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - user << "\blue The [src.name] is full!" + user << span_blue("The [src.name] is full!") return - user << "\blue You add [amount] sheet\s to the [src.name]." + user << span_blue("You add [amount] sheet\s to the [src.name].") sheets += amount addstack.use(amount) updateUsrDialog() diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm index a40559a5aa6..36216ff7806 100644 --- a/code/modules/power/fractal_reactor.dm +++ b/code/modules/power/fractal_reactor.dm @@ -18,7 +18,7 @@ /obj/machinery/power/fractal_reactor/New() ..() if(!mapped_in) - to_chat(world, "\red WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]") + to_chat(world, span_redtext(span_bold("WARNING: [span_alert("Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]")]"))) /obj/machinery/power/fractal_reactor/Process() if(!powernet && !powernet_connection_failed) @@ -26,4 +26,4 @@ powernet_connection_failed = 1 spawn(150) // Error! Check again in 15 seconds. powernet_connection_failed = 0 - add_avail(power_generation_rate) \ No newline at end of file + add_avail(power_generation_rate) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index d96422a39d7..6b9b82cd4f8 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -282,8 +282,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_gravity(gravity_is_on) priority_announcement.Announce("The gravity generator was brought fully operational.") investigate_log("was brought full online and is now producing gravity.", "gravity") - var/area/area = get_area(src) - message_admins("The gravity generator was brought fully online. ([area.name])") + message_admins("The gravity generator was brought fully online. [ADMIN_JMP(src)]") /obj/machinery/gravity_generator/main/proc/grav_off() if(!GLOB.maps_data.station_levels.len) @@ -294,8 +293,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_gravity(gravity_is_on) priority_announcement.Announce("The gravity generator was brought offline.") investigate_log("was brought offline and there is now no gravity.", "gravity") - var/area/area = get_area(src) - message_admins("The gravity generator was brought offline with no backup generator. ([area.name])") + message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_JMP(src)]") shake_everyone() /obj/machinery/gravity_generator/main/proc/update_gravity(var/is_on) @@ -340,7 +338,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/main/proc/shake_everyone() for(var/mob/M in SSmobs.mob_list | SShumans.mob_list) var/turf/our_turf = get_turf(src.loc) - if(M.client) + if(M.client && !isnewplayer(M)) shake_camera(M, 15, 1) M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3a00b8f2e79..ae89507f56e 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -435,7 +435,7 @@ if(prob(1+I.force * 5)) to_chat(user, "You hit the light, and it smashes!") - for(var/mob/M in viewers(src)) + for(var/mob/M in viewers(get_turf(src))) if(M == user) continue M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) @@ -526,8 +526,8 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - for(var/mob/M in viewers(src)) - M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_danger("[user.name] smashed the light!"), 3, span_warning("You hear a tinkle of breaking glass"), 2) broken() return @@ -766,7 +766,7 @@ /obj/item/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) - src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.") + src.visible_message(span_red("[name] shatters."), span_red("You hear a small glass object shatter.")) status = LIGHT_BROKEN force = WEAPON_FORCE_WEAK sharp = TRUE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 3c019bc6960..1cfef0c2ec8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -281,9 +281,9 @@ var/obj/item/stack/addstack = I var/amount = min((max_fuel_volume - sheets), addstack.amount) if(amount < 1) - to_chat(user, "\blue The [src.name] is full!") + to_chat(user, span_blue("The [src.name] is full!")) return - to_chat(user, "\blue You add [amount] sheet\s to the [src.name].") + to_chat(user, span_blue("You add [amount] sheet\s to the [src.name].")) sheets += amount addstack.use(amount) updateUsrDialog() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ebb14a76a77..c11266e1092 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -52,7 +52,7 @@ wifi_receiver = new(_wifi_id, src) /obj/machinery/power/emitter/Destroy() - message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter deleted at ([x],[y],[z])") investigate_log("deleted at ([x],[y],[z])","singulo") qdel(wifi_receiver) @@ -78,7 +78,7 @@ if(src.active==1) src.active = 0 to_chat(user, "You turn off [src].") - message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned off by [user.key]","singulo") else @@ -86,7 +86,7 @@ to_chat(user, "You turn on [src].") src.shot_number = 0 src.fire_delay = 100 - message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned on by [user.key]","singulo") playsound(loc, 'sound/machines/machine_switch.ogg', 100, 1) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index caa428ad34d..165e0faa7bc 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -205,8 +205,8 @@ field_generator power level display if(draw_power(round(power_draw)) >= power_draw) return 1 else - for(var/mob/M in viewers(src)) - M.show_message("\red \The [src] shuts down!") + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_red("\The [src] shuts down!")) turn_off() investigate_log("ran out of power and deactivated","singulo") src.power = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index 4eac81f4e87..df7aa46fd7e 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -62,7 +62,7 @@ var/radiation = (energy*2) M.apply_effect((radiation*3),IRRADIATE,0) M.updatehealth() - //M << "\red You feel odd." + //M << span_red("You feel odd.") return diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 00a2f429f87..cc571d3f0a2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -121,7 +121,7 @@ if(strength > strength_upper_limit) strength = strength_upper_limit else - message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() @@ -132,7 +132,7 @@ if(strength < 0) strength = 0 else - message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("decreased to [strength] by [usr.key]","singulo") strength_change() @@ -213,7 +213,7 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power() src.active = !src.active investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo") - message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr.ckey]([usr]) in ([x],[y],[z])") if(src.active) set_power_use(ACTIVE_POWER_USE) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 40e1685eff5..8e011c40098 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -83,7 +83,7 @@ var/count = locate(/obj/machinery/containment_field) in orange(30, src) if (!count) - message_admins("A singulo has been created without containment fields active ([x], [y], [z] - JMP).") + message_admins("A singulo has been created without containment fields active ([x], [y], [z] - [ADMIN_JMP(src)]).") investigate_log("was created. [count ? "" : "No containment fields were active."]", I_SINGULO) @@ -416,10 +416,10 @@ if (ishuman(M)) var/mob/living/carbon/human/H = M if(istype(H.glasses,/obj/item/clothing/glasses/powered/meson) && current_size != 11) - to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") + to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") return else - to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") + to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == 11 ? "helpless" : "weak"].")) M.apply_effect(3, STUN) for(var/mob/O in viewers(M, null)) @@ -435,11 +435,11 @@ for(var/mob/living/M in view(10, src.loc)) if(prob(67)) M.apply_effect(rand(energy), IRRADIATE) - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "Miraculously, it fails to kill you.") + to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + to_chat(M, "Miraculously, it fails to kill you.") else - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.") + to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.") M.dust() return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 57dfacf9b32..ed51f125960 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -416,8 +416,8 @@ /obj/machinery/power/smes/proc/ion_act() if(isStationLevel(src.z)) if(prob(1)) //explosion - for(var/mob/M in viewers(src)) - M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2) + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_warning("The [src.name] is making strange noises!"), 3, span_warning("You hear sizzling electronics."), 2) sleep(10*pick(4,5,6,7,10,14)) var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() smoke.set_up(3, 0, loc) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 14f0ff2a544..72c1c027db9 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -164,7 +164,7 @@ if(G.siemens_coefficient == 0) user_protected = 1 log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") - message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") + message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - [ADMIN_JMP(src)]") switch (intensity) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f06bb149ef0..82e36b0e4dd 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -306,9 +306,9 @@ nano_ui_interact(user) /obj/machinery/power/supermatter/attack_hand(mob/user as mob) - user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ - "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ - "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ + "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ + "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") Consume(user) @@ -365,9 +365,9 @@ //If you fail the above, your tape will be eaten by the code below user.visible_message( - "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ - "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ - "Everything suddenly goes silent." + "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ + "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ + "Everything suddenly goes silent." ) user.drop_from_inventory(W) @@ -380,12 +380,12 @@ if(istype(AM, /obj/effect)) return if(isliving(AM)) - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ - "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ + "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ + "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") else if(!grav_pulling) //To prevent spam, detonating supermatter does not indicate non-mobs being destroyed - AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ - "You hear a loud crack as you are washed with a wave of heat.") + AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ + "You hear a loud crack as you are washed with a wave of heat.") Consume(AM) @@ -402,10 +402,10 @@ //Some poor sod got eaten, go ahead and irradiate people nearby. for(var/mob/living/l in range(10)) if(l in view()) - l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ - "The unearthly ringing subsides and you notice you have new radiation burns.", 2) + l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ + "The unearthly ringing subsides and you notice you have new radiation burns.", 2) else - l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) + l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) var/rads = 500 * sqrt( 1 / (get_dist(l, src) + 1) ) l.apply_effect(rads, IRRADIATE) @@ -428,7 +428,7 @@ /obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom. name = "Supermatter Shard" - desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it." + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure." icon_state = "darkmatter_shard" base_icon_state = "darkmatter_shard" diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 40b366ad834..58974daf0a3 100755 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -67,7 +67,7 @@ /obj/item/ammo_casing/attack_hand(mob/user) - if((src.amount > 1) && (src == user.get_inactive_hand())) + if((src.amount > 1) && (src == user.get_inactive_held_item())) src.amount -= 1 var/obj/item/ammo_casing/new_casing = new src.type(src) new_casing.forceMove(get_turf(user)) @@ -271,7 +271,7 @@ visible_message("[user] tactically reloads [W] using only one hand!") /obj/item/ammo_magazine/attack_hand(mob/user) - if(user.get_inactive_hand() == src && stored_ammo.len) + if(user.get_inactive_held_item() == src && stored_ammo.len) var/obj/item/ammo_casing/stack = removeCasing() if(stack) if(stored_ammo.len) @@ -289,7 +289,7 @@ ..() /obj/item/ammo_magazine/AltClick(var/mob/living/user) - var/obj/item/W = user.get_active_hand() + var/obj/item/W = user.get_active_held_item() if(istype(W, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = W if(stored_ammo.len >= max_ammo) @@ -304,7 +304,7 @@ if(!C.mergeCasing(T, null, user)) insertCasing(T) else if(!W) - if(user.get_inactive_hand() == src && stored_ammo.len) + if(user.get_inactive_held_item() == src && stored_ammo.len) var/obj/item/ammo_casing/AC = removeCasing() if(AC) user.put_in_active_hand(AC) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4a1deef66ae..cff5d312510 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -817,7 +817,7 @@ to_chat(user, span_notice("\The [src] is now set to [new_mode.name].")) /obj/item/gun/proc/toggle_safety(mob/living/user) - if(restrict_safety || src != user.get_active_hand()) + if(restrict_safety || src != user.get_active_held_item()) return safety = !safety diff --git a/code/modules/projectiles/guns/breacher.dm b/code/modules/projectiles/guns/breacher.dm index 31f86cd33b4..5e4bfb518c4 100644 --- a/code/modules/projectiles/guns/breacher.dm +++ b/code/modules/projectiles/guns/breacher.dm @@ -100,7 +100,7 @@ return /*if(ishuman(user)) if(user.dna && user.dna.mutantrace == "adamantine") - to_chat(user, "\red Your metal fingers don't fit in the trigger guard!") + to_chat(user, span_red("Your metal fingers don't fit in the trigger guard!")) return*/ add_fingerprint(user) diff --git a/code/modules/projectiles/guns/energy/charge.dm b/code/modules/projectiles/guns/energy/charge.dm index cfd2408180c..15dc42b58d9 100644 --- a/code/modules/projectiles/guns/energy/charge.dm +++ b/code/modules/projectiles/guns/energy/charge.dm @@ -38,7 +38,7 @@ skip_hand_check = TRUE //We enable it if the gun is held in the user's active hand and the safety is off - if (skip_hand_check || L.get_active_hand() == gun) + if (skip_hand_check || L.get_active_held_item() == gun) //Lets also make sure it can fire var/can_fire = TRUE diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index eb1e065d227..5ff99580003 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -61,7 +61,7 @@ to_chat(user, "There is nothing to remove in \the [src].") /obj/item/gun/launcher/pneumatic/attack_hand(mob/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_hopper(user) else return ..() diff --git a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm index fd15edfffc6..8a17d0585b0 100644 --- a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm @@ -114,7 +114,7 @@ ..() /obj/item/gun/projectile/shotgun/pump/grenade/makeshift/attack_hand(mob/user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_underslung(user) else ..() diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 2da25794b2d..aab1ccf3af4 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -111,7 +111,7 @@ add_fingerprint(user) /obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) if(!darts.len) to_chat(user, span_warning("[src] is empty.")) return diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 019d7dde83b..7d714f28ed4 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -301,7 +301,7 @@ unload_ammo(user) /obj/item/gun/projectile/attack_hand(mob/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_ammo(user, allow_dump=0) else return ..() diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 73f4c0bf87e..45013f20227 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -53,7 +53,7 @@ //We enable it if the gun is held in the user's active hand and the safety is off or if they are doing this from inside a mech - if (L.get_active_hand() == gun || ismech(L.loc)) + if (L.get_active_held_item() == gun || ismech(L.loc)) //Lets also make sure it can fire var/can_fire = TRUE diff --git a/code/modules/projectiles/guns/projectile/automatic/lmg.dm b/code/modules/projectiles/guns/projectile/automatic/lmg.dm index 4165c8c756b..b738cf72acd 100644 --- a/code/modules/projectiles/guns/projectile/automatic/lmg.dm +++ b/code/modules/projectiles/guns/projectile/automatic/lmg.dm @@ -58,7 +58,7 @@ return ..() //once closed, behave like normal /obj/item/gun/projectile/automatic/lmg/attack_hand(mob/user as mob) - if(!cover_open && user.get_inactive_hand() == src) + if(!cover_open && user.get_inactive_held_item() == src) toggle_cover(user) //open the cover playsound(src.loc, 'sound/weapons/guns/interact/lmg_open.ogg', 100, 1) else diff --git a/code/modules/projectiles/guns/projectile/automatic/z8.dm b/code/modules/projectiles/guns/projectile/automatic/z8.dm index 1e70f49ca8a..4b433dd2b9d 100644 --- a/code/modules/projectiles/guns/projectile/automatic/z8.dm +++ b/code/modules/projectiles/guns/projectile/automatic/z8.dm @@ -50,7 +50,7 @@ /obj/item/gun/projectile/automatic/z8/attack_hand(mob/user) var/datum/firemode/cur_mode = firemodes[sel_mode] - if(user.get_inactive_hand() == src && cur_mode.settings["use_launcher"]) + if(user.get_inactive_held_item() == src && cur_mode.settings["use_launcher"]) launcher.unload_underslung(user) else ..() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 558d1685893..f76231bda07 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -247,7 +247,7 @@ loc = get_turf(H.client.eye) if(!(loc.Adjacent(target))) loc = get_turf(H) - if(config.z_level_shooting && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel + if(CONFIG_GET(flag/z_level_shooting) && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel var/newTurf = get_turf(H.shadow) if(!(locate(/obj/structure/catwalk) in newTurf)) // Can't shoot through catwalks loc = newTurf @@ -309,7 +309,7 @@ var/result = PROJECTILE_CONTINUE - if(config.z_level_shooting && height == HEIGHT_HIGH) + if(CONFIG_GET(flag/z_level_shooting) && height == HEIGHT_HIGH) if(target_mob.resting == TRUE || target_mob.stat == TRUE) return FALSE // Bullet flies overhead @@ -372,7 +372,7 @@ admin_attack_log(firer, target_mob, attacker_message, victim_message, admin_message) else target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with \a [src]" - msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] (JMP)") + msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] [ADMIN_JMP(target_mob)]") if(target_mob.mob_classification & CLASSIFICATION_ORGANIC) var/turf/target_loca = get_turf(target_mob) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index eabbeab9953..01b0f5a547c 100755 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -164,13 +164,13 @@ if(prob(15)) H.apply_effect((rand(30,80)),IRRADIATE) H.Weaken(5) - for (var/mob/V in viewers(src)) - V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2) + for (var/mob/V in viewers(get_turf(src))) + V.show_message(span_danger("[M] writhes in pain as \his vacuoles boil."), 3, span_warning("You hear the crunching of leaves."), 2) else M.adjustFireLoss(rand(5,15)) - M.show_message("\red The radiation beam singes you!") + M.show_message(span_red("The radiation beam singes you!")) else if(istype(target, /mob/living/carbon/)) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message(span_blue("The radiation beam dissipates harmlessly through your body.")) else return 1 @@ -188,7 +188,7 @@ if((H.species.flags & IS_PLANT) && (H.nutrition < 500)) H.adjustNutrition(30) else if (istype(target, /mob/living/carbon/)) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message(span_blue("The radiation beam dissipates harmlessly through your body.")) else return 1 diff --git a/code/modules/reagents/bonsai.dm b/code/modules/reagents/bonsai.dm index 2bf40c1839e..a161968dd54 100644 --- a/code/modules/reagents/bonsai.dm +++ b/code/modules/reagents/bonsai.dm @@ -48,7 +48,7 @@ if(reagent_count > 10) var/amount_to_spawn = round(reagent_count/10) for(var/i = 0 to amount_to_spawn) - var/datum/seed/S = plant_controller.seeds[pick( + var/datum/seed/S = SSplants.seeds[pick( "tomato", "carrot", "corn", diff --git a/code/modules/reagents/holder.dm b/code/modules/reagents/holder.dm index e1ca2881521..5238822e58d 100644 --- a/code/modules/reagents/holder.dm +++ b/code/modules/reagents/holder.dm @@ -131,6 +131,7 @@ var/list/eligible_reactions = list() var/temperature = chem_temp + var/htmlicon = icon2html(my_atom, viewers(get_turf(src))) for(var/thing in reagent_list) var/datum/reagent/R = thing if(R.custom_temperature_effects(temperature)) @@ -162,7 +163,7 @@ if(my_atom) if(replace_message) - my_atom.visible_message(span_notice("\icon[my_atom] [replace_message]")) + my_atom.visible_message(span_notice("[htmlicon] [replace_message]")) if(replace_sound) playsound(my_atom, replace_sound, 80, 1) @@ -393,7 +394,7 @@ /datum/reagents/proc/trans_to(datum/target, amount = 1, multiplier = 1, copy = 0, ignore_isinjectable = FALSE) if(istype(target, /datum/reagents)) return trans_to_holder(target, amount, multiplier, copy) - else if(istype(target, /atom)) + else if(isatom(target)) var/atom/A = target touch(A) if(ismob(target)) diff --git a/code/modules/reagents/machinery/centrifuge.dm b/code/modules/reagents/machinery/centrifuge.dm index 7e92150ea02..53ab1768596 100644 --- a/code/modules/reagents/machinery/centrifuge.dm +++ b/code/modules/reagents/machinery/centrifuge.dm @@ -166,7 +166,7 @@ /obj/machinery/centrifuge/proc/finish() stop() playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] pings indicating that cycle is complete.") + visible_message("[icon2html(src, hearers(get_turf(src)))]\The [src] pings indicating that cycle is complete.") /obj/machinery/centrifuge/Topic(href, href_list) if(..()) diff --git a/code/modules/reagents/machinery/electrolyzer.dm b/code/modules/reagents/machinery/electrolyzer.dm index 53dbb732c82..15425a0b309 100644 --- a/code/modules/reagents/machinery/electrolyzer.dm +++ b/code/modules/reagents/machinery/electrolyzer.dm @@ -81,15 +81,16 @@ return if(on && beaker && beaker.reagents.total_volume) var/state = electrolysis(beaker, separation_beaker, convertion_coefficient) + update_icon() + var/htmlicon = icon2html(src, hearers(get_turf(src))) if(!state) on = FALSE playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] buzzes indicating that error has occured.") + visible_message("[htmlicon] \The [src] buzzes indicating that error has occured.") else if(state == -1) on = FALSE playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] pings indicating that process is complete.") - update_icon() + visible_message("[htmlicon] \The [src] pings indicating that process is complete.") SSnano.update_uis(src) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 02eed7c36bd..9faa9376159 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -401,7 +401,7 @@ var/obj/item/reagent_containers/container = I if(!container.standard_pour_into(user, src)) . = ..() else if (LAZYLEN(I.reagents)) . = ..() - else to_chat(user, span_notice("\icon[I] \the [I] seems that it is not suitable for a \icon[src] [src].")) + else to_chat(user, span_notice("[icon2html(I, user)] \the [I] seems that it is not suitable for a [icon2html(src, user)] [src].")) update_icon() /obj/item/storage/makeshift_grinder/afterattack(atom/target, mob/user, flag) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b9a47d442cc..3a1b0414730 100755 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -96,7 +96,7 @@ var/contained = reagents.log_list() target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained]") user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained]") - msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") user.visible_message( span_danger("[target] has been splashed with something by [user]!"), @@ -162,7 +162,7 @@ var/contained = reagents.log_list() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]") user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") - msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") reagents.trans_to_mob(target, issmall(user) ? CEILING(amount_per_transfer_from_this * 0.5, 1) : amount_per_transfer_from_this, CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 7374f65acad..35133e22431 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -66,7 +66,7 @@ var/contained = reagents.log_list() M.attack_log += "\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]" user.attack_log += "\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]" - msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD) user.visible_message( @@ -98,7 +98,7 @@ /obj/item/reagent_containers/dropper/update_icon() cut_overlays() - if(reagents.total_volume) + if(reagents?.total_volume) var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "dropper") filling.color = reagents.get_color() add_overlay(filling) diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 8879522cd8b..0acf709f428 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -23,7 +23,7 @@ sandwich_limit += 4 if(src.contents.len > sandwich_limit) - to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.") + to_chat(user, span_red("If you put anything else on \the [src] it's going to collapse.")) return else if(istype(W,/obj/item/material/shard)) to_chat(user, span_notice("You hide [W] in \the [src].")) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d8c7c539dea..0d6c1d31ac6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3348,7 +3348,7 @@ return if(boxes.len > 0 ) - if(user.get_inactive_hand() != src ) + if(user.get_inactive_held_item() != src ) ..() return diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 5a7546dcdac..6ef2d41b5ce 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -37,7 +37,7 @@ // I think rig is advanced enough for this, and people will learn what causes this error if(RIG) playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3) - RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") + RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") return // check without message else if(!H.can_inject(user, FALSE)) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 966bbedacc0..b6443ec363d 100755 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -44,7 +44,7 @@ to_chat(user, span_notice("You dissolve \the [src] in [target].")) user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagents.log_list()]") - msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7430d05d1ee..6daf6acb79e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -160,7 +160,7 @@ // I think rig is advanced enough for this, and people will learn what causes this error if(RIG) playsound(src.loc, 'sound/machines/buzz-two.ogg', 30, 1, -3) - RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") + RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") return // check without message else if(!H.can_inject(user, FALSE)) @@ -264,13 +264,13 @@ if (target != user && H.getarmor(target_zone, ARMOR_MELEE) > 5 && prob(50)) for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) + O.show_message(span_red("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) user.remove_from_mob(src) qdel(src) user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)." - msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)") + msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) [ADMIN_JMP(user)]") return diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index c1ef302c050..75bceb40525 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -159,7 +159,7 @@ "You screw [src]'s faucet [modded ? "closed" : "open"]") modded = !modded if (modded) - message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)") + message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. [ADMIN_JMP(loc)]") log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.") leak_fuel(amount_per_transfer_from_this) if (istype(I,/obj/item/device/assembly_holder)) @@ -172,7 +172,7 @@ var/obj/item/device/assembly_holder/H = I if (istype(H.left_assembly,/obj/item/device/assembly/igniter) || istype(H.right_assembly,/obj/item/device/assembly/igniter)) - message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") + message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. [ADMIN_JMP(loc)]") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") rig = I @@ -194,7 +194,7 @@ /obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) if(istype(Proj.firer)) - message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).") + message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) [ADMIN_JMP(loc)].") log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).") if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) ) diff --git a/code/modules/reagents/reagents.dm b/code/modules/reagents/reagents.dm index f22cb92fbb7..60fd45dd6ac 100644 --- a/code/modules/reagents/reagents.dm +++ b/code/modules/reagents/reagents.dm @@ -1,13 +1,15 @@ //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id /proc/initialize_chemical_reagents() - var/paths = typesof(/datum/reagent) - /datum/reagent - GLOB.chemical_reagents_list = list() + var/list/reagent_list = list() + + var/paths = subtypesof(/datum/reagent) + for(var/path in paths) var/datum/reagent/D = new path() - if(!D.name) - continue - GLOB.chemical_reagents_list[D.id] = D + reagent_list[D.id] = D + + . = reagent_list /datum/reagent var/name = "" diff --git a/code/modules/reagents/reagents/stims.dm b/code/modules/reagents/reagents/stims.dm index 4df667885f5..e04254f4971 100644 --- a/code/modules/reagents/reagents/stims.dm +++ b/code/modules/reagents/reagents/stims.dm @@ -89,7 +89,7 @@ /datum/reagent/stim/pro_surgeon/overdose(mob/living/carbon/M, alien) var/inverse_tough_mult = 1 - M.stats.getMult(STAT_TGH) if(prob(5 - (5 * inverse_tough_mult))) - M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others + M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others M.drop_item() if(prob(80 - (20 * inverse_tough_mult))) M.add_chemical_effect(CE_TOXIN, 5) @@ -286,7 +286,7 @@ if(prob(80 - (20 * inverse_tough_mult))) M.add_chemical_effect(CE_TOXIN, 10) if(prob(10 - (5 * inverse_tough_mult))) - M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others + M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others M.drop_item() if(ishuman(M) && prob(80 - (60 * inverse_tough_mult))) var/mob/living/carbon/human/H = M diff --git a/code/modules/reagents/recipes.dm b/code/modules/reagents/recipes.dm index 9f8483294c3..38e2f44c3d5 100644 --- a/code/modules/reagents/recipes.dm +++ b/code/modules/reagents/recipes.dm @@ -1,38 +1,4 @@ -//Chemical Reactions - Initialises all /datum/chemical_reaction into a list -// It is filtered into multiple lists within a list. -// For example: -// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma -// Note that entries in the list are NOT duplicated. So if a reaction pertains to -// more than one chemical it will still only appear in only one of the sublists. -/proc/initialize_chemical_reactions() - var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction - GLOB.chemical_reactions_list = list() - - for(var/path in paths) - var/datum/chemical_reaction/D = new path() - for(var/id in D.required_reagents) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[required_reagents\] reagent with id \"[id]\" does not exist.") - for(var/id in D.catalysts) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[catalysts\] reagent with id [id] does not exist.") - for(var/id in D.inhibitors) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[inhibitors\] reagent with id [id] does not exist.") - for(var/id in D.byproducts) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[byproducts\] reagent with id [id] does not exist.") - if(D.required_reagents && D.required_reagents.len) - if(D.result) - if(!GLOB.chemical_reactions_list_by_result[D.result]) - GLOB.chemical_reactions_list_by_result[D.result] = list() - GLOB.chemical_reactions_list_by_result[D.result] += D - var/reagent_id = D.required_reagents[1] - if(!GLOB.chemical_reactions_list[reagent_id]) - GLOB.chemical_reactions_list[reagent_id] = list() - GLOB.chemical_reactions_list[reagent_id] += D - //helper that ensures the reaction rate holds after iterating //Ex. REACTION_RATE(0.3) means that 30% of the reagents will react each chemistry tick (~2 seconds by default). #define REACTION_RATE(rate) (1 - (1-rate)**(1/PROCESS_REACTION_ITER)) @@ -208,8 +174,9 @@ if(mix_message && container && !ismob(container)) var/turf/T = get_turf(container) var/list/seen = viewers(4, T) + var/htmlicon = icon2html(container, seen) for(var/mob/M in seen) - M.show_message(span_notice("\icon[container] [mix_message]"), 1) + M.show_message(span_notice("[htmlicon] [mix_message]"), 1) playsound(T, reaction_sound, 80, 1) //obtains any special data that will be provided to the reaction products @@ -799,7 +766,7 @@ var/obj/item/slime_extract/T = holder.my_atom T.Uses-- if(T.Uses <= 0) - T.visible_message("\icon[T][span_notice("\The [T]'s power is consumed in the reaction.")]") + T.visible_message("[icon2html(T, viewers(T))][span_notice("\The [T]'s power is consumed in the reaction.")]") T.name = "used slime extract" T.desc = "This extract has been used up." diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f850bcfe37a..444ccee36ca 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -63,7 +63,7 @@ visible_message(span_notice("[target] has been placed in the [src] by [user].")) user.attack_log += text("\[[time_stamp()]\] Has placed [target] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") - msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)") + msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(usr)]") return TRUE /obj/machinery/disposal/MouseDrop_T(var/obj/item/I, mob/user, src_location, over_location, src_control, over_control, params) @@ -131,7 +131,7 @@ if(istype(I, /obj/item/storage/bag)) var/obj/item/storage/bag/T = I - to_chat(user, "\blue You empty the bag.") + to_chat(user, span_blue("You empty the bag.")) for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) T.update_icon() @@ -190,7 +190,7 @@ user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") - msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)") + msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(user)]") else return if (target.client) @@ -200,7 +200,7 @@ target.simple_move_animation(src) target.forceMove(src) - for (var/mob/C in viewers(src)) + for (var/mob/C in viewers(get_turf(src))) if(C == user) continue C.show_message(msg, 3) @@ -615,27 +615,16 @@ // called when player tries to move while in a pipe /obj/structure/disposalholder/relaymove(mob/user as mob) - - if(!isliving(user)) - return - - var/mob/living/U = user - - if (U.stat || U.last_special <= world.time) + if(!isliving(user) || user.incapacitated()) return - U.last_special = world.time+100 - - if (src.loc) - for (var/mob/M in hearers(src.loc.loc)) - to_chat(M, "CLONG, clong!") - - playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) + for(var/mob/M in range(5, get_turf(src))) + M.show_message("CLONG, clong!", MSG_AUDIBLE) + playsound(src.loc, 'sound/effects/clang.ogg', 50, FALSE, FALSE) // called to vent all gas in holder to a location /obj/structure/disposalholder/proc/vent_gas(var/atom/location) location.assume_air(gas) // vent all gas to turf - return /obj/structure/disposalholder/Destroy() qdel(gas) @@ -1201,7 +1190,7 @@ if(O.currTag)// Tag set sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - to_chat(user, "\blue Changed filter to '[sortType]'.") + to_chat(user, span_blue("Changed filter to '[sortType]'.")) updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index a55689594b8..588a78061fa 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -62,7 +62,7 @@ if("Description") var/str = sanitize(input(usr,"Label text?","Set label","")) if(!str || !length(str)) - to_chat(usr, "\red Invalid text.") + to_chat(usr, span_red("Invalid text.")) return if(!examtext && !nameset) examtext = str @@ -173,7 +173,7 @@ if("Description") var/str = sanitize(input(usr,"Label text?","Set label","")) if(!str || !length(str)) - to_chat(usr, "\red Invalid text.") + to_chat(usr, span_red("Invalid text.")) return if(!examtext && !nameset) examtext = str @@ -305,7 +305,7 @@ else if(src.amount < 3) to_chat(user, span_warning("You need more paper.")) else - to_chat(user, "\blue The object you are trying to wrap is unsuitable for the sorting machinery!") + to_chat(user, span_blue("The object you are trying to wrap is unsuitable for the sorting machinery!")) if (src.amount <= 0) new /obj/item/c_tube( src.loc ) qdel(src) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 0b00565b409..a094c87492f 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -124,7 +124,7 @@ Note: Must be placed within 3 tiles of the R&D Console return if(linked_console) linked_console.handle_item_analysis(loaded_item) - for(var/mob/living/carbon/human/H in viewers(src)) + for(var/mob/living/carbon/human/H in viewers(get_turf(src))) SEND_SIGNAL_OLD(H, COMSING_DESTRUCTIVE_ANALIZER, loaded_item) if(istype(loaded_item,/obj/item/stack)) var/obj/item/stack/S = loaded_item diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index dfd28b8ba2f..cc326f9bb5d 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -96,10 +96,14 @@ var/global/list/obj/machinery/message_server/message_servers = list() authmsg += "[id_auth]
" if (stamp) authmsg += "[stamp]
" + + for (var/obj/machinery/requests_console/Console in allConsoles) + var/htmlicon = icon2html(Console, hearers(get_turf(Console))) + if (ckey(Console.department) == ckey(recipient)) if(Console.inoperable()) - Console.message_log += "Message lost due to console failure.
Please contact [station_name] system adminsitrator or AI for technical assistance.
" + Console.message_log += "Message lost due to console failure.
Please contact [station_name()] system adminsitrator or AI for technical assistance.
" continue if(Console.newmessagepriority < priority) Console.newmessagepriority = priority @@ -108,18 +112,18 @@ var/global/list/obj/machinery/message_server/message_servers = list() if(2) if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) + Console.audible_message("[htmlicon] *The Requests Console beeps: 'PRIORITY Alert in [sender]'") Console.message_log += "High Priority message from [sender]
[authmsg]" else if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4) + Console.audible_message("[htmlicon] *The Requests Console beeps: 'Message from [sender]'") Console.message_log += "Message from [sender]
[authmsg]" Console.set_light(2) /obj/machinery/message_server/attack_hand(user as mob) -// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays." +// user << span_blue("There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.") to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]") active = !active update_icon() diff --git a/code/modules/sanity/breakdowns.dm b/code/modules/sanity/breakdowns.dm index 3022c0ee953..31cf033da29 100644 --- a/code/modules/sanity/breakdowns.dm +++ b/code/modules/sanity/breakdowns.dm @@ -175,7 +175,7 @@ )) holder.owner.custom_emote(message=emote) else if(!holder.owner.incapacitated()) - var/obj/item/W = holder.owner.get_active_hand() + var/obj/item/W = holder.owner.get_active_held_item() if(W) W.attack(holder.owner, holder.owner, ran_zone()) else @@ -649,7 +649,7 @@ candidates -= I continue if(!holder.owner.put_in_hands(I) && prob(50)) - holder.owner.unEquip(holder.owner.get_inactive_hand()) + holder.owner.unEquip(holder.owner.get_inactive_held_item()) holder.owner.put_in_hands(I) break diff --git a/code/modules/sanity/sanity_atom.dm b/code/modules/sanity/sanity_atom.dm index 5174a79c970..46b707c4b08 100644 --- a/code/modules/sanity/sanity_atom.dm +++ b/code/modules/sanity/sanity_atom.dm @@ -3,7 +3,7 @@ var/desc /datum/component/atom_sanity/Initialize(value, new_desc) - if(!istype(parent, /atom)) + if(!isatom(parent)) return COMPONENT_INCOMPATIBLE var/atom/A = parent affect = value diff --git a/code/modules/sanity/sanity_effects.dm b/code/modules/sanity/sanity_effects.dm index e9acbacebaf..f8b2e9e450d 100644 --- a/code/modules/sanity/sanity_effects.dm +++ b/code/modules/sanity/sanity_effects.dm @@ -2,7 +2,7 @@ owner.custom_emote(message = level < 20 ? pick_emote_20() : pick_emote_40()) /datum/sanity/proc/effect_quote() - to_chat(owner, span_danger(level < 20 ? "\icon['icons/effects/fabric_symbols_20.dmi'][pick_quote_20()]" : "\icon['icons/effects/fabric_symbols_40.dmi'][pick_quote_40()]")) + to_chat(owner, span_danger(level < 20 ? "[icon2html('icons/effects/fabric_symbols_20.dmi', owner)][pick_quote_20()]" : "[icon2html('icons/effects/fabric_symbols_40.dmi', owner)][pick_quote_40()]")) /datum/sanity/proc/effect_sound() var/sound/S = pick_sound() diff --git a/code/modules/sanity/sanity_mob.dm b/code/modules/sanity/sanity_mob.dm index 2f2f99f0481..15de35c307d 100644 --- a/code/modules/sanity/sanity_mob.dm +++ b/code/modules/sanity/sanity_mob.dm @@ -275,7 +275,7 @@ GLOBAL_VAR_INIT(GLOBAL_INSIGHT_MOD, 1) desires.Cut() if(!rest_timer_active) to_chat(owner, "[owner.stats.getPerk(PERK_ARTIST) ? "You have created art." : "You have rested well."]\ -
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\ +
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\
The prompt will appear in one minute.") rest_timer_active = TRUE rest_timer_time = 60 SECONDS diff --git a/code/modules/shield_generators/shield.dm b/code/modules/shield_generators/shield.dm index bc4da7d5ab6..ef98e60f5e6 100644 --- a/code/modules/shield_generators/shield.dm +++ b/code/modules/shield_generators/shield.dm @@ -351,7 +351,7 @@ Like for example singulo act and whatever. if (istype(hit_location)) var/area/A = get_area(hit_location) var/where = "[A? A.name : "Unknown Location"] | [hit_location.x], [hit_location.y]" - var/whereLink = "[where]" + var/whereLink = ADMIN_JMP(hit_location) message_admins("A meteor has impacted shields at ([whereLink])", 0, 1) log_game("A meteor has impacted shields at ([where]).") */ diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index d4a8bba736d..299fe77548b 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -233,16 +233,16 @@ if(is_open) to_chat(user, "The panel must be closed before operating this machine.") return - + var/iconhtml = icon2html(src, hearers(get_turf(src))) if (src.active) - user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \ - "\blue \icon[src] You deactivate the shield generator.", \ + user.visible_message(span_blue("[iconhtml] [user] deactivated the shield generator."), \ + span_blue("[iconhtml] You deactivate the shield generator."), \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\blue \icon[src] [user] activated the shield generator.", \ - "\blue \icon[src] You activate the shield generator.", \ + user.visible_message(span_blue("[iconhtml] [user] activated the shield generator."), \ + span_blue("[iconhtml] You activate the shield generator."), \ "You hear heavy droning.") src.shields_up() else diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index ec16555aa92..46bf87c03ab 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -33,13 +33,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(state != 1) - to_chat(user, "\red \The [src] needs to be firmly secured to the floor first.") + to_chat(user, span_red("\The [src] needs to be firmly secured to the floor first.")) return 1 if(src.locked && !issilicon(user)) - to_chat(user, "\red The controls are locked!") + to_chat(user, span_red("The controls are locked!")) return 1 if(power != 1) - to_chat(user, "\red \The [src] needs to be powered by wire underneath.") + to_chat(user, span_red("\The [src] needs to be powered by wire underneath.")) return 1 if(src.active >= 1) @@ -122,7 +122,7 @@ if(!power) - visible_message("\red The [src.name] shuts down due to lack of power!", \ + visible_message(span_red("The [src.name] shuts down due to lack of power!"), \ "You hear heavy droning fade out") active = FALSE for(var/fdir in GLOB.cardinal) @@ -229,11 +229,11 @@ src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") else - to_chat(user, "\red Access denied.") + to_chat(user, span_red("Access denied.")) else src.add_fingerprint(user) - visible_message("\red The [src.name] has been hit with \the [I.name] by [user.name]!") + visible_message(span_red("The [src.name] has been hit with \the [I.name] by [user.name]!")) /obj/machinery/shieldwallgen/emag_act() diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 6b3ce2a7bdd..db8ebdafb04 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -46,11 +46,11 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << span_red("Access denied.") if(QUALITY_BOLT_TURNING in I.tool_qualities) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) src.anchored = !src.anchored - src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")) if(anchored) spawn(0) @@ -131,7 +131,7 @@ return if( href_list["toggle"] ) if(!active && !anchored) - usr << "\red The [src] needs to be firmly secured to the floor first." + usr << span_red("The [src] needs to be firmly secured to the floor first.") return active = !active if( href_list["charge_rate"] ) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index c0f3211c818..abab689fdcd 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -63,12 +63,12 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << span_red("Access denied.") if(QUALITY_BOLT_TURNING in I.tool_qualities) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) src.anchored = !src.anchored - src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")) if(active) toggle() @@ -189,7 +189,7 @@ return else if( href_list["toggle"] ) if (!active && !anchored) - usr << "\red The [src] needs to be firmly secured to the floor first." + usr << span_red("The [src] needs to be firmly secured to the floor first.") return toggle() else if( href_list["change_radius"] ) @@ -210,6 +210,8 @@ set background = 1 active = !active update_icon() + var/our_viewers = viewers(5,src) + var/htmlicon = icon2html(src, our_viewers) if(active) var/list/covered_turfs = get_shielded_turfs() var/turf/T = get_turf(src) @@ -220,15 +222,15 @@ field.Add(E) covered_turfs = null - for(var/mob/M in view(5,src)) - M << "\icon[src] You hear heavy droning start up." + for(var/mob/M in our_viewers) + to_chat(M, "[htmlicon] You hear heavy droning start up.") else for(var/obj/effect/energy_field/D in field) field.Remove(D) D.loc = null - for(var/mob/M in view(5,src)) - M << "\icon[src] You hear heavy droning fade out." + for(var/mob/M in our_viewers) + to_chat(M, "[htmlicon] You hear heavy droning fade out.") /obj/machinery/shield_gen/update_icon() if(stat & BROKEN) diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 4f0235833e3..7bee5738843 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -88,7 +88,7 @@ tag = landmark_tag+"-[x]-[y]" . = ..() base_area = get_area(src) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return add_to_sector(map_sectors["[z]"]) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 1c441052c98..694a5ddc4e3 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -28,7 +28,7 @@ /datum/shuttle/autodock/ferry/emergency/shuttle_moved() if(next_location != waypoint_station) emergency_controller.shuttle_leaving() // This is a hell of a line. v - priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s")) else if(next_location == waypoint_offsite && emergency_controller.has_evacuated()) emergency_controller.shuttle_evacuated() ..() @@ -195,9 +195,9 @@ if (shuttle.in_use) shuttle_status = "Busy." else if (!shuttle.location) - shuttle_status = "Standing-by at [station_name]." + shuttle_status = "Standing-by at [station_name()]." else - shuttle_status = "Standing-by at [dock_name]." + shuttle_status = "Standing-by at [GLOB.dock_name]." if(WAIT_LAUNCH, FORCE_LAUNCH) shuttle_status = "Shuttle has recieved command and will depart shortly." if(WAIT_ARRIVE) @@ -253,6 +253,6 @@ //They selected an empty entry. Try to scan their id. var/mob/living/carbon/human/H = user if (istype(H)) - if (!read_authorization(H.get_active_hand())) //try to read what's in their hand first + if (!read_authorization(H.get_active_held_item())) //try to read what's in their hand first read_authorization(H.wear_id) . = TOPIC_REFRESH diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 70fcd371cb2..1a50c4ec1a5 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -35,7 +35,7 @@ var/obj/machinery/computer/C = user if(world.time <= reset_time) - C.visible_message(span_notice("[boss_name] will not allow the Special Operations shuttle to launch yet.")) + C.visible_message(span_notice("[GLOB.boss_name] will not allow the Special Operations shuttle to launch yet.")) if (((world.time - reset_time)/10) > 60) C.visible_message(span_notice("[-((world.time - reset_time)/10)/60] minutes remain!")) else @@ -66,12 +66,12 @@ if (!location) //just arrived home for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, span_danger("You have arrived at [boss_name]. Operation has ended!")) + to_chat(M, span_danger("You have arrived at [GLOB.boss_name]. Operation has ended!")) else //just left for the station launch_mauraders() for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, span_danger("You have arrived at [station_name]. Commence operation!")) + to_chat(M, span_danger("You have arrived at [station_name()]. Commence operation!")) // var/obj/machinery/light/small/readylight/light = locate() in T // if(light) light.set_state(1) diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index bb2aacc79e3..ffbd2d0d8b8 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -53,12 +53,12 @@ /datum/shuttle/autodock/multi/antag/proc/announce_departure() if(cloaked || isnull(departure_message)) return - command_announcement.Announce(departure_message, announcer || "[boss_name]") + command_announcement.Announce(departure_message, announcer || "[GLOB.boss_name]") /datum/shuttle/autodock/multi/antag/proc/announce_arrival() if(cloaked || isnull(arrival_message)) return - command_announcement.Announce(arrival_message, announcer || "[boss_name]") + command_announcement.Announce(arrival_message, announcer || "[GLOB.boss_name]") /datum/shuttle/autodock/multi/antag/set_destination(var/destination_key, mob/user) if(!return_warning && destination_key == home_waypoint.name && current_location != home_waypoint) diff --git a/code/modules/surgery/old_cavity.dm b/code/modules/surgery/old_cavity.dm index 1a77943498c..5bd26378681 100644 --- a/code/modules/surgery/old_cavity.dm +++ b/code/modules/surgery/old_cavity.dm @@ -16,8 +16,8 @@ /datum/old_surgery_step/cavity/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\red [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", - "\red Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!" + span_red("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!"), + span_red("Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!") ) affected.createwound(CUT, 20) @@ -43,8 +43,8 @@ /datum/old_surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\blue [user] makes some space inside [target]'s [affected.cavity_name] with \the [tool].", - "\blue You make some space inside [target]'s [affected.cavity_name] with \the [tool]." + span_blue("[user] makes some space inside [target]'s [affected.cavity_name] with \the [tool]."), + span_blue("You make some space inside [target]'s [affected.cavity_name] with \the [tool].") ) /datum/old_surgery_step/cavity/close_space @@ -70,6 +70,6 @@ /datum/old_surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\blue [user] mends [target]'s [affected.cavity_name] walls with \the [tool].", - "\blue You mend [target]'s [affected.cavity_name] walls with \the [tool]." + span_blue("[user] mends [target]'s [affected.cavity_name] walls with \the [tool]."), + span_blue("You mend [target]'s [affected.cavity_name] walls with \the [tool].") ) diff --git a/code/modules/surgery/old_encased.dm b/code/modules/surgery/old_encased.dm index 38b7047148d..d4ea637828c 100644 --- a/code/modules/surgery/old_encased.dm +++ b/code/modules/surgery/old_encased.dm @@ -43,8 +43,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has cut [target]'s [affected.encased] open with \the [tool].", \ - "\blue You have cut [target]'s [affected.encased] open with \the [tool].") + user.visible_message(span_blue("[user] has cut [target]'s [affected.encased] open with \the [tool]."), \ + span_blue("You have cut [target]'s [affected.encased] open with \the [tool].")) affected.open = 2.5 /datum/old_surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -53,8 +53,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \ - "\red Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" ) + user.visible_message(span_red("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!") , \ + span_red("Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!") ) affected.createwound(CUT, 20) affected.fracture() @@ -89,8 +89,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] forces open [target]'s [affected.encased] with \the [tool]." - var/self_msg = "\blue You force open [target]'s [affected.encased] with \the [tool]." + var/msg = span_blue("[user] forces open [target]'s [affected.encased] with \the [tool].") + var/self_msg = span_blue("You force open [target]'s [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) affected.open = 3 @@ -101,8 +101,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, cracking [target]'s [affected.encased]!" - var/self_msg = "\red Your hand slips, cracking [target]'s [affected.encased]!" + var/msg = span_red("[user]'s hand slips, cracking [target]'s [affected.encased]!") + var/self_msg = span_red("Your hand slips, cracking [target]'s [affected.encased]!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -138,8 +138,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] bends [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "\blue You bend [target]'s [affected.encased] back into place with \the [tool]." + var/msg = span_blue("[user] bends [target]'s [affected.encased] back into place with \the [tool].") + var/self_msg = span_blue("You bend [target]'s [affected.encased] back into place with \the [tool].") user.visible_message(msg, self_msg) affected.open = 2.5 @@ -150,8 +150,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!" - var/self_msg = "\red Your hand slips, bending [target]'s [affected.encased] the wrong way!" + var/msg = span_red("[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!") + var/self_msg = span_red("Your hand slips, bending [target]'s [affected.encased] the wrong way!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -193,8 +193,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] finish mending back [target]'s bones on [affected.encased] with \the [tool]." - var/self_msg = "\blue You finish mending back [target]'s bones on [affected.encased] with \the [tool]." + var/msg = span_blue("[user] finish mending back [target]'s bones on [affected.encased] with \the [tool].") + var/self_msg = span_blue("You finish mending back [target]'s bones on [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) - affected.open = 2 \ No newline at end of file + affected.open = 2 diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index e8279878fc5..cc9b9232448 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -21,13 +21,13 @@ "You start cutting through [target]'s flesh with \the [tool].") /datum/old_surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts through [target]'s flesh with \the [tool].", \ - "\blue You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + user.visible_message(span_blue("[user] cuts through [target]'s flesh with \the [tool]."), \ + span_blue("You cut through [target]'s flesh with \the [tool], revealing its silky innards.")) target.core_removal_stage = 1 /datum/old_surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s flesh with \the [tool]!") + user.visible_message(span_red("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!"), \ + span_red("Your hand slips, tearing [target]'s flesh with \the [tool]!")) /datum/old_surgery_step/slime/cut_innards required_tool_quality = QUALITY_CUTTING @@ -42,13 +42,13 @@ "You start cutting [target]'s silky innards apart with \the [tool].") /datum/old_surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ - "\blue You cut [target]'s innards apart with \the [tool], exposing the cores.") + user.visible_message(span_blue("[user] cuts [target]'s innards apart with \the [tool], exposing the cores."), \ + span_blue("You cut [target]'s innards apart with \the [tool], exposing the cores.")) target.core_removal_stage = 2 /datum/old_surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s innards with \the [tool]!") + user.visible_message(span_red("[user]'s hand slips, tearing [target]'s innards with \the [tool]!"), \ + span_red("Your hand slips, tearing [target]'s innards with \the [tool]!")) /datum/old_surgery_step/slime/saw_core required_tool_quality = QUALITY_SAWING @@ -64,8 +64,8 @@ /datum/old_surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) target.cores-- - user.visible_message("\blue [user] cuts out one of [target]'s cores with \the [tool].",, \ - "\blue You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") + user.visible_message(span_blue("[user] cuts out one of [target]'s cores with \the [tool]."),, \ + span_blue("You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")) if(target.cores >= 0) new target.coretype(target.loc) @@ -74,5 +74,5 @@ /datum/old_surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \ - "\red Your hand slips, causing you to miss the core!") \ No newline at end of file + user.visible_message(span_red("[user]'s hand slips, causing \him to miss the core!"), \ + span_red("Your hand slips, causing you to miss the core!")) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index b4daa7456b0..3670213350b 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -92,7 +92,7 @@ return FALSE if(!tool) - tool = user.get_active_hand() + tool = user.get_active_held_item() var/quality = S.tool_quality(tool) if(!quality) diff --git a/code/modules/surgery/surgery_ui.dm b/code/modules/surgery/surgery_ui.dm index 5db5c31f465..c43d78482b4 100644 --- a/code/modules/surgery/surgery_ui.dm +++ b/code/modules/surgery/surgery_ui.dm @@ -195,7 +195,7 @@ var/target_stat = BP_IS_ROBOTIC(src) ? STAT_MEC : STAT_BIO var/removal_time = 70 * usr.stats.getMult(target_stat, STAT_LEVEL_PROF) var/target = get_surgery_target() - var/obj/item/I = user.get_active_hand() + var/obj/item/I = user.get_active_held_item() if(!I || !(QUALITY_CLAMPING in I.tool_qualities)) to_chat(user, span_warning("You need a tool with [QUALITY_CLAMPING] quality")) @@ -222,7 +222,7 @@ if("treat_wound") var/mob/living/user = usr - var/obj/item/I = user.get_active_hand() + var/obj/item/I = user.get_active_held_item() if(!user || !I) return diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 8a039304744..44408228525 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -22,7 +22,7 @@ //checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops. /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from) - if(config.z_level_shooting) + if(CONFIG_GET(flag/z_level_shooting)) if(P.height == HEIGHT_HIGH) return TRUE // Bullet is too high to hit P.height = (P.height == HEIGHT_LOW) ? HEIGHT_LOW : HEIGHT_CENTER @@ -50,7 +50,7 @@ valid = FALSE //But only from one side // Bullet is low enough to hit the table - if(config.z_level_shooting && P.height == HEIGHT_LOW) + if(CONFIG_GET(flag/z_level_shooting) && P.height == HEIGHT_LOW) valid = TRUE if(valid) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index f6e31c5d445..c8d6e0de8b4 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -218,7 +218,7 @@ var/list/custom_table_appearance = list( return ..() /obj/structure/table/MouseDrop_T(obj/item/stack/material/what) - if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_hand() == what && Adjacent(usr)) + if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_held_item() == what && Adjacent(usr)) reinforce_table(what, usr) else return ..() diff --git a/code/modules/text_to_speech/tts_main.dm b/code/modules/text_to_speech/tts_main.dm index d796ad1bb5f..3296fae597c 100644 --- a/code/modules/text_to_speech/tts_main.dm +++ b/code/modules/text_to_speech/tts_main.dm @@ -15,10 +15,10 @@ GLOBAL_VAR_INIT(tts_error_raw, "") var/list/tts_seeds = list() /proc/initialize_text_to_speech() - if(!config.tts_key) + if(!CONFIG_GET(string/tts_key)) return - GLOB.tts_bearer = "Bearer [config.tts_key]" + GLOB.tts_bearer = "Bearer [CONFIG_GET(string/tts_key)]" if(!fexists("config/tts_seeds.txt")) return @@ -69,7 +69,7 @@ var/list/tts_seeds = list() fdel(.) return null GLOB.tts_request_succeeded++ - if(!config.tts_cache) + if(!CONFIG_GET(flag/tts_cache)) GLOB.tts_death_row += . addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS) @@ -109,7 +109,7 @@ var/list/tts_seeds = list() fdel(.) return "" GLOB.tts_request_succeeded++ - if(!config.tts_cache) + if(!CONFIG_GET(flag/tts_cache)) GLOB.tts_death_row += . addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS) diff --git a/code/modules/tgchat/README.md b/code/modules/tgchat/README.md new file mode 100644 index 00000000000..95f28ae0e8c --- /dev/null +++ b/code/modules/tgchat/README.md @@ -0,0 +1,30 @@ +## /TG/ Chat + +/TG/ Chat, which will be referred to as TgChat from this point onwards, is a system in which we can send messages to clients in a controlled and semi-reliable manner. The standard way of sending messages to BYOND clients simply dumps whatever you output to them directly into their chat window, however BYOND allows us to load our own code on the client to change this behaviour in a way that allows us to do some pretty neat things. + +### Message Format + +TgChat handles sending messages from the server to the client through the use of JSON payloads, of which the format will change depending on the type of message and the intended client endpoint. An example of the payload for chat messages is as follows: +```json +{ + "sequence": 0, + "content": { + "type": ". . .", // ?optional + "text": ". . .", // ?optional !atleast-one + "html": ". . .", // ?optional !atleast-one + "avoidHighlighting": 0 // ?optional + }, +} +``` + +### Reliability + +In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of recieved sequence numbers. Should the client recieve an unexpected sequence number TgChat asks the server to resend any missing packets. + +### Ping System + +TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server recieves said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request. + +### Chat Tabs, Local Storage, and Highlighting + +To make organizing and managing chat easier and more functional for both players and admins, TgChat has the ability to filter out messages based on their primary tag, such as individual departmental radios, to a dedicated chat tab for easier reading and comprehension. These tabs can also be configured to highlist messages based on a simple keyword search. You can set a multitude of different keywords to search for and they will be highlighting for instant alerting of the client. Said tabs, highlighting rules, and your chat history will persist thanks to use of local storage on the client. Using local storage TgChat can ensure that your preferences are saved and maintained between client restarts and switching between other /TG/ servers. Local Storage is also used to keep your chat history aswell, should you need to scroll through your chat logs. diff --git a/code/modules/tgchat/message.dm b/code/modules/tgchat/message.dm new file mode 100644 index 00000000000..2e9bfe784ec --- /dev/null +++ b/code/modules/tgchat/message.dm @@ -0,0 +1,17 @@ +/** + * Message-related procs + * + * Message format (/list): + * - type - Message type, must be one of defines in `code/__DEFINES/chat.dm` + * - text - Plain message text + * - html - HTML message text + * - Optional metadata, can be any key/value pair. + * + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/proc/message_to_html(message) + // Here it is possible to add a switch statement + // to custom-handle various message types. + return message["html"] || message["text"] diff --git a/code/modules/tgchat/to_chat.dm b/code/modules/tgchat/to_chat.dm new file mode 100644 index 00000000000..9b99dbdea45 --- /dev/null +++ b/code/modules/tgchat/to_chat.dm @@ -0,0 +1,90 @@ +/*! + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/** + * Circumvents the message queue and sends the message + * to the recipient (target) as soon as possible. + */ +/proc/to_chat_immediate( + target, + html, + type = null, + text = null, + avoid_highlighting = FALSE, + // FIXME: These flags are now pointless and have no effect + handle_whitespace = TRUE, + trailing_newline = TRUE, + confidential = FALSE +) + // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "") + html = "[html]" + text = "[text]" + if(!target) + return + if(!html && !text) + if(istext(target)) + CRASH("Passed text without target in to_chat proc call.") + else + CRASH("Empty or null string in to_chat proc call.") + if(target == world) + target = GLOB.clients + + // Build a message + var/message = list() + if(type) message["type"] = type + if(text) message["text"] = text + if(html) message["html"] = html + if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting + + // send it immediately + SSchat.send_immediate(target, message) + +/** + * Sends the message to the recipient (target). + * + * Recommended way to write to_chat calls: + * ``` + * to_chat(client, + * type = MESSAGE_TYPE_INFO, + * html = "You have found [object]") + * ``` + */ +/proc/to_chat( + target, + html, + type = null, + text = null, + avoid_highlighting = FALSE, + // FIXME: These flags are now pointless and have no effect + handle_whitespace = TRUE, + trailing_newline = TRUE, + confidential = FALSE +) + if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage)) + to_chat_immediate(target, html, type, text, avoid_highlighting, confidential = confidential) + return + + // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "") + html = "[html]" + text = "[text]" + + if(!target) + return + if(!html && !text) + if(istext(target)) + CRASH("Passed text without target in to_chat proc call.") + else + CRASH("Empty or null string in to_chat proc call.") + if(target == world) + target = GLOB.clients + + // Build a message + var/message = list() + if(type) message["type"] = type + if(text) message["text"] = text + if(html) message["html"] = html + if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting + + SSchat.queue(target, message) diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm index a5c599ef396..6e52af118aa 100644 --- a/code/modules/tgui/external.dm +++ b/code/modules/tgui/external.dm @@ -42,7 +42,7 @@ * * required user mob The mob interacting with the UI. * - * return list Statuic Data to be sent to the UI. + * return list Static Data to be sent to the UI. */ /datum/proc/ui_static_data(mob/user) return list() @@ -70,7 +70,7 @@ * change static data. */ /datum/proc/update_static_data_for_all_viewers() - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + for (var/datum/tgui/window as anything in open_uis) window.send_full_update() /** @@ -86,10 +86,14 @@ */ /datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL_OLD(src, COMSIG_UI_ACT, usr, action) + SEND_SIGNAL(src, COMSIG_UI_ACT, usr, action, params) // If UI is not interactive or usr calling Topic is not the UI user, bail. if(!ui || ui.status != UI_INTERACTIVE) return TRUE + // if(action == "change_ui_state") + // var/mob/living/user = ui.user + // //write_preferences will make sure it's valid for href exploits. + // user.client.prefs.write_preference(GLOB.preference_entries[layout_prefs_used], params["new_state"]) /** * public diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index b35931d92d3..df14ad0ebf4 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -63,7 +63,7 @@ // Close UIs if mindless. if(!client) // && !HAS_TRAIT(src, TRAIT_PRESERVE_UI_WITHOUT_CLIENT)) return UI_CLOSE - // Disable UIs if unconcious. + // Disable UIs if unconscious. else if(stat) return UI_DISABLED // Update UIs if incapicitated but concious. @@ -71,8 +71,9 @@ return UI_UPDATE return UI_INTERACTIVE -/mob/living/shared_ui_interaction(src_object) +/mob/living/shared_ui_interaction(atom/src_object) . = ..() + // if(!(mobility_flags & MOBILITY_UI) && !(src_object.interaction_flags_atom & INTERACT_ATOM_IGNORE_MOBILITY) && . == UI_INTERACTIVE) // downgrade from UI_INTERACTIVE to UI_UPDATE when lying or resting. if((lying || resting) && . == UI_INTERACTIVE) return UI_UPDATE @@ -102,6 +103,11 @@ * return UI_state The state of the UI. */ /mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE, allow_tk = TRUE) + // var/obj/item/item_in_hand = get_active_held_item() + // if(istype(item_in_hand, /obj/item/machine_remote)) //snowflake, this lets you interact with all. + // var/obj/item/machine_remote/remote = item_in_hand + // if(remote.controlling_machine_or_bot == src_object) + // return UI_INTERACTIVE // If the object is obscured, close it. if(viewcheck && !(src_object in view(src))) return UI_CLOSE diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm index 4da5061dfcb..eb12cb1eb6e 100644 --- a/code/modules/tgui/states/admin.dm +++ b/code/modules/tgui/states/admin.dm @@ -6,12 +6,26 @@ /** * tgui state: admin_state * - * Checks that the user is an admin, end-of-story. + * Checks if the user has specific admin permissions. */ -GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new) +GLOBAL_LIST_EMPTY_TYPED(admin_states, /datum/ui_state/admin_state) +GLOBAL_PROTECT(admin_states) + +/datum/ui_state/admin_state + /// The specific admin permissions required for the UI using this state. + VAR_FINAL/required_perms = R_ADMIN + +/datum/ui_state/admin_state/New(required_perms = R_ADMIN) + . = ..() + src.required_perms = required_perms /datum/ui_state/admin_state/can_use_topic(src_object, mob/user) - if(check_rights_for(user.client, R_ADMIN)) + if(check_rights_for(user.client, required_perms)) return UI_INTERACTIVE return UI_CLOSE + +// /datum/ui_state/admin_state/vv_edit_var(var_name, var_value) +// if(var_name == NAMEOF(src, required_perms)) +// return FALSE +// return ..() diff --git a/code/modules/tgui/states/greyscale_menu.dm b/code/modules/tgui/states/greyscale_menu.dm new file mode 100644 index 00000000000..b08c0b8c980 --- /dev/null +++ b/code/modules/tgui/states/greyscale_menu.dm @@ -0,0 +1,14 @@ +/** + * tgui state: greyscale menu + * + * Checks that the target var of the greyscale menu meets the default can_use_topic criteria + */ + +GLOBAL_DATUM_INIT(greyscale_menu_state, /datum/ui_state/greyscale_menu_state, new) + +/datum/ui_state/greyscale_menu_state/can_use_topic(src_object, mob/user) + var/datum/greyscale_modify_menu/menu = src_object + if(!isatom(menu.target)) + return UI_INTERACTIVE + + return GLOB.default_state.can_use_topic(menu.target, user) diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm index 9b4b7b1c811..0bd23aa27b9 100644 --- a/code/modules/tgui/states/hands.dm +++ b/code/modules/tgui/states/hands.dm @@ -25,7 +25,6 @@ GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new) return UI_CLOSE /mob/living/silicon/robot/hands_can_use_topic(src_object) - for(var/obj/item/gripper/active_gripper in list(module_state_1, module_state_2, module_state_3)) - if(active_gripper.contains(src_object)) - return UI_INTERACTIVE + if(activated(src_object)) + return UI_INTERACTIVE return UI_CLOSE diff --git a/code/modules/tgui/states/holoposter.dm b/code/modules/tgui/states/holoposter.dm index 4a21e87f35a..43c2b23a8cb 100644 --- a/code/modules/tgui/states/holoposter.dm +++ b/code/modules/tgui/states/holoposter.dm @@ -2,14 +2,14 @@ GLOBAL_DATUM_INIT(holoposter_state, /datum/ui_state/holoposter_state, new) /datum/ui_state/holoposter_state/can_use_topic(obj/machinery/holoposter/src_object, mob/user) ASSERT(istype(src_object)) - + if(src_object.stat & NOPOWER) return UI_CLOSE - + if(isobserver(user) || issilicon(user)) return user.default_can_use_topic(src_object) - - if(!istype(user.get_active_hand(), /obj/item/tool/multitool)) + + if(!istype(user.get_active_held_item(), /obj/item/tool/multitool)) return UI_CLOSE - + return user.default_can_use_topic(src_object) diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm index eaaa125786d..1786175f051 100644 --- a/code/modules/tgui/states/language_menu.dm +++ b/code/modules/tgui/states/language_menu.dm @@ -14,6 +14,6 @@ GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new) if(check_rights_for(user.client, R_ADMIN)) . = UI_INTERACTIVE else if(istype(src_object, /datum/language_menu)) - var/datum/language_menu/LM = src_object - if(LM.language_holder.get_atom() == user) + var/datum/language_menu/my_languages = src_object + if(my_languages.language_holder.owner == user) . = UI_INTERACTIVE diff --git a/code/modules/tgui/states/new_player.dm b/code/modules/tgui/states/new_player.dm index cf6f83ed3a1..cd33bcfcfae 100644 --- a/code/modules/tgui/states/new_player.dm +++ b/code/modules/tgui/states/new_player.dm @@ -1,13 +1,10 @@ /** * tgui state: new_player_state * - * Checks that the user is a new_player, or if user is an admin + * Checks that the user is a /mob/dead/new_player */ GLOBAL_DATUM_INIT(new_player_state, /datum/ui_state/new_player_state, new) /datum/ui_state/new_player_state/can_use_topic(src_object, mob/user) - if(isnewplayer(user) || check_rights_for(user.client, R_ADMIN)) - return UI_INTERACTIVE - return UI_CLOSE - + return isnewplayer(user) ? UI_INTERACTIVE : UI_CLOSE diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm index f7278c86de4..ab8cd5f6246 100644 --- a/code/modules/tgui/states/not_incapacitated.dm +++ b/code/modules/tgui/states/not_incapacitated.dm @@ -29,6 +29,6 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate /datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user) if(user.stat != CONSCIOUS) return UI_CLOSE - if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc))) + if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc))) return UI_DISABLED return UI_INTERACTIVE diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm index 018e0fa0304..b144a375757 100644 --- a/code/modules/tgui/states/notcontained.dm +++ b/code/modules/tgui/states/notcontained.dm @@ -28,5 +28,5 @@ GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new) /mob/living/silicon/notcontained_can_use_topic(src_object) return default_can_use_topic(src_object) // Silicons use default bevhavior. -/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object) +/mob/living/basic/drone/notcontained_can_use_topic(src_object) return default_can_use_topic(src_object) // Drones use default bevhavior. diff --git a/code/modules/tgui/states/standing.dm b/code/modules/tgui/states/standing.dm new file mode 100644 index 00000000000..5d6a49c401e --- /dev/null +++ b/code/modules/tgui/states/standing.dm @@ -0,0 +1,17 @@ +/** + * tgui state: standing_state + * + * Checks that the user isn't incapacitated and is standing upright + */ + +GLOBAL_DATUM_INIT(standing_state, /datum/ui_state/not_incapacitated_state/standing, new) + +/datum/ui_state/not_incapacitated_state/standing + +/datum/ui_state/not_incapacitated_state/standing/can_use_topic(src_object, mob/user) + if (!isliving(user)) + return ..() + var/mob/living/living_user = user + if (living_user.body_position) + return UI_DISABLED + return ..() diff --git a/code/modules/tgui/status_composers.dm b/code/modules/tgui/status_composers.dm index 4e9952b25ac..2836302fd06 100644 --- a/code/modules/tgui/status_composers.dm +++ b/code/modules/tgui/status_composers.dm @@ -57,7 +57,7 @@ /// Returns a UI status such that advanced tool users will be able to interact, /// but everyone else can only watch. /proc/ui_status_user_is_advanced_tool_user(mob/user) - return user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE + return ISADVANCEDTOOLUSER(user) ? UI_INTERACTIVE : UI_UPDATE /// Returns a UI status such that silicons will be able to interact with whatever /// they would have access to if this was a machine. For example, AIs can @@ -111,3 +111,11 @@ return UI_CLOSE return UI_INTERACTIVE + +/// Return UI_INTERACTIVE if the user is inside the target atom, whether they can see it or not. +/// Return UI_CLOSE otherwise. +/proc/ui_status_user_inside(mob/user, atom/target) + if(target.contains(user)) + return UI_INTERACTIVE + + return UI_CLOSE diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 8386204e588..b889ab5b9af 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -11,7 +11,7 @@ var/mob/user /// The object which owns the UI. var/datum/src_object - /// The title of te UI. + /// The title of the UI. var/title /// The window_id for browse() and onclose(). var/datum/tgui_window/window @@ -37,8 +37,6 @@ var/datum/ui_state/state = null /// Rate limit client refreshes to prevent DoS. COOLDOWN_DECLARE(refresh_cooldown) - /// Are byond mouse events beyond the window passed in to the ui - var/mouse_hooked = FALSE /** * public @@ -103,22 +101,25 @@ )) else window.send_message("ping") + send_assets() + window.send_message("update", get_payload( + with_data = TRUE, + with_static_data = TRUE)) + SStgui.on_open(src) + + return TRUE + +/datum/tgui/proc/send_assets() var/flush_queue = window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/fontawesome)) flush_queue |= window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/tgfont)) + flush_queue |= window.send_asset(get_asset_datum( + /datum/asset/json/icon_ref_map)) for(var/datum/asset/asset in src_object.ui_assets(user)) flush_queue |= window.send_asset(asset) if (flush_queue) user.client.browse_queue_flush() - window.send_message("update", get_payload( - with_data = TRUE, - with_static_data = TRUE)) - if(mouse_hooked) - window.set_mouse_macro() - SStgui.on_open(src) - - return TRUE /** * public @@ -154,18 +155,6 @@ /datum/tgui/proc/set_autoupdate(autoupdate) src.autoupdate = autoupdate -/** - * public - * - * Enable/disable passing through byond mouse events to the window - * - * required value bool Enable/disable hooking. - */ -/datum/tgui/proc/set_mouse_hook(value) - src.mouse_hooked = value - //Handle unhooking/hooking on already open windows ? - - /** * public * @@ -241,13 +230,18 @@ json_data["config"] = list( "title" = title, "status" = status, - "interface" = interface, + "interface" = list( + "name" = interface, + // "layout" = user.client.prefs.read_preference(src_object.layout_prefs_used), + "layout" = TGUI_LAYOUT_GRID, + ), "refreshing" = refreshing, "window" = list( "key" = window_key, "size" = window_size, "fancy" = user.client.get_preference_value(/datum/client_preference/tgui_fancy), "locked" = user.client.get_preference_value(/datum/client_preference/tgui_lock), + // "scale" = user.client.get_preference_value(/datum/client_preference/ui_scale), ), "client" = list( "ckey" = user.client.ckey, @@ -275,7 +269,7 @@ * Run an update cycle for this UI. Called internally by SStgui * every second or so. */ -/datum/tgui/Process(delta_time, force = FALSE) +/datum/tgui/Process(seconds_per_tick, force = FALSE) if(closing) return var/datum/host = src_object.ui_host(user) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 4c311276279..34284dba42c 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -11,6 +11,7 @@ var/is_browser = FALSE var/status = TGUI_WINDOW_CLOSED var/locked = FALSE + var/visible = FALSE var/datum/tgui/locked_by var/datum/subscriber_object var/subscriber_delegate @@ -24,7 +25,8 @@ var/initial_inline_html var/initial_inline_js var/initial_inline_css - var/mouse_event_macro_set = FALSE + + var/list/oversized_payloads = list() /** * public @@ -220,12 +222,11 @@ /datum/tgui_window/proc/close(can_be_suspended = TRUE) if(!client) return - if(mouse_event_macro_set) - remove_mouse_macro() if(can_be_suspended && can_be_suspended()) log_tgui(client, context = "[id]/close (suspending)", window = src) + visible = FALSE status = TGUI_WINDOW_READY send_message("suspend") return @@ -233,6 +234,7 @@ context = "[id]/close", window = src) release_lock() + visible = FALSE status = TGUI_WINDOW_CLOSED message_queue = null // Do not close the window to give user some time @@ -301,6 +303,9 @@ if(istype(asset, /datum/asset/spritesheet)) var/datum/asset/spritesheet/spritesheet = asset send_message("asset/stylesheet", spritesheet.css_filename()) + else if(istype(asset, /datum/asset/spritesheet_batched)) + var/datum/asset/spritesheet_batched/spritesheet = asset + send_message("asset/stylesheet", spritesheet.css_filename()) send_raw_message(asset.get_serialized_url_mappings()) /** @@ -364,6 +369,9 @@ switch(type) if("ping") send_message("ping/reply", payload) + if("visible") + visible = TRUE + SEND_SIGNAL(src, COMSIG_TGUI_WINDOW_VISIBLE, client) if("suspend") close(can_be_suspended = TRUE) if("close") @@ -372,43 +380,48 @@ client << link(href_list["url"]) if("cacheReloaded") reinitialize() + if("chat/resend") + SSchat.handle_resend(client, payload) + if("oversizedPayloadRequest") + var/payload_id = payload["id"] + var/chunk_count = payload["chunkCount"] + var/permit_payload = chunk_count <= CONFIG_GET(number/tgui_max_chunk_count) + if(permit_payload) + create_oversized_payload(payload_id, payload["type"], chunk_count) + send_message("oversizePayloadResponse", list("allow" = permit_payload, "id" = payload_id)) + if("payloadChunk") + var/payload_id = payload["id"] + append_payload_chunk(payload_id, payload["chunk"]) + send_message("acknowlegePayloadChunk", list("id" = payload_id)) // /datum/tgui_window/vv_edit_var(var_name, var_value) // return var_name != NAMEOF(src, id) && ..() -/datum/tgui_window/proc/set_mouse_macro() - if(mouse_event_macro_set) +/datum/tgui_window/proc/create_oversized_payload(payload_id, message_type, chunk_count) + if(oversized_payloads[payload_id]) + stack_trace("Attempted to create oversized tgui payload with duplicate ID.") return - - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" + oversized_payloads[payload_id] = list( + "type" = message_type, + "count" = chunk_count, + "chunks" = list(), + "timeout" = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) ) - for(var/mouseMacro in byondToTguiEventMap) - var/command_template = ".output CONTROL PAYLOAD" - var/event_message = TGUI_CREATE_MESSAGE(byondToTguiEventMap[mouseMacro], null) - var target_control = is_browser \ - ? "[id]:update" \ - : "[id].browser:update" - var/with_id = replacetext(command_template, "CONTROL", target_control) - var/full_command = replacetext(with_id, "PAYLOAD", event_message) - - var/list/params = list() - params["parent"] = "default" //Technically this is external to tgui but whatever - params["name"] = mouseMacro - params["command"] = full_command - - winset(client, "[mouseMacro]Window[id]Macro", params) - mouse_event_macro_set = TRUE +/datum/tgui_window/proc/append_payload_chunk(payload_id, chunk) + var/list/payload = oversized_payloads[payload_id] + if(!payload) + return + var/list/chunks = payload["chunks"] + chunks += chunk + if(length(chunks) >= payload["count"]) + deltimer(payload["timeout"]) + var/message_type = payload["type"] + var/final_payload = chunks.Join() + remove_oversized_payload(payload_id) + on_message(message_type, json_decode(final_payload), list("type" = message_type, "payload" = final_payload, "tgui" = TRUE, "window_id" = id)) + else + payload["timeout"] = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) -/datum/tgui_window/proc/remove_mouse_macro() - if(!mouse_event_macro_set) - stack_trace("Unsetting mouse macro on tgui window that has none") - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" - ) - for(var/mouseMacro in byondToTguiEventMap) - winset(client, null, "[mouseMacro]Window[id]Macro.parent=null") - mouse_event_macro_set = FALSE +/datum/tgui_window/proc/remove_oversized_payload(payload_id) + oversized_payloads -= payload_id diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 55485c5cc76..119be13d0c9 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -1,7 +1,7 @@ /** * Creates a TGUI alert window and returns the user's response. * - * This proc should be used to create alerts that the requester will wait for a response from. + * This proc should be used to create alerts that the caller will wait for a response from. * Arguments: * * user - The user to show the alert to. * * message - The content of the alert, shown in the body of the TGUI window. @@ -10,15 +10,19 @@ * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout. * * autofocus - The bool that controls if this alert should grab window focus. */ -/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE) +/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state) if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else - return + return null + + if(isnull(user.client)) + return null + // A gentle nudge - you should not be using TGUI alert for anything other than a simple message. if(length(buttons) > 3) log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert") @@ -29,7 +33,7 @@ return alert(user, message, title, buttons[1], buttons[2]) if(length(buttons) == 3) return alert(user, message, title, buttons[1], buttons[2], buttons[3]) - var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus) + var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus, ui_state) alert.ui_interact(user) alert.wait() if (alert) @@ -59,20 +63,24 @@ var/autofocus /// Boolean field describing if the tgui_alert was closed by the user. var/closed + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state -/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus) +/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state) src.autofocus = autofocus src.buttons = buttons.Copy() src.message = message src.title = title + src.state = ui_state if (timeout) src.timeout = timeout start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_alert/Destroy(force, ...) +/datum/tgui_alert/Destroy(force) SStgui.close_uis(src) - QDEL_NULL(buttons) + state = null + buttons?.Cut() return ..() /** @@ -94,7 +102,7 @@ closed = TRUE /datum/tgui_alert/ui_state(mob/user) - return GLOB.always_state + return state /datum/tgui_alert/ui_static_data(mob/user) var/list/data = list() @@ -103,7 +111,7 @@ data["message"] = message /* data["large_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) data["swapped_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) */ - data["large_buttons"] = FALSE + data["large_buttons"] = TRUE data["swapped_buttons"] = FALSE data["title"] = title return data @@ -114,7 +122,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -/datum/tgui_alert/ui_act(action, list/params) +/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 204848fd29c..5efaa846a30 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -16,7 +16,7 @@ if(!length(items)) return if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index 3133461299d..9f85cdf07df 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -19,7 +19,7 @@ if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index 020af14cea7..876c4476f67 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -36,6 +36,7 @@ /datum/tgui_say/New(client/client, id) src.client = client window = new(client, id) + winset(client, "tgui_say", "size=1,1;is-visible=0;") window.subscribe(src, PROC_REF(on_message)) window.is_browser = TRUE @@ -62,11 +63,15 @@ */ /datum/tgui_say/proc/load() window_open = FALSE - winshow(client, "tgui_say", FALSE) + + winset(client, "tgui_say", "pos=848,500;is-visible=0;") + window.send_message("props", list( - lightMode = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode), - maxLength = max_length, + "lightMode" = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode), + "scale" = client.prefs?.read_preference(/datum/preference/toggle/ui_scale), + "maxLength" = max_length, )) + stop_thinking() return TRUE @@ -82,11 +87,9 @@ if(!payload?["channel"]) CRASH("No channel provided to an open TGUI-Say") window_open = TRUE - if(payload["channel"] != OOC_CHANNEL) + if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL) start_thinking() - if(client.typing_indicators) - log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators enabled.") - else + if(!client.typing_indicators) log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.") return TRUE @@ -97,9 +100,7 @@ /datum/tgui_say/proc/close() window_open = FALSE stop_thinking() - if(client.typing_indicators) - log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators enabled.") - else + if(!client.typing_indicators) log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators DISABLED.") /** @@ -117,10 +118,10 @@ close() return TRUE if (type == "thinking") - if(payload["mode"] == TRUE) + if(payload["visible"] == TRUE) start_thinking() return TRUE - if(payload["mode"] == FALSE) + if(payload["visible"] == FALSE) stop_thinking() return TRUE return FALSE diff --git a/code/modules/tgui_input/say_modal/speech.dm b/code/modules/tgui_input/say_modal/speech.dm index 62d98b56d4c..0d95b855a15 100644 --- a/code/modules/tgui_input/say_modal/speech.dm +++ b/code/modules/tgui_input/say_modal/speech.dm @@ -33,17 +33,20 @@ /datum/tgui_say/proc/delegate_speech(entry, channel) switch(channel) if(SAY_CHANNEL) - client.mob.say(entry) + client.mob.say_verb(entry) return TRUE if(RADIO_CHANNEL) - client.mob.say(";" + entry) + client.mob.say_verb(";" + entry) return TRUE if(ME_CHANNEL) - client.mob.me(entry) + client.mob.me_verb(entry) return TRUE if(OOC_CHANNEL) client.ooc(entry) return TRUE + if(ADMIN_CHANNEL) + SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry) + return TRUE return FALSE /** @@ -65,6 +68,7 @@ log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators enabled.") else log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators DISABLED.") + SEND_SIGNAL(src, COMSIG_HUMAN_FORCESAY) /** * Handles text entry and forced speech. diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 61ebd7c3745..7fc6a93f294 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -36,49 +36,41 @@ /datum/preference/toggle/typing_indicator/apply_to_client(client/client, value) client?.typing_indicators = value -/** Sets the mob as "thinking" - with indicator and variable thinking_IC */ +/** Sets the mob as "thinking" - with indicator and the TRAIT_THINKING_IN_CHARACTER trait */ /datum/tgui_say/proc/start_thinking() - if(!window_open || !client.typing_indicators) + if(!window_open) return FALSE - /// Special exemptions - if(isabductor(client.mob)) - return FALSE - client.mob.thinking_IC = TRUE - client.mob.create_thinking_indicator() + return client.start_thinking() /** Removes typing/thinking indicators and flags the mob as not thinking */ /datum/tgui_say/proc/stop_thinking() - client.mob?.remove_all_indicators() + return client.stop_thinking() /** * Handles the user typing. After a brief period of inactivity, * signals the client mob to revert to the "thinking" icon. */ /datum/tgui_say/proc/start_typing() - client.mob.remove_thinking_indicator() - if(!window_open || !client.typing_indicators || !client.mob.thinking_IC) + if(!window_open) return FALSE - client.mob.create_typing_indicator() - addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) + return client.start_typing() /** - * Callback to remove the typing indicator after a brief period of inactivity. + * Remove the typing indicator after a brief period of inactivity or during say events. * If the user was typing IC, the thinking indicator is shown. */ /datum/tgui_say/proc/stop_typing() - if(!client?.mob) - return FALSE - client.mob.remove_typing_indicator() - if(!window_open || !client.typing_indicators || !client.mob.thinking_IC) + if(!window_open) return FALSE - client.mob.create_thinking_indicator() + client.stop_typing() /// Overrides for overlay creation /mob/living/create_thinking_indicator() - if(active_thinking_indicator || active_typing_indicator || !thinking_IC || stat != CONSCIOUS ) + if(active_thinking_indicator || active_typing_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER)) return FALSE - active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER) add_overlay(active_thinking_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_thinking_indicator() if(!active_thinking_indicator) @@ -87,10 +79,11 @@ active_thinking_indicator = null /mob/living/create_typing_indicator() - if(active_typing_indicator || active_thinking_indicator || !thinking_IC || stat != CONSCIOUS) + if(active_typing_indicator || active_thinking_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER)) return FALSE - active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER) add_overlay(active_typing_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_typing_indicator() if(!active_typing_indicator) @@ -99,7 +92,7 @@ active_typing_indicator = null /mob/living/remove_all_indicators() - thinking_IC = FALSE + REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT) remove_thinking_indicator() remove_typing_indicator() diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index b229607d9ab..6f8911c1e1b 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -19,7 +19,7 @@ if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm index 3e7dbc3178f..64717a03345 100644 --- a/code/modules/tgui_panel/external.dm +++ b/code/modules/tgui_panel/external.dm @@ -9,7 +9,7 @@ * tgui panel / chat troubleshooting verb */ /client/verb/fix_tgui_panel() - set name = "Fix chat" + set name = "Fix Chat" set category = "OOC" var/action log_tgui(src, "Started fixing.", context = "verb/fix_tgui_panel") @@ -19,22 +19,19 @@ // Failed to fix, using tgalert as fallback action = tgalert(src, "Did that work?", "", "Yes", "No, switch to old ui") if (action == "No, switch to old ui") - winset(src, "output", "on-show=&is-disabled=0&is-visible=1") - winset(src, "browseroutput", "is-disabled=1;is-visible=0") + winset(src, "output_selector.legacy_output_selector", "left=output_legacy") log_tgui(src, "Failed to fix.", context = "verb/fix_tgui_panel") /client/proc/nuke_chat() // Catch all solution (kick the whole thing in the pants) - winset(src, "output", "on-show=&is-disabled=0&is-visible=1") - winset(src, "browseroutput", "is-disabled=1;is-visible=0") + winset(src, "output_selector.legacy_output_selector", "left=output_legacy") if(!tgui_panel || !istype(tgui_panel)) log_tgui(src, "tgui_panel datum is missing", context = "verb/fix_tgui_panel") tgui_panel = new(src) tgui_panel.initialize(force = TRUE) // Force show the panel to see if there are any errors - winset(src, "output", "is-disabled=1&is-visible=0") - winset(src, "browseroutput", "is-disabled=0;is-visible=1") + winset(src, "output_selector.legacy_output_selector", "left=output_browser") /client/verb/refresh_tgui() set name = "Refresh TGUI" diff --git a/code/modules/tgui_panel/telemetry.dm b/code/modules/tgui_panel/telemetry.dm index 18e41247061..3abcb050f2a 100644 --- a/code/modules/tgui_panel/telemetry.dm +++ b/code/modules/tgui_panel/telemetry.dm @@ -66,76 +66,78 @@ if (!ckey) return - var/list/all_known_alts = GLOB.known_alts.load_known_alts() - var/list/our_known_alts = list() - - for (var/known_alt in all_known_alts) - if (known_alt[1] == ckey) - our_known_alts += known_alt[2] - else if (known_alt[2] == ckey) - our_known_alts += known_alt[1] - - var/list/found - - var/list/query_data = list() - - for(var/i in 1 to len) - if(QDELETED(client)) - // He got cleaned up before we were done - return - var/list/row = telemetry_connections[i] - - // Check for a malformed history object - if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"])) - return - - if (!isnull(GLOB.round_id)) - query_data += list(list( - "telemetry_ckey" = row["ckey"], - "address" = row["address"], - "computer_id" = row["computer_id"], - )) - - if (row["ckey"] in our_known_alts) - continue - - if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE)) - found = row - break - - CHECK_TICK - - // This fucker has a history of playing on a banned account. - if(found) - var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])" - message_admins(msg) - log_admin_private(msg) - log_suspicious_login(msg, access_log_mirror = FALSE) + // var/list/all_known_alts = GLOB.known_alts.load_known_alts() + // var/list/our_known_alts = list() + + // for (var/known_alt in all_known_alts) + // if (known_alt[1] == ckey) + // our_known_alts += known_alt[2] + // else if (known_alt[2] == ckey) + // our_known_alts += known_alt[1] + + // var/list/found + + // var/list/query_data = list() + + // for(var/i in 1 to len) + // if(QDELETED(client)) + // // He got cleaned up before we were done + // return + // var/list/row = telemetry_connections[i] + + // // Check for a malformed history object + // if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"])) + // return + + // if (!isnull(GLOB.game_id)) + // query_data += list(list( + // "telemetry_ckey" = row["ckey"], + // "address" = row["address"], + // "computer_id" = row["computer_id"], + // )) + + // if (row["ckey"] in our_known_alts) + // continue + + // if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE)) + // found = row + // break + + // CHECK_TICK + + // // This fucker has a history of playing on a banned account. + // if(found) + // var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])" + // message_admins(msg) + // // log_admin_private(msg) + // log_admin(msg) + // log_suspicious_login(msg, access_log_mirror = FALSE) + // log_suspicious_login(msg, access_log_mirror = FALSE) // Only log them all at the end, since it's not as important as reporting an evader - for (var/list/one_query as anything in query_data) - var/datum/db_query/query = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("telemetry_connections")] ( - ckey, - telemetry_ckey, - address, - computer_id, - first_round_id, - latest_round_id - ) VALUES( - :ckey, - :telemetry_ckey, - INET_ATON(:address), - :computer_id, - :round_id, - :round_id - ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id - "}, list( - "ckey" = ckey, - "telemetry_ckey" = one_query["telemetry_ckey"], - "address" = one_query["address"], - "computer_id" = one_query["computer_id"], - "round_id" = GLOB.round_id, - )) - query.Execute() - qdel(query) + // for (var/list/one_query as anything in query_data) + // var/datum/DBQuery/query = dbcon.NewQuery({" + // INSERT INTO [format_table_name("telemetry_connections")] ( + // ckey, + // telemetry_ckey, + // address, + // computer_id, + // first_round_id, + // latest_round_id + // ) VALUES( + // :ckey, + // :telemetry_ckey, + // INET_ATON(:address), + // :computer_id, + // :round_id, + // :round_id + // ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id + // "}, list( + // "ckey" = ckey, + // "telemetry_ckey" = one_query["telemetry_ckey"], + // "address" = one_query["address"], + // "computer_id" = one_query["computer_id"], + // "round_id" = GLOB.game_id, + // )) + // query.Execute() + // qdel(query) diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index fb1fcd92811..4baf7f2e18f 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -39,7 +39,7 @@ /datum/tgui_panel/proc/initialize(force = FALSE) set waitfor = FALSE // Minimal sleep to defer initialization to after client constructor - sleep(1) + sleep(1 TICKS) initialized_at = world.time // Perform a clean initialization window.initialize( @@ -49,10 +49,11 @@ )) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont)) - window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) + window.send_asset(get_asset_datum(/datum/asset/spritesheet_batched/chat)) // Other setup request_telemetry() addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) + window.send_message("testTelemetryCommand") /** * private @@ -61,7 +62,7 @@ */ /datum/tgui_panel/proc/on_initialize_timed_out() // Currently does nothing but sending a message to old chat. - SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.") + SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.") /** * private diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 8ba08fbe814..50a874fa44c 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(unit_test_mapping_logs) var/annotation_text = replacetext(text, "%", "%25") annotation_text = replacetext(annotation_text, "\n", "%0A") - log_world("::error file=[file],line=[line],title=[station_name]: [test_path]::[annotation_text]") + log_world("::error file=[file],line=[line],title=[station_name()]: [test_path]::[annotation_text]") // Normal log message log_entry += "\tREASON #[reasonID]: [text] at [file]:[line]" diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 790a4fadd17..2ec7f45126b 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -163,10 +163,10 @@ if(is_train_head() && ishuman(load)) var/mob/living/carbon/human/D = load - to_chat(D, "\red \b You ran over [H]!") + to_chat(D, span_red("\b You ran over [H]!")) visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") - msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)") + msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). [ADMIN_JMP(src)]") else attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") @@ -245,7 +245,7 @@ turn_off() key.loc = usr.loc - if(!usr.get_active_hand()) + if(!usr.get_active_held_item()) usr.put_in_hands(key) key = null diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index 863496bb0d6..7ea8564931e 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -48,7 +48,7 @@ if(emagged) if(isliving(A)) var/mob/living/M = A - visible_message("\red [src] knocks over [M]!") + visible_message(span_red("[src] knocks over [M]!")) M.apply_effects(5, 5) //knock people down if you hit them M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going @@ -62,8 +62,8 @@ if(ishuman(load)) var/mob/living/D = load - to_chat(D, "\red You hit [M]!") - msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)") + to_chat(D, span_red("You hit [M]!")) + msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. [ADMIN_JMP(src)]") //------------------------------------------- @@ -93,7 +93,7 @@ unload(user, direction) - to_chat(user, "\blue You climb down from [src].") + to_chat(user, span_blue("You climb down from [src].")) return 1 @@ -104,7 +104,7 @@ latch(C, user) else if(!load(C)) - to_chat(user, "\red You were unable to load [C] on [src].") + to_chat(user, span_red("You were unable to load [C] on [src].")) /obj/vehicle/train/attack_hand(mob/user as mob) if(user.stat || user.restrained() || !Adjacent(user)) @@ -142,22 +142,22 @@ //Note: there is a modified version of this in code\modules\vehicles\cargo_train.dm specifically for cargo train engines /obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user) if (get_dist(src, T) > 1) - to_chat(user, "\red [src] is too far away from [T] to hitch them together.") + to_chat(user, span_red("[src] is too far away from [T] to hitch them together.")) return if (lead) - to_chat(user, "\red [src] is already hitched to something.") + to_chat(user, span_red("[src] is already hitched to something.")) return if (T.tow) - to_chat(user, "\red [T] is already towing something.") + to_chat(user, span_red("[T] is already towing something.")) return //check for cycles. var/obj/vehicle/train/next_car = T while (next_car) if (next_car == src) - to_chat(user, "\red That seems very silly.") + to_chat(user, span_red("That seems very silly.")) return next_car = next_car.lead @@ -167,7 +167,7 @@ set_dir(lead.dir) if(user) - to_chat(user, "\blue You hitch [src] to [T].") + to_chat(user, span_blue("You hitch [src] to [T].")) update_stats() @@ -175,13 +175,13 @@ //detaches the train from whatever is towing it /obj/vehicle/train/proc/unattach(mob/user) if (!lead) - to_chat(user, "\red [src] is not hitched to anything.") + to_chat(user, span_red("[src] is not hitched to anything.")) return lead.tow = null lead.update_stats() - to_chat(user, "\blue You unhitch [src] from [lead].") + to_chat(user, span_blue("You unhitch [src] from [lead].")) lead = null update_stats() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index cc16f15285b..0020a4686ab 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -118,7 +118,7 @@ if(I.use_tool(user, src, WORKTIME_NORMAL, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC)) health = min(maxhealth, health+10) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") + user.visible_message(span_red("[user] repairs [src]!"), span_blue("You repair [src]!")) return if(ABORT_CHECK) diff --git a/code/modules/webhook/webhook.dm b/code/modules/webhook/webhook.dm index 14e46e16e97..a6819c898b1 100644 --- a/code/modules/webhook/webhook.dm +++ b/code/modules/webhook/webhook.dm @@ -1,26 +1,26 @@ #define RESTART_WEBHOOK "restart" /proc/call_restart_webhook() - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/message = "<@&546427101247438849> Restart!" var/query_string = "type=restart" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/lobby_message(var/message = "Debug Message", var/color = "#FFFFFF", var/sender) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=lobbyalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /client/proc/discord_msg() set name = "Message Lobby" @@ -35,7 +35,7 @@ /proc/send2adminchat(var/initiator, var/original_msg) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return var/list/adm = get_admin_counts() @@ -44,49 +44,36 @@ spawn(0) //Unreliable world.Exports() var/query_string = "type=adminhelp" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&from=[url_encode(initiator)]" query_string += "&msg=[url_encode(html_decode(original_msg))]" query_string += "&admin_number=[allmins.len]" query_string += "&admin_number_afk=[afkmins.len]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/send_adminalert2adminchat(var/message = "Debug Message", var/color = "#FFFFFF", var/sender) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=adminalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") - -/proc/get_admin_counts(requiredflags = R_ADMIN) - . = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list()) - for(var/client/X in GLOB.admins) - .["total"] += X - if(requiredflags != 0 && !check_rights(R_ADMIN, 0, X)) - .["noflags"] += X - else if(X.is_afk()) - .["afk"] += X - else if(X.holder.fakekey) - .["stealth"] += X - else - .["present"] += X + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/send2coders(var/message = "Debug Message", var/color = "#FFFFFF", var/sender, var/admiralty = 0) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=codealert" if(admiralty) query_string = "type=admiraltyalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 7a1ca8bec47..08f68ec0c77 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -23,7 +23,12 @@ em {font-style: normal;font-weight: bold;} .ooc .elevated {color: #2e78d9;} .ooc .moderator {color: #184880;} .ooc .developer {color: #1b521f;} -.ooc .admin {color: #b82e00;} +.ooc {color: #b82e00;} +.adminobserverooc {color: #0099cc; font-weight: bold;} +.adminooc {color: #700038; font-weight: bold;} + +.adminsay {color: #FF4500; font-weight: bold;} +.admin {color: #386aff; font-weight: bold;} /* Admin: Private Messages */ .pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} @@ -65,7 +70,7 @@ em {font-style: normal;font-weight: bold;} .alert {color: #ff0000;} h1.alert, h2.alert {color: #000000;} -.emote {font-style: italic;} +.emote {} /* Game Messages */ diff --git a/config/.gitignore b/config/.gitignore index ec7ed9b452e..000b0d6b099 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,3 +1,4 @@ #ignore everything here, except subdirectories. * !*/ +!example/* diff --git a/config/example/access levels.txt b/config/example/access levels.txt deleted file mode 100644 index e6c0519069a..00000000000 --- a/config/example/access levels.txt +++ /dev/null @@ -1,79 +0,0 @@ -HOW TO CONVERT A MAP TO THE NEW (june 2008) ACCESS LEVEL SYSTEM -1. Open the .dmp file up in Notepad -2. Find all the "access = blahblah" attributes of doors. -3. Delete them. -4. Open the map up in Dream Maker. If you didn't get them all, it'll tell you so. -5. Assign the existing doors new access permissions using the method below. - -HOW TO MAKE A MAP USING THE NEW (june 2008) ACCESS LEVEL SYSTEM -1. Make a map as normal -2. Select a door that you want to not be accessible to everybody -3. Right click on it and edit its attributes -4. Make the "req_access_txt" attribute be a semicolon-separated list of the permissions required to open the doors -5. Repeat for all doors. - -For example, a brig door would have it be "2" while a door that requires you have toxins and teleporter access (for whatever reason) would have it be "9;20" - -Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version): - -access_security = 1 -access_brig = 2 -access_armory = 3 -access_forensics_lockers= 4 -access_medical = 5 -access_morgue = 6 -access_tox = 7 -access_tox_storage = 8 -access_genetics = 9 -access_engine = 10 -access_engine_equip= 11 -access_maint_tunnels = 12 -access_external_airlocks = 13 -access_emergency_storage = 14 -access_change_ids = 15 -access_ai_upload = 16 -access_teleporter = 17 -access_eva = 18 -access_heads = 19 -access_captain = 20 -access_all_personal_lockers = 21 -access_chapel_office = 22 -access_tech_storage = 23 -access_atmospherics = 24 -access_bar = 25 -access_janitor = 26 -access_crematorium = 27 -access_kitchen = 28 -access_robotics = 29 -access_rd = 30 -access_cargo = 31 -access_construction = 32 -access_chemistry = 33 -access_cargo_bot = 34 -access_hydroponics = 35 -access_manufacturing = 36 -access_library = 37 -access_lawyer = 38 -access_virology = 39 -access_cmo = 40 -access_qm = 41 -access_court = 42 -access_clown = 43 -access_mime = 44 -access_surgery = 45 -access_theatre = 46 -access_research = 47 -access_mining = 48 -access_mining_office = 49 //not in use -access_mailsorting = 50 -access_mint = 51 -access_mint_vault = 52 -access_heads_vault = 53 -access_mining_station = 54 -access_xenobiology = 55 -access_ce = 56 -access_hop = 57 -access_hos = 58 -access_RC_announce = 59 //Request console announcements -access_keycard_auth = 60 //Used for events which require at least two people to confirm them -access_tcomsat = 61 // has access to the entire telecomms satellite / machinery \ No newline at end of file diff --git a/config/example/comms.txt b/config/example/comms.txt new file mode 100644 index 00000000000..e316fe36161 --- /dev/null +++ b/config/example/comms.txt @@ -0,0 +1,29 @@ +## Communication key for receiving data through world/Topic(), you don't want to give this out. +## Must be set to something other than 'default_pwd' and at least 7 characters long to be valid. +#COMMS_KEY default_pwd + +## World address and port for server receiving cross server messages +## Use '+' to denote spaces in ServerName +## Repeat this entry to add more servers +#CROSS_SERVER ServerName byond:\\address:port + +## Name that the server calls itself in communications +#CROSS_COMMS_NAME + +## Network-name used for cross-server broadcasts made from communication consoles. +## Servers that do not match this network-name will have their messages discarded. +## Leaving this commented will allow all messages through, regardless of network. +#CROSS_COMMS_NETWORK default_network + + +## Uncomment to enable sending data to the IRC bot. +#USE_IRC_BOT + +## Host where the IRC bot is hosted. Port 45678 needs to be open. +#IRC_BOT_HOST localhost + +## IRC channel to send information to. Leave blank to disable. +#MAIN_IRC #main + +## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. +#ADMIN_IRC #admin diff --git a/config/example/config.txt b/config/example/config.txt index 3fd7a03dd75..86f8d580f58 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,13 +1,29 @@ -## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice +# You can use the "$include" directive to split your configs however you want + +$include game_options.txt +$include dbconfig.txt +$include comms.txt +$include resources.txt +$include ipconfig.txt +$include logging.txt + +# You can use the @ character at the beginning of a config option to lock it from being edited in-game +# Example usage: +# @SERVERNAME tgstation +# Which sets the SERVERNAME, and disallows admins from being able to change it using View Variables. +# @LOG_TWITTER 0 +# Which explicitly disables LOG_TWITTER, as well as locking it. +# There are various options which are hard-locked for security reasons. + +# Hashtags at the beginning of lines will not be parsed. This only applies at the beginning of the line. +# If you include a hashtag in a setting like so: MYHEXCOLORCONFIG #FF73D2 +# It will still be parsed + +## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name()" where station_name() is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice SERVERNAME CEV Eris: Endless Horizon -## Alert levels -ALERT_GREEN All threats to the ship have passed. Security may not have weapons visible, privacy laws are once again fully enforced. -ALERT_BLUE_UPTO The ship has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted. -ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed. -ALERT_RED_UPTO There is an immediate serious threat to the ship. Security may have weapons unholstered at all times. Random searches are allowed and advised. -ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the ship. Security may have weapons unholstered at all times, random searches are allowed and advised. -ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. +## set a hosted by name for unix platforms +HOSTEDBY yournamehere ## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. #ADMIN_LEGACY_SYSTEM @@ -18,8 +34,26 @@ ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are in ## Enables the memo system for admins, used to log on each player ADMIN_MEMO_SYSTEM -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS +## Uncomment to block all attempts to profile, for performance reasons +#FORBID_ALL_PROFILING + +## Uncomment to block granting profiling privileges to users with R_DEBUG, for performance purposes +#FORBID_ADMIN_PROFILING + +## Can mods tempban? +MODS_CAN_TEMPBAN + +## Can mods job tempban? +MODS_CAN_JOB_TEMPBAN + +## Max amount of time mods can tempban for, in minutes +MOD_TEMPBAN_MAX + +## Max amount of time mods can tempban for, in minutes +MOD_JOB_TEMPBAN_MAX + +## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools. +#ROUNDS_UNTIL_HARD_RESTART 10 ## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. @@ -35,98 +69,24 @@ JOBS_HAVE_MINIMAL_ACCESS ## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental #USE_RECURSIVE_EXPLOSIONS -## log OOC channel -LOG_OOC - -## log client Say -LOG_SAY - -## log admin actions -LOG_ADMIN - -## log client access (logon/logoff) -LOG_ACCESS - -## log game actions (start of round, results, etc.) -LOG_GAME - -## log player votes -LOG_VOTE - -## log debug messages -##LOG_DEBUG - -## log client Whisper -LOG_WHISPER - -## log emotes -LOG_EMOTE - -## log attack messages -LOG_ATTACK - -## log pda messages -LOG_PDA - -## log all Topic() calls (for use by coders in tracking down Topic issues) -LOG_HREFS - -## log world.log and runtime errors to a file -LOG_RUNTIME - -## log admin warning messages -##LOG_ADMINWARN ## Also duplicates a bunch of other messages. - -## sql switching -SQL_ENABLED - ## disconnect players who did nothing during 10 minutes # KICK_INACTIVE +## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog +#AGGRESSIVE_CHANGELOG + ## Use Mentors instead of Moderators. Mentors are designed with the idea that ###they help in pushing new people to be better at roleplay. If you uncomment ###this it will reduce the rights that your mods have. #MENTORS -## probablities for game modes chosen in "secret" and "random" modes -## -## default probablity is 1, increase to make that mode more likely to be picked -## set to 0 to disable that mode -PROBABILITY EXTENDED 1 -PROBABILITY MALFUNCTION 1 -PROBABILITY NUCLEAR 1 -PROBABILITY WIZARD 1 -PROBABILITY CHANGELING 1 -PROBABILITY CULT 1 -PROBABILITY EXTEND-A-TRAITORMONGOUS 6 - -## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on. -#GENERATE_ASTEROID - -## Hash out to disable random events during the round. -ALLOW_RANDOM_EVENTS - -## if amount of traitors scales or not -TRAITOR_SCALING - -## if objectives are disabled -#OBJECTIVES_DISABLED - -## make ERT's be only called by admins -ERT_ADMIN_ONLY - -## If security is prohibited from being most antagonists -#PROTECT_ROLES_FROM_ANTAGONIST - ## Comment this out to stop admins being able to choose their personal ooccolor ALLOW_ADMIN_OOCCOLOR -## If metadata is supported -# ALLOW_METADATA +## Comment this out to stop admins being able to choose their personal asay color +ALLOW_ADMIN_ASAYCOLOR -## allow players to initiate a restart vote -#ALLOW_VOTE_RESTART ## allow players to initate a mode-change start #ALLOW_VOTE_MODE @@ -141,13 +101,10 @@ VOTE_PERIOD 600 #VOTE_AUTOGAMEMODE_TIMELEFT 100 ## prevents dead players from voting or starting votes -#NO_DEAD_VOTE - -## players' votes default to "No vote" (otherwise, default to "No change") -DEFAULT_NO_VOTE +#VOTE_NO_DEAD ## Allow ghosts to see antagonist through AntagHUD -ALLOW_ANTAG_HUD +ANTAG_HUD_ALLOWED ## If ghosts use antagHUD they are no longer allowed to join the round. ANTAG_HUD_RESTRICTED @@ -155,22 +112,39 @@ ANTAG_HUD_RESTRICTED ## allow AI job ALLOW_AI - ## disable abandon mob # NORESPAWN -## disables calling del(src) on newmobs if they logout before spawnin in -# DONT_DEL_NEWMOB +## Amount of time, in minutes, users must wait to respawn (as a human, assuming the server has respawn enabled) +RESPAWN_DELAY 30 -## set a hosted by name for unix platforms -HOSTEDBY yournamehere +## Uncomment to allow guests +#GUESTS_ALLOWED +## Prevents players form playing as mice +#DISABLE_PLAYER_MICE + +## Prevent newly-spawned mice from understanding human speech +#UNEDUCATED_MICE + +## Can ghosts possess animals? +GHOSTS_CAN_POSSESS_ANIMALS + +## Basically the flag for respawn. +#ABANDON_ALLOWED + +## Can drones spawn? +ALLOW_DRONE_SPAWN + +## How many maint drone can spawn? +MAX_MAINT_DRONES 5 + +## A drone will become available every X ticks since last drone spawn. Default is 2 minutes. +DRONE_BUILD_TIME 1200 ## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Set to 1 to jobban them from those positions, set to 0 to allow them. GUEST_JOBBAN -## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting) -GUEST_BAN ## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans) # USEWHITELIST @@ -193,9 +167,11 @@ GUEST_BAN ##Github address GITHUBURL https://github.com/Endless-Horizon/CEV-Eris -## In-game features -## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard -# FEATURE_OBJECT_SPELL_SYSTEM +## Sets an MOTD of the server. +## You can use this multiple times, and the MOTDs will be appended in order. +## Based on config directory, so "motd.txt" points to "config/motd.txt" +MOTD motd.txt +#MOTD motd_extra.txt ##Toggle for having jobs load up from the .txt # LOAD_JOBS_FROM_TXT @@ -207,16 +183,14 @@ GITHUBURL https://github.com/Endless-Horizon/CEV-Eris ## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) #POPUP_ADMIN_PM -## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR -ALLOW_HOLIDAYS -## Defines the FPS for the world. 30 is the normal one, 45+ is smoother. -FPS 40 -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. -#TICKCOMP +##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second). +## This also controls the client network update rate, as well as the default client fps +TICKLAG 0.5 -## Whether the server will talk to other processes through socket_talk -SOCKET_TALK 0 +## Defines the FPS for the world. 30 is the normal one, 45+ is smoother. +## (It's actually TPS (ticks per second) but lummox cant be bothered to change it.) +FPS 40 ## Uncomment this to ban use of ToR #TOR_BAN @@ -224,36 +198,11 @@ SOCKET_TALK 0 ## Comment this out to disable automuting #AUTOMUTE_ON -## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 18000 - -## Remove the # to give assistants maint access. -ASSISTANT_MAINT - -## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. -## Malf and Rev will let the shuttle be called when the antags/protags are dead. -#CONTINUOUS_ROUNDS - ##Remove the # to let ghosts spin chairs GHOST_INTERACTION -## Password used for authorizing ircbot and other external tools. -#COMMS_PASSWORD - #FORBID_ADMIN_PROFILING -## Uncomment to enable sending data to the IRC bot. -#USE_IRC_BOT - -## Host where the IRC bot is hosted. Port 45678 needs to be open. -#IRC_BOT_HOST localhost - -## IRC channel to send information to. Leave blank to disable. -#MAIN_IRC #main - -## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. -#ADMIN_IRC #admin - ## Path to the python2 executable on the system. Leave blank for default. ## Default is "python" on Windows, "/usr/bin/env python2" on UNIX. #PYTHON_PATH @@ -262,45 +211,14 @@ GHOST_INTERACTION ## This helps security and stability on Linux, but you need to compile the library first. #USE_LIB_NUDGE -## Uncommen to allow ghosts to write in blood during Cult rounds. -#ALLOW_CULT_GHOSTWRITER - -## Sets the minimum number of cultists needed for ghosts to write in blood. -REQ_CULT_GHOSTWRITER 6 - - -## Determines whether bones can be broken through excessive damage to the organ -## 0 means bones can't break, 1 means they can -BONES_CAN_BREAK 1 -## Determines whether limbs can be amputated through excessive damage to the organ -## 0 means limbs can't be amputated, 1 means they can -LIMBS_CAN_BREAK 1 - -## Uncomment this to prevent players from printing copy/pasted circuits -# DISABLE_CIRCUIT_PRINTING - -### REVIVAL ### - -## whether pod plants work or not -REVIVAL_POD_PLANTS 1 - -## whether cloning tubes work or not -REVIVAL_CLONING 1 - -## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite) -REVIVAL_BRAIN_LIFE -1 +## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools. +#ROUNDS_UNTIL_HARD_RESTART 10 ### Miscellaneous ### ## Config options which, of course, don't fit into previous categories. -## Remove the # in front of this config option to have loyalty implants spawn by default on your server. -#USE_LOYALTY_IMPLANTS - -## Remove # if you want your server have the Luna's job system -JOIN_UNASSIGNED - ## Uncomment to use overmap system for zlevel travel #USE_OVERMAP @@ -333,36 +251,58 @@ WEBHOOK_KEY testkey # Enable/disable IP reputation checking (present/nonpresent) #IP_REPUTATION -# Set the e-mail address problems can go to for IPR checks (e-mail address) +## Set the e-mail address problems can go to for IPR checks (e-mail address) IPR_EMAIL whatever@whatever.com -# Above this value, reputation scores are considered 'bad' (number) +## Above this value, reputation scores are considered 'bad' (number) IPR_BAD_SCORE 1 -# If you want the people disconnected. Otherwise it just logs. (present/nonpresent) +## If you want the people disconnected. Otherwise it just logs. (present/nonpresent) IPR_BLOCK_BAD_IPS -# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) +## If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) IPR_ALLOW_EXISTING -# And what that age is (number) +## And what that age is (number) IPR_MINIMUM_AGE 5 -# If provided, will look up additional IP reputation info from ipqualityscore.com +## If provided, will look up additional IP reputation info from ipqualityscore.com #IPQUALITYSCORE_APIKEY ABC12345YOURKEYHERE ###### Antiraid Settings -# Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins) +## Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins) #PARANOIA_LOGGING -# Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB) +## Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB) #PANIC_BUNKER -# Set start location for CEV Eris uncomment ONE only. -RANDOM_START -#ASTEROID_START -#FORTRESS_START -#RUINS_START +###### DEBUG + +## Uncomment to enable debugging admin hrefs +#DEBUG_ADMIN_HREFS + +## Causes configuration errors to spit out runtimes +CONFIG_ERRORS_RUNTIME + +# Something related to debugging. +#DEBUGPARANOID + +##Error handling related options +## The "cooldown" time for each occurence of a unique error +#ERROR_COOLDOWN 600 + +## How many occurences before the next will silence them +#ERROR_LIMIT 90 + +## How long a unique error will be silenced for +#ERROR_SILENCE_TIME 6000 + +##How long to wait between messaging admins about occurences of a unique error +#ERROR_MSG_DELAY 50 + + +## Uncomment to allow admins with +DEBUG to start the byond-tracy profiler during the round. +#ALLOW_TRACY_START -# Generate loot data. -#GENERATE_LOOT_DATA +## Uncomment to allow admins with +DEBUG to queue the next round to run the byond-tracy profiler. +#ALLOW_TRACY_QUEUE diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt index 84f3d26cec5..8e374187797 100644 --- a/config/example/dbconfig.txt +++ b/config/example/dbconfig.txt @@ -8,10 +8,10 @@ ADDRESS localhost PORT 3306 # Database the population, death, karma, etc. tables may be found in -DATABASE ceveris +FEEDBACK_DATABASE ceveris # Username/Login used to access the database -LOGIN mylogin +FEEDBACK_LOGIN mylogin # Password used to access the database -PASSWORD mypassword +FEEDBACK_PASSWORD mypassword diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 8b62f92f94d..16ac97f7a17 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -1,3 +1,17 @@ +### WORLD ### + +## Where the ship starts off in the universe. Options are: asteroid, space ruins, abandoned fortress, or random +START_LOCATION asteroid + +## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on. +#GENERATE_ASTEROID + +## Generate loot data. +#GENERATE_LOOT_DATA + +## Hash out to disable random events during the round. +ALLOW_RANDOM_EVENTS + ### HEALTH ### ## level of health at which a mob goes into continual shock (soft crit) @@ -9,36 +23,32 @@ HEALTH_THRESHOLD_CRIT -50 ## level of health at which a mob becomes dead HEALTH_THRESHOLD_DEAD -100 -## Determines whether bones can be broken through excessive damage to the organ -## 0 means bones can't break, 1 means they can -BONES_CAN_BREAK 1 ## Determines whether limbs can be amputated through excessive damage to the organ ## 0 means limbs can't be amputated, 1 means they can LIMBS_CAN_BREAK 1 -## multiplier which enables organs to take more damage before bones breaking or limbs being destroyed -## 100 means normal, 50 means half -ORGAN_HEALTH_MULTIPLIER 100 - -## multiplier which influences how fast organs regenerate naturally -## 100 means normal, 50 means half -ORGAN_REGENERATION_MULTIPLIER 75 - ### REVIVAL ### -## whether pod plants work or not -REVIVAL_POD_PLANTS 1 - -## whether cloning tubes work or not -REVIVAL_CLONING 1 - ## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite) REVIVAL_BRAIN_LIFE -1 - ### Miscellaneous ### ## Config options which, of course, don't fit into previous categories. -## Remove the # in front of this config option to have loyalty implants spawn by default on your server. -#USE_LOYALTY_IMPLANTS +## If security is prohibited from being most antagonists +#PROTECT_ROLES_FROM_ANTAGONIST + +## Reduces view range when wearing welding helmets +WELDER_VISION + +## Enter the hexcode for the light given off by space/stars +STARLIGHT #FFFFFF + +## Allows shooting between z-levels +Z_LEVEL_SHOOTING + +### AI + +## law zero for the AI +#LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010 diff --git a/config/example/ipconfig.txt b/config/example/ipconfig.txt new file mode 100644 index 00000000000..62858c69a10 --- /dev/null +++ b/config/example/ipconfig.txt @@ -0,0 +1,21 @@ +# Should we query IPs to get scores? Generates HTTP traffic to an API service. +#IP_REPUTATION + +# Left null because you MUST specify one otherwise you're making the internet worse. +#IPR_EMAIL example@example.com + +# Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat). +#IPR_BLOCK_BAD_IPS + +# The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad. +IPR_BAD_SCORE 1 + +# Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect. +#IPR_ALLOW_EXISTING + +# How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs. +#IPR_MINIMUM_AGE = 5 + +# API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided. +#IPQUALITYSCORE_APIKEY ABCDEFGHIJKLMAOPQRSTUVQWXYZ + diff --git a/config/example/job_playtimes_template.txt b/config/example/job_playtimes_template.txt new file mode 100644 index 00000000000..a2baee5f0db --- /dev/null +++ b/config/example/job_playtimes_template.txt @@ -0,0 +1,31 @@ +Vagabond=0 +Captain=0 +First Officer=0 +NeoTheology Preacher=0 +NeoTheology Acolyte=0 +NeoTheology Agrolyte=0 +NeoTheology Custodian=0 +Club Manager=0 +Club Worker=0 +Club Artist=0 +Technomancer Exultant=0 +Technomancer=0 +Guild Merchant=0 +Guild Technician=0 +Guild Miner=0 +Moebius Biolab Officer=0 +Moebius Doctor=0 +Moebius Chemist=0 +Moebius Paramedic=0 +Moebius Bio-Engineer=0 +Moebius Expedition Overseer=0 +Moebius Scientist=0 +Moebius Roboticist=0 +Moebius Psychiatrist=0 +Ironhammer Commander=0 +Ironhammer Gunnery Sergeant=0 +Ironhammer Inspector=0 +Ironhammer Medical Specialist=0 +Ironhammer Operative=0 +AI=0 +Robot=0 diff --git a/config/example/jobs.txt b/config/example/jobs.txt deleted file mode 100644 index 060cf2d6a73..00000000000 --- a/config/example/jobs.txt +++ /dev/null @@ -1,37 +0,0 @@ -Captain=1 -Head of Personnel=1 -Head of Security=1 -Chief Engineer=1 -Research Director=1 -Chief Medical Officer=1 - -Station Engineer=5 -Roboticist=1 - -Medical Doctor=5 -Geneticist=2 -Virologist=1 - -Scientist=3 -Chemist=2 - -Bartender=1 -Botanist=2 -Chef=1 -Janitor=1 -Quartermaster=1 -Shaft Miner=3 - -Warden=1 -Detective=1 -Security Officer=5 - -Assistant=-1 -Atmospheric Technician=4 -Cargo Technician=3 -Chaplain=1 -Lawyer=2 -Librarian=1 - -AI=1 -Cyborg=1 \ No newline at end of file diff --git a/config/example/logging.txt b/config/example/logging.txt new file mode 100644 index 00000000000..3346dfb831e --- /dev/null +++ b/config/example/logging.txt @@ -0,0 +1,87 @@ +### Config Flags for logging, compatibility flags are at the top + +## Whether or not admin/adminprivate logging is also sent to LOG_CATEGORY_GAME for legacy log parsers +LOGGING_COMPAT_ADMINPRIVATE + +## Should we also log entries as human readable +LOG_AS_HUMAN_READABLE + + +## log OOC channel +LOG_OOC + +## log client Say +LOG_SAY + +## log admin actions +LOG_ADMIN + +## log admin warning messages +##LOG_ADMINWARN ## Also duplicates a bunch of other messages. + +## Log admin chat +LOG_ADMINCHAT + +## log client access (logon/logoff) +LOG_ACCESS + +## log crew manifest to separate file +LOG_MANIFEST + +## log game actions (start of round, results, etc.) +LOG_GAME + +## log player votes +LOG_VOTE + +## log manual target zone switching +LOG_ZONE_SWITCH + +## log debug messages +##LOG_DEBUG + +## log client Whisper +LOG_WHISPER + +## log emotes +LOG_EMOTE + +## log attack messages +LOG_ATTACK + +## log economy actions +LOG_ECON + +## log pda messages +LOG_PDA + +## log prayers +LOG_PRAYER + +## log world.log and runtime errors to a file +LOG_RUNTIME + +## log asset debug logs +# LOG_ASSET + +## log uplink purchases +LOG_UPLINK + +## Enables log entries for logins that failed due to suspicious circumstances (banned player, CID randomiser, spoofed BYOND version, etc.) to a dedicated file. +LOG_SUSPICIOUS_LOGIN + +## log silicons +LOG_SILICON + +## log telecomms messages +LOG_TELECOMMS + +## log speech indicators +LOG_SPEECH_INDICATORS + +## log all world.Topic() calls +# LOG_WORLD_TOPIC + +## Logs all links clicked in-game. Could be used for debugging and tracking down exploits. +## Should be used in conjunction with DEBUG_ADMIN_HREFS in config.txt +LOG_HREFS diff --git a/config/example/resources.txt b/config/example/resources.txt new file mode 100644 index 00000000000..e20ab1cf518 --- /dev/null +++ b/config/example/resources.txt @@ -0,0 +1,69 @@ +# External resources +# Set this to the location of a .zip with the server's .rsc inside of it. +# If you set this multiple times, the server will rotate between the links. +# To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources +# Resource urls can not be encrypted (https://), as they are downloaded by byond, not IE, and byond can't into encryption + +#EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip + +######################## +# Browser Asset Config # +######################## +# Browser assets are any file included in interfaces. css, images, javascript, etc. +# This handles configuring how we get these to the player so interfaces can access them. + +# Asset Transport +# The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything. +# You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN. +# Valid values: simple, webroot. Simple is the default. +#ASSET_TRANSPORT webroot + + +# Simple asset transport configurable values. + +# Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed) +# This should be uncommented in production and commented in development +#ASSET_SIMPLE_PRELOAD + + +# Webroot asset transport configurable values. + +# Local folder to save assets to. +# Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT +#ASSET_CDN_WEBROOT data/asset-store/ + +# URL the folder from above can be accessed from. +# for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls +# Encryption (https) is supported here, but linux clients will have issues if you require higher then tls 1.0. Windows clients down to windows 7 can handle tls 1.2 no issue. +# if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/ +#ASSET_CDN_URL http://localhost:58715/ + +# CDN webservers must provide CORS headers, or TGUI will break and not be able to load all elements. The following example is for IIS: +#Server Rules
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/example/svndir.txt b/config/example/svndir.txt
deleted file mode 100644
index bb72849a7c3..00000000000
--- a/config/example/svndir.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-#Path to the .svn directory. Used to get server revision info.
-SVNDIR .svn
-
-#Link to revision details.
-REVHREF http://code.google.com/p/tgstation13/source/detail?r=
\ No newline at end of file
diff --git a/config/example/whitelist.txt b/config/example/whitelist.txt
new file mode 100644
index 00000000000..4d248bdad55
--- /dev/null
+++ b/config/example/whitelist.txt
@@ -0,0 +1,8 @@
+###############################################################################################
+# Basically, a list of ckeys who make it past user connection #
+# Case is not important for ckey. #
+###############################################################################################
+#flleeppyy
+#absolucy
+#blahblah
+#whoeverelse
diff --git a/goon/icons/mob/interact.dmi b/goon/icons/mob/interact.dmi
new file mode 100644
index 00000000000..da17f461c58
Binary files /dev/null and b/goon/icons/mob/interact.dmi differ
diff --git a/html/lobby_titlescreen.html b/html/lobby_titlescreen.html
index 7c72c2f65f3..7556c011f09 100644
--- a/html/lobby_titlescreen.html
+++ b/html/lobby_titlescreen.html
@@ -14,11 +14,32 @@
display: inline-block;
width: auto;
height: 100%;
+ z-index: 0;
+ }
+
+ .centered {
+ display: flex;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ justify-content: center;
+ align-items: center;
+ padding: 0;
+ margin: 0;
+ top: 0;
+ }
+
+ .centered img {
+ width: max-content;
+ height: max-content;
}
-
+
+
" - output += "" + output += "" if(SSticker.current_state <= GAME_STATE_PREGAME) if(ready) - output += "
\[ [span_linkOn("Ready")] | Not Ready \]
" + output += "\[ [span_linkOn("Ready")] | Not Ready \]
" else - output += "\[ Ready | [span_linkOn("Not Ready")] \]
" + output += "\[ Ready | [span_linkOn("Not Ready")] \]
" else - output += "View the Crew Manifest" - output += "" + output += "View the Crew Manifest
" + output += "" - output += "" + output += "" + + if (src.client.holder) + output += "
" + output += "
[span_bold("Admin Quick Verbs")]"
+ if (SSticker.state <= GAME_STATE_PREGAME)
+ output += "
"
- panel = new(src, "Welcome","Welcome", 210, 280, src)
+ if (src.client.holder)
+ panel = new(src, "Welcome","Welcome", 230, 330, src)
+ else
+ panel = new(src, "Welcome","Welcome", 210, 280, src)
+
panel.set_window_options("can_close=0")
panel.set_content(output)
panel.open()
@@ -77,11 +91,11 @@
/mob/new_player/Topic(href, href_list[])
if(src != usr || !client)
- return 0
+ return FALSE
if(href_list["show_preferences"])
client.prefs.ShowChoices(src)
- return 1
+ return TRUE
if(href_list["ready"])
if(SSticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
@@ -114,7 +128,7 @@
if(href_list["observe"])
if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able join the crew! But you can play as a mouse or drone immediately.","Player Setup","Yes","No") == "Yes")
- if(!client) return 1
+ if(!client) return TRUE
var/mob/observer/ghost/observer = new()
spawning = 1
@@ -138,7 +152,7 @@
client.prefs.real_name = random_name(client.prefs.gender)
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.
+ if(!client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed.
remove_verb(observer, /mob/observer/ghost/verb/toggle_antagHUD)
//observer.key = key
observer.ckey = ckey
@@ -153,7 +167,7 @@
if(href_list["late_join"])
if(SSticker.current_state != GAME_STATE_PLAYING)
- to_chat(usr, "\red The round is either not ready, or has already finished...")
+ to_chat(usr, span_red("The round is either not ready, or has already finished..."))
return
// Warn the player if they are trying to spawn without a brain
@@ -162,7 +176,7 @@
if(alert(src,"Are you sure you wish to spawn without a brain? This will likely cause you to do die immediately. \
If not, go to the Augmentation section of Setup Character and change the \"brain\" slot from Removed to the desired kind of brain.", \
"Player Setup", "Yes", "No") == "No")
- return 0
+ return FALSE
// Warn the player if they are trying to spawn without eyes
mod = client.prefs.get_modification(BP_EYES)
@@ -170,13 +184,13 @@
if(alert(src,"Are you sure you wish to spawn without eyes? It will likely be difficult to see without them. \
If not, go to the Augmentation section of Setup Character and change the \"eyes\" slot from Removed to the desired kind of eyes.", \
"Player Setup", "Yes", "No") == "No")
- return 0
+ return FALSE
if(!check_rights(R_ADMIN, 0))
- var/datum/species/S = all_species[client.prefs.species]
+ var/datum/species/S = GLOB.all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
- return 0
+ return FALSE
LateChoices()
@@ -185,18 +199,18 @@
if(href_list["SelectedJob"])
- if(!config.enter_allowed)
+ if(!CONFIG_GET(flag/enter_allowed))
to_chat(usr, span_notice("There is an administrative lock on entering the game!"))
return
else if(SSticker.nuke_in_progress)
to_chat(usr, span_danger("The station is currently exploding. Joining would go poorly."))
return
- var/datum/species/S = all_species[client.prefs.species]
+ var/datum/species/S = GLOB.all_species[client.prefs.species]
if(!(S.spawn_flags & CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
- return 0
+ return FALSE
AttemptLateSpawn(href_list["SelectedJob"], client.prefs.spawnpoint)
return
@@ -229,6 +243,26 @@
if("TEXT")
var/reply_text = href_list["reply_text"]
log_text_poll_reply(poll_id, reply_text)
+ return
+
+ if (!src.client.holder)
+ return
+
+ if (href_list["startnow"])
+ src.client.holder.startnow()
+ return
+
+ if (href_list["endround"])
+ src.client.holder.end_round()
+ return
+
+ if (href_list["restart"])
+ src.client.holder.restart()
+ return
+
+ if (href_list["runtimes"])
+ src.client.view_runtimes()
+ return
/mob/new_player/proc/IsJobAvailable(rank)
@@ -247,16 +281,16 @@
/mob/new_player/proc/AttemptLateSpawn(rank, var/spawning_at)
if(src != usr)
- return 0
+ return FALSE
if(SSticker.current_state != GAME_STATE_PLAYING)
- to_chat(usr, "\red The round is either not ready, or has already finished...")
- return 0
- if(!config.enter_allowed)
+ to_chat(usr, span_red("The round is either not ready, or has already finished..."))
+ return FALSE
+ if(!CONFIG_GET(flag/enter_allowed))
to_chat(usr, span_notice("There is an administrative lock on entering the game!"))
- return 0
+ return FALSE
if(!IsJobAvailable(rank))
src << alert("[rank] is not available. Please try another.")
- return 0
+ return FALSE
spawning = 1
close_spawn_windows()
@@ -265,6 +299,7 @@
var/datum/job/job = src.mind.assigned_job
var/mob/living/character = create_character() //creates the human and transfers vars and mind
+
// AIs don't need a spawnpoint, they must spawn at an empty core
if(rank == "AI")
@@ -277,6 +312,7 @@
character.forceMove(C.loc)
AnnounceArrival(character, rank, "has been downloaded to the empty core in \the [character.loc.loc]")
+ log_manifest(character.mind.key, character.mind, character, latejoin = TRUE)
qdel(C)
qdel(src)
@@ -298,8 +334,7 @@
//Grab some data from the character prefs for use in random news procs.
AnnounceArrival(character, character.mind.assigned_role, spawnpoint.message) //will not broadcast if there is no message
-
-
+ log_manifest(character.mind.key, character.mind, character, latejoin = TRUE)
qdel(src)
@@ -328,7 +363,7 @@
// Only players with the job assigned and AFK for less than 10 minutes count as active
for(var/mob/M in GLOB.player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
active++
- dat += "[job.title] ([job.current_positions]) (Active: [active])\[Start Now\]
" + else + output += "\[End Round\]
" + output += "\[Restart\]
" + output += "\[View Runtimes\]
" if(!IsGuestKey(src.key)) establish_db_connection() @@ -60,13 +70,17 @@ break if(newpoll) - output += "Show Player Polls (NEW!)
" + output += "Show Player Polls (NEW!)
" else - output += "" + output += "" output += "" + dat += "[job.title] ([job.current_positions]) (Active: [active])
" dat += "" src << browse(HTML_SKELETON_TITLE("Late join", dat), "window=latechoices;size=400x640;can_close=1") @@ -343,7 +378,7 @@ var/use_species_name var/datum/species/chosen_species if(client.prefs.species) - chosen_species = all_species[client.prefs.species] + chosen_species = GLOB.all_species[client.prefs.species] use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm. if(chosen_species && use_species_name) @@ -355,7 +390,7 @@ new_character.lastarea = get_area(NULLSPACE) for(var/lang in client.prefs.alternate_languages) - var/datum/language/chosen_language = all_languages[lang] + var/datum/language/chosen_language = GLOB.all_languages[lang] if(chosen_language) if(!(chosen_language.flags & WHITELISTED) || has_admin_rights() \ || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) @@ -401,7 +436,7 @@ return new_character /mob/new_player/Move(NewLoc, Dir = 0, step_x = 0, step_y = 0, var/glide_size_override = 0) - return 0 + return FALSE /mob/new_player/proc/close_spawn_windows() src << browse(null, "window=latechoices") //closes late choices window @@ -410,7 +445,7 @@ /mob/new_player/get_species() var/datum/species/chosen_species if(client.prefs.species) - chosen_species = all_species[client.prefs.species] + chosen_species = GLOB.all_species[client.prefs.species] if(!chosen_species) return SPECIES_HUMAN diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index d60be96b030..4aff695fc4a 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -2,8 +2,8 @@ /datum/preferences //The mob should have a gender you want before running this proc. Will run fine without H /datum/preferences/proc/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) - var/datum/species/current_species = all_species[species] - if(!current_species) current_species = all_species[SPECIES_HUMAN] + var/datum/species/current_species = GLOB.all_species[species] + if(!current_species) current_species = GLOB.all_species[SPECIES_HUMAN] gender = pick(current_species.genders) h_style = random_hair_style(gender, species) f_style = random_facial_hair_style(gender, species) diff --git a/code/modules/mob/observer/ghost/ghost.dm b/code/modules/mob/observer/ghost/ghost.dm index 1953f88243c..bbf5b8d5a25 100755 --- a/code/modules/mob/observer/ghost/ghost.dm +++ b/code/modules/mob/observer/ghost/ghost.dm @@ -168,7 +168,7 @@ Works together with spawning an observer, noted above. ghost.client = client ghost.client.init_verbs() ghost.initialise_postkey() - 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. + if(ghost.client && !ghost.client.holder && !CONFIG_GET(flag/antag_hud_allowed)) // For new ghosts we remove the verb from even showing up if it's not allowed. remove_verb(ghost, /mob/observer/ghost/verb/toggle_antagHUD) ghost.client?.create_UI(ghost.type) @@ -196,7 +196,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)", "Are you sure you want to ghost?", "Ghost", "Stay in body") if(response == "Ghost") - message_admins("[key_name_admin(usr)] has ghosted. (JMP)") + message_admins("[key_name_admin(usr)] has ghosted. [ADMIN_JMP(src)]") log_game("[key_name_admin(usr)] has ghosted.") ghostize(0) announce_ghost_joinleave(client) @@ -233,10 +233,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return if(medHUD) medHUD = 0 - to_chat(src, "\blue Medical HUD Disabled") + to_chat(src, span_blue("Medical HUD Disabled")) else medHUD = 1 - to_chat(src, "\blue Medical HUD Enabled") + to_chat(src, span_blue("Medical HUD Enabled")) /mob/observer/ghost/verb/toggle_antagHUD() set category = "Ghost" @@ -246,14 +246,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!client) return var/mentor = is_mentor(usr.client) - if(!config.antag_hud_allowed && (!client.holder || mentor)) - to_chat(src, "\red Admins have disabled this for this round.") + if(!CONFIG_GET(flag/antag_hud_allowed) && (!client.holder || mentor)) + to_chat(src, span_red("Admins have disabled this for this round.")) return var/mob/observer/ghost/M = src if(jobban_isbanned(M, "AntagHUD")) - to_chat(src, "\red You have been banned from using this feature") + to_chat(src, span_red("You have been banned from using this feature")) return - if(config.antag_hud_restricted && !M.has_enabled_antagHUD && (!client.holder || mentor)) + if(CONFIG_GET(flag/antag_hud_restricted) && !M.has_enabled_antagHUD && (!client.holder || mentor)) var/response = 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?","Yes","No") if(response == "No") return M.can_reenter_corpse = 0 @@ -261,10 +261,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp M.has_enabled_antagHUD = 1 if(M.antagHUD) M.antagHUD = 0 - to_chat(src, "\blue AntagHUD Disabled") + to_chat(src, span_blue("AntagHUD Disabled")) else M.antagHUD = 1 - to_chat(src, "\blue AntagHUD Enabled") + to_chat(src, span_blue("AntagHUD Enabled")) /mob/observer/ghost/proc/dead_tele(A in SSmapping.ghostteleportlocs) set category = "Ghost" @@ -385,11 +385,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/observer/ghost/memory() set hidden = 1 - to_chat(src, "\red You are dead! You have no mind to store memory!") + to_chat(src, span_red("You are dead! You have no mind to store memory!")) /mob/observer/ghost/add_memory() set hidden = 1 - to_chat(src, "\red You are dead! You have no mind to store memory!") + to_chat(src, span_red("You are dead! You have no mind to store memory!")) /mob/observer/ghost/verb/analyze_air() @@ -407,16 +407,16 @@ 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 - to_chat(src, "\blue Results:") + to_chat(src, span_blue("Results:")) if(abs(pressure - ONE_ATMOSPHERE) < 10) - to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa") + to_chat(src, span_blue("Pressure: [round(pressure,0.1)] kPa")) else - to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa") + to_chat(src, span_red("Pressure: [round(pressure,0.1)] kPa")) if(total_moles) for(var/g in environment.gas) - to_chat(src, "\blue [gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)") - to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)") - to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]") + to_chat(src, span_blue("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)")) + to_chat(src, span_blue("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)")) + to_chat(src, span_blue("Heat Capacity: [round(environment.heat_capacity(),0.1)]")) /mob/observer/verb/become_mouse() @@ -453,7 +453,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, span_warning("Unable to find any safe, unwelded vents to spawn mice at. The ship must be quite a mess! Trying again might work, if you think there's still a safe place. ")) if(host) - if(config.uneducated_mice) + if(CONFIG_GET(flag/uneducated_mice)) host.universal_understand = 0 announce_ghost_joinleave(src, 0, "They are now a mouse.") host.ckey = src.ckey @@ -561,7 +561,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return ..() /mob/observer/ghost/proc/try_possession(var/mob/living/M) - if(!config.ghosts_can_possess_animals) + if(!CONFIG_GET(flag/ghosts_can_possess_animals)) to_chat(usr, span_warning("Ghosts are not permitted to possess animals.")) return 0 if(!M.can_be_possessed_by(src)) @@ -690,25 +690,25 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/observer/ghost/MayRespawn(var/feedback = 0, var/respawn_type = 0) if(!client) return FALSE - if(config.antag_hud_restricted && has_enabled_antagHUD == 1) + if(CONFIG_GET(flag/antag_hud_restricted) && has_enabled_antagHUD == 1) if(feedback) to_chat(src, span_warning("antagHUD restrictions prevent you from respawning.")) return FALSE - if(!config.respawn_delay) + if(!CONFIG_GET(number/respawn_delay)) return TRUE var/timedifference = world.time- get_death_time(respawn_type) var/respawn_time = 0 if (respawn_type == CREW) - respawn_time = config.respawn_delay MINUTES + respawn_time = CONFIG_GET(number/respawn_delay) MINUTES //Here we factor in bonuses added from cryosleep and similar things timedifference += get_respawn_bonus() else if (respawn_type == ANIMAL) - respawn_time = min(ANIMAL_SPAWN_DELAY, config.respawn_delay) + respawn_time = min(ANIMAL_SPAWN_DELAY, CONFIG_GET(number/respawn_delay)) else if (respawn_type == MINISYNTH) - respawn_time = min(DRONE_SPAWN_DELAY, config.respawn_delay) + respawn_time = min(DRONE_SPAWN_DELAY, CONFIG_GET(number/respawn_delay)) timedifference = max(timedifference, 0) if(respawn_time && timedifference > respawn_time) @@ -765,7 +765,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Respawn" set category = "OOC" - if (!( config.abandon_allowed )) + if (!( CONFIG_GET(flag/abandon_allowed) )) to_chat(usr, span_notice("Respawn is disabled.")) return @@ -777,7 +777,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, span_notice("You must be dead to use this!")) return else if(!MayRespawn(1, CREW)) - if(!check_rights(0, 0) || alert("Normal players must wait at least [config.respawn_delay] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok") + if(!check_rights(0, 0) || alert("Normal players must wait at least [CONFIG_GET(number/respawn_delay)] minutes to respawn! Would you like to bypass it?","Warning", "No", "Ok") != "Ok") return //Wipe any bonuses gained in the previous (after)life diff --git a/code/modules/mob/observer/ghost/say.dm b/code/modules/mob/observer/ghost/say.dm index dfa5a9e8355..3cb646ad60d 100644 --- a/code/modules/mob/observer/ghost/say.dm +++ b/code/modules/mob/observer/ghost/say.dm @@ -8,7 +8,7 @@ if(src.client) if(src.client.prefs.muted&MUTE_DEADCHAT) - to_chat(src, "\red You cannot talk in deadchat (muted).") + to_chat(src, span_red("You cannot talk in deadchat (muted).")) return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) @@ -42,7 +42,7 @@ if(src.client) if(src.client.prefs.muted&MUTE_DEADCHAT) - to_chat(src, "\red You cannot emote in deadchat (muted).") + to_chat(src, span_red("You cannot emote in deadchat (muted).")) return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 36d2852f708..cb1e4a72959 100755 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -6,7 +6,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return if(ishuman(src)) @@ -30,7 +30,7 @@ set category = "IC" if(say_disabled) //This is here to try to identify lag problems - to_chat(usr, "\red Speech is currently admin-disabled.") + to_chat(usr, span_red("Speech is currently admin-disabled.")) return if(ishuman(src)) @@ -57,7 +57,7 @@ if(say_disabled) //This is here to try to identify lag problems to_chat(usr, span_danger("Speech is currently admin-disabled.")) return - if(src.client && !src.client.holder && !config.dsay_allowed) + if(src.client && !src.client.holder && !GLOB.dsay_allowed) to_chat(src, span_danger("Deadchat is globally muted.")) return @@ -157,11 +157,11 @@ var/prefix = copytext(message, 1, 2) if(length(message) >= 1 && prefix == get_prefix_key(/decl/prefix/audible_emote)) - return all_languages["Noise"] + return GLOB.all_languages["Noise"] if(length(message) >= 2 && is_language_prefix(prefix)) var/language_prefix = copytext(message, 2, 3) - var/datum/language/L = language_keys[language_prefix] + var/datum/language/L = GLOB.language_keys[language_prefix] if(can_speak(L)) return L diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm index 9846593a23a..756d2d3f1a1 100644 --- a/code/modules/modular_computers/NTNet/NTNet.dm +++ b/code/modules/modular_computers/NTNet/NTNet.dm @@ -195,7 +195,7 @@ var/global/datum/ntnet/ntnet_global = new() add_log("Configuration Updated. Wireless network firewall now [setting_communication ? "allows" : "disallows"] instant messaging and similar communication services.") if(NTNET_SYSTEMCONTROL) setting_systemcontrol = !setting_systemcontrol - add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name]'s systems.") + add_log("Configuration Updated. Wireless network firewall now [setting_systemcontrol ? "allows" : "disallows"] remote control of [station_name()]'s systems.") /datum/ntnet/proc/find_email_by_login(var/login) for(var/datum/computer_file/data/email_account/A in ntnet_global.email_accounts) diff --git a/code/modules/modular_computers/file_system/binary/design.dm b/code/modules/modular_computers/file_system/binary/design.dm index 7ff1bddf949..50c7289bb60 100644 --- a/code/modules/modular_computers/file_system/binary/design.dm +++ b/code/modules/modular_computers/file_system/binary/design.dm @@ -14,7 +14,7 @@ return F /datum/computer_file/binary/design/proc/set_filename(new_name) - filename = sanitizeFileName("[new_name]") + filename = SANITIZE_FILENAME("[new_name]") if(findtext(filename, "datum_design_") == 1) filename = copytext(filename, 14) diff --git a/code/modules/modular_computers/file_system/binary/research.dm b/code/modules/modular_computers/file_system/binary/research.dm index 61e58195347..d7bc2013e81 100644 --- a/code/modules/modular_computers/file_system/binary/research.dm +++ b/code/modules/modular_computers/file_system/binary/research.dm @@ -11,7 +11,7 @@ /datum/computer_file/binary/tech/proc/set_tech(datum/technology/new_tech) node = new_tech - filename = sanitizeFileName(lowertext(node.name)) + filename = SANITIZE_FILENAME(lowertext(node.name)) // R&D research points file diff --git a/code/modules/modular_computers/file_system/catalog.dm b/code/modules/modular_computers/file_system/catalog.dm index 8f61e85ccd7..db15640db34 100644 --- a/code/modules/modular_computers/file_system/catalog.dm +++ b/code/modules/modular_computers/file_system/catalog.dm @@ -12,78 +12,6 @@ GLOBAL_LIST_EMPTY(catalogs) GLOBAL_LIST_EMPTY(all_catalog_entries_by_type) -/hook/startup/proc/createCatalogs() - // Reagents - for(var/V in GLOB.chemical_reagents_list) - var/datum/reagent/D = GLOB.chemical_reagents_list[V] - if(D.appear_in_default_catalog) - create_catalog_entry(D, CATALOG_REAGENTS) - create_catalog_entry(D, CATALOG_ALL) - if(istype(D, /datum/reagent/drink) || istype(D, /datum/reagent/alcohol)) - create_catalog_entry(D, CATALOG_DRINKS) - else - create_catalog_entry(D, CATALOG_CHEMISTRY) - // second run to add decompose results - for(var/V in GLOB.chemical_reagents_list) - var/datum/reagent/D = GLOB.chemical_reagents_list[V] - if(D.heating_products && D.heating_point) - for(var/id in D.heating_products) - var/datum/catalog_entry/reagent/E = get_catalog_entry(get_reagent_type_by_id(id)) - if(E) - E.add_decomposition_from(D.type) - - if(D.chilling_products && D.chilling_point) - for(var/id in D.chilling_point) - var/datum/catalog_entry/reagent/E = get_catalog_entry(D.type) - if(E) - E.add_decomposition_from(D.type) - - var/datum/catalog/C = GLOB.catalogs[CATALOG_REAGENTS] - C.associated_template = "catalog_list_reagents.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - C = GLOB.catalogs[CATALOG_CHEMISTRY] - C.associated_template = "catalog_list_reagents.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_chem) - C = GLOB.catalogs[CATALOG_DRINKS] - C.associated_template = "catalog_list_drinks.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - C = GLOB.catalogs[CATALOG_ALL] - C.associated_template = "catalog_list_general.tmpl" - sortTim(C.entry_list, /proc/cmp_catalog_entry_asc) - createCookingCatalogs() - return TRUE - -/proc/create_catalog_entry(var/datum/thing, var/catalog_id) - if(catalog_id && !GLOB.catalogs[catalog_id]) - GLOB.catalogs[catalog_id] = new /datum/catalog(catalog_id) - if(!GLOB.all_catalog_entries_by_type[thing.type]) - if(istype(thing, /datum/reagent)) - if(istype(thing, /datum/reagent/drink) || (istype(thing, /datum/reagent/alcohol) && thing.type != /datum/reagent/alcohol)) - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/drink(thing) - else - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/reagent(thing) - else if(istype(thing, /atom)) - GLOB.all_catalog_entries_by_type[thing.type] = new /datum/catalog_entry/atom(thing) - else - var/list/element = GLOB.catalogs[catalog_id] - if(!element.len) - qdel(element) - GLOB.catalogs.Remove(catalog_id) - return FALSE - error("Unsupported type passed to /proc/create_catalog_entry()") - return FALSE - if(catalog_id) - var/datum/catalog/C = GLOB.catalogs[catalog_id] - C.add_entry(GLOB.all_catalog_entries_by_type[thing.type]) - else if(catalog_id) - var/datum/catalog/C = GLOB.catalogs[catalog_id] - if(!C.entry_list.Find(GLOB.all_catalog_entries_by_type[thing.type])) - C.add_entry(GLOB.all_catalog_entries_by_type[thing.type]) - return TRUE - -/proc/get_catalog_entry(var/type) - if(GLOB.all_catalog_entries_by_type[type]) - return GLOB.all_catalog_entries_by_type[type] /datum/catalog var/id diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index cb62e0aee79..00407ba259c 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -28,7 +28,7 @@ var/list/data = host.initial_data() data["src"] = "\ref[src]" - data["station_name"] = station_name + data["station_name()"] = station_name() data["manifest"] = html_crew_manifest() data["assignments"] = show_assignments if(program && program.computer) @@ -187,7 +187,7 @@ if(computer.card_slot && computer.card_slot.stored_card) computer.proc_eject_id(user) else - computer.attackby(user.get_active_hand(), user) + computer.attackby(user.get_active_held_item(), user) if("terminate") if(!authorized(user_id_card, ACCESS_REGION_COMMAND)) to_chat(user, span_warning("Access denied.")) diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 756ae88b629..7e876618b1d 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -136,7 +136,7 @@ if(announcment_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements") return TRUE - var/input = input(usr, "Please write a message to announce to the [station_name].", "Priority Announcement") as null|text + var/input = input(usr, "Please write a message to announce to the [station_name()].", "Priority Announcement") as null|text if(!input || !can_still_topic()) return 1 if(GLOB.in_character_filter.len) //I don't want to read announcements about sending people to brazil. diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm index 6a7de53b1cc..2e305034e79 100644 --- a/code/modules/modular_computers/file_system/programs/generic/records.dm +++ b/code/modules/modular_computers/file_system/programs/generic/records.dm @@ -130,8 +130,8 @@ return 1 /datum/nano_module/records/proc/get_photo(var/mob/user) - if(istype(user.get_active_hand(), /obj/item/photo)) - var/obj/item/photo/photo = user.get_active_hand() + if(istype(user.get_active_held_item(), /obj/item/photo)) + var/obj/item/photo/photo = user.get_active_held_item() return photo.img if(istype(user, /mob/living/silicon)) var/mob/living/silicon/tempAI = usr diff --git a/code/modules/modular_computers/file_system/programs/generic/signaller.dm b/code/modules/modular_computers/file_system/programs/generic/signaller.dm index 0c65ae76712..bec5f499afc 100644 --- a/code/modules/modular_computers/file_system/programs/generic/signaller.dm +++ b/code/modules/modular_computers/file_system/programs/generic/signaller.dm @@ -101,5 +101,7 @@ /datum/computer_file/program/signaller/proc/receive_signal(datum/signal/signal) if(signal.encryption == code) - for(var/mob/O in hearers(1, computer.loc)) - O.show_message("\icon[computer] *beep* *beep*", 3, "*beep* *beep*", 2) + var/our_hearers = hearers(1, get_turf(computer)) + var/htmlicon = icon2html(computer, our_hearers) + for(var/mob/O in our_hearers) + O.show_message("[htmlicon] *beep* *beep*", 3, "*beep* *beep*", 2) diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 134e01e37cc..19be303cd23 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -258,7 +258,7 @@ return var/t = "" - t += "
[maps_data.station_name] Supply Requisition Reciept
" + t += "
[maps_data.station_name()] Supply Requisition Reciept
" t += "INDEX: #[O.ordernum]
" t += "REQUESTED BY: [O.orderedby]
" t += "RANK: [O.orderedrank]
" @@ -272,7 +272,7 @@ /datum/nano_module/supply/proc/print_summary(var/mob/user) var/t = "" - t += "
[station_date]
Export overview
" + t += "
[station_date]
Export overview
" for(var/source in SSsupply.point_source_descriptions) t += "[SSsupply.point_source_descriptions[source]]: [SSsupply.point_sources[source] || 0]
" print_text(t, user) diff --git a/code/modules/modular_computers/file_system/programs/generic/trade.dm b/code/modules/modular_computers/file_system/programs/generic/trade.dm index daec921afa8..ae254f69cd8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/trade.dm +++ b/code/modules/modular_computers/file_system/programs/generic/trade.dm @@ -68,13 +68,13 @@ var/list/category_list = list() var/list/inventory_list = list() - LAZYDISTINCTADD(shoppinglist, station) // Add the station reference to the shopping list if it doesn't already exist + shoppinglist |= station // Add the station reference to the shopping list if it doesn't already exist if(!islist(shoppinglist[station])) // If nothing has been added under this station, create an empty list shoppinglist[station] = list() category_list = shoppinglist[station] // Make the category list point to the current station's category list - LAZYDISTINCTADD(category_list, chosen_category) // Add the category to the shopping list if it doesn't already exist + category_list |= chosen_category // Add the category to the shopping list if it doesn't already exist if(!islist(category_list[chosen_category])) // If nothing has been added under this category, create an empty list category_list[chosen_category] = list() @@ -103,7 +103,7 @@ if(!path) return var/list/inventory_list = open_shop_list() // Get reference to inventory list - LAZYDISTINCTADD(inventory_list, path) + inventory_list |= path LAZYAPLUS(inventory_list, path, max(0, amount)) if(inventory_list[path] > limit) @@ -143,7 +143,7 @@ var/list_name = name ? name : "Saved Cart #[++saved_cart_id]" - LAZYDISTINCTADD(saved_shopping_lists, list_name) + saved_shopping_lists |= list_name LAZYSET(saved_shopping_lists, list_name, list_to_save) /datum/computer_file/program/trade/proc/load_shop_list(name) @@ -609,7 +609,7 @@ .["sending_index"] = SStrade.beacons_sending.Find(PRG.sending) if(PRG.station) - .["station_name"] = PRG.station.name + .["station_name()"] = PRG.station.name .["station_desc"] = PRG.station.desc .["station_id"] = PRG.station.uid .["station_index"] = SStrade.discovered_stations.Find(PRG.station) diff --git a/code/modules/multiz/turf.dm b/code/modules/multiz/turf.dm index f75b3f72ddc..9d86902886d 100755 --- a/code/modules/multiz/turf.dm +++ b/code/modules/multiz/turf.dm @@ -107,7 +107,7 @@ see multiz/movement.dm for some info. /turf/open/fallThrough(var/atom/movable/mover) // If the target is open space or a shadow, the projectile traverses down - if( config.z_level_shooting && istype(mover,/obj/item/projectile) ) + if( CONFIG_GET(flag/z_level_shooting) && istype(mover,/obj/item/projectile) ) var/obj/item/projectile/P = mover if(isnull(P.height) && ( istype(P.original, /turf/open) || (istype(mover, /mob/shadow)) ) && get_dist(P.starting, P.original) <= get_dist(P.starting, src)) P.Move(below) // We want proc/Enter to get called on the turf, so we can't use forcemove() diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 2e20b56a0b6..aa2aa2ac24f 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -69,4 +69,4 @@ return list() // Not implemented. // Used by SSnano (/datum/controller/subsystem/processing/nano) to track UIs opened by this mob -/mob/var/list/open_uis +// /mob/var/list/open_uis diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index b0d87508210..9b2e5238e3f 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -232,7 +232,7 @@ nanoui is used to open and update nano browser uis var/list/potential_catalog_data = list() for(var/type in types) - var/datum/catalog_entry/E = get_catalog_entry(type) + var/datum/catalog_entry/E = SScwj.get_catalog_entry(type) if(E) potential_catalog_data.Add(list(list("entry_name" = E.title, "entry_img_path" = E.image_path, "entry_type" = E.thing_type))) @@ -393,7 +393,7 @@ nanoui is used to open and update nano browser uis initial_data_json = strip_improper(initial_data_json); var/url_parameters_json = json_encode(list("src" = "\ref[src]")) - + // This prevents the so-called white screens spawn(1) retrieving_html = FALSE diff --git a/code/modules/onestar/os_cash.dm b/code/modules/onestar/os_cash.dm index 2a594d305b9..4226f824571 100644 --- a/code/modules/onestar/os_cash.dm +++ b/code/modules/onestar/os_cash.dm @@ -38,7 +38,7 @@ ..() /obj/item/stack/os_cash/attack_hand(mob/user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) split_cash(user) else ..() diff --git a/code/modules/organs/body_modifications.dm b/code/modules/organs/body_modifications.dm index e133a971edd..644d6d943cc 100644 --- a/code/modules/organs/body_modifications.dm +++ b/code/modules/organs/body_modifications.dm @@ -240,7 +240,7 @@ var/global/list/modifications_types = list( replace_limb = /obj/item/organ/internal/eyes/oneeye /datum/body_modification/organ/oneeye/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_l") I.Blend(color, ICON_ADD) return I @@ -257,7 +257,7 @@ var/global/list/modifications_types = list( replace_limb = /obj/item/organ/internal/eyes/oneeye/right /datum/body_modification/organ/oneeye/right/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_r") I.Blend(color, ICON_ADD) return I @@ -271,7 +271,7 @@ var/global/list/modifications_types = list( hascolor = TRUE /datum/body_modification/organ/heterochromia/get_mob_icon(organ, color, gender, species) - var/datum/species/S = all_species[species] + var/datum/species/S = GLOB.all_species[species] var/icon/I = new/icon(S.faceicobase, "eye_l") I.Blend(color, ICON_ADD) return I diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm index be70eeda9d8..e6179d9bee7 100644 --- a/code/modules/organs/external/_external.dm +++ b/code/modules/organs/external/_external.dm @@ -20,7 +20,7 @@ // Strings var/damage_state = "00" // Modifier used for generating the on-mob damage overlay for this limb. - var/damage_msg = "\red You feel an intense pain" + var/damage_msg = span_red("You feel an intense pain") // Damage vars. var/brute_mod = 1 // Multiplier for incoming brute damage. diff --git a/code/modules/organs/external/damage.dm b/code/modules/organs/external/damage.dm index 2d6955c8051..57eedce27ae 100644 --- a/code/modules/organs/external/damage.dm +++ b/code/modules/organs/external/damage.dm @@ -72,7 +72,7 @@ //If limb took enough damage and is broken, try to cut or tear it off if(owner && loc == owner && !is_stump()) - if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER)) + if(!cannot_amputate && CONFIG_GET(flag/limbs_can_break) && (brute_dam + burn_dam) >= (max_damage * ORGAN_HEALTH_MULTIPLIER)) //organs can come off in four cases //1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off. //2. If the damage amount dealt exceeds the disintegrate threshold, the organ is completely obliterated. diff --git a/code/modules/organs/internal/bones.dm b/code/modules/organs/internal/bones.dm index af3c5e340c0..d3112d7b130 100644 --- a/code/modules/organs/internal/bones.dm +++ b/code/modules/organs/internal/bones.dm @@ -134,3 +134,12 @@ icon_state = "metal_left_leg" nature = MODIFICATION_SILICON matter = list(MATERIAL_STEEL = 2, MATERIAL_PLASTIC = 2) + +/mob/living/carbon/human/has_hand_for_held_index(i) + var/hand_bodyparts = get_hand_organs() + if(!length(hand_bodyparts)) + return FALSE + var/obj/item/organ/external/hand_instance = hand_bodyparts[i + 1] + if(hand_instance && !(hand_instance.status & ORGAN_DEAD)) + return hand_instance + return FALSE diff --git a/code/modules/organs/internal/carrion.dm b/code/modules/organs/internal/carrion.dm index 87f34b6b7b2..1db65a93b27 100644 --- a/code/modules/organs/internal/carrion.dm +++ b/code/modules/organs/internal/carrion.dm @@ -370,7 +370,7 @@ return src = maw - var/food = owner.get_active_hand() + var/food = owner.get_active_held_item() if(!food) to_chat(owner, span_warning("You can't eat nothing.")) @@ -446,7 +446,7 @@ var/organ_rotten = FALSE if (O.status & ORGAN_DEAD) organ_rotten = TRUE - if(O.species != all_species[SPECIES_HUMAN]) + if(O.species != GLOB.all_species[SPECIES_HUMAN]) chemgain = 5 taste_description = "this non-human organ is very bland." // no removal of hunger here, getting and storing a ton of monkey organs isn't too easy, and 5 chem points isn't terribly much. else diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index ddd2da8bed3..5fbe9a54a7c 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -91,7 +91,7 @@ blood_DNA = list() blood_DNA.Cut() blood_DNA[C.dna_trace] = C.b_type - species = all_species[C.species.name] + species = GLOB.all_species[C.species.name] /obj/item/organ/proc/die() if(BP_IS_ROBOTIC(src) || status & ORGAN_DEAD) @@ -106,7 +106,7 @@ owner.death() /obj/item/organ/get_item_cost() - if((status & ORGAN_DEAD) || species != all_species[SPECIES_HUMAN]) //No dead or monkey organs! + if((status & ORGAN_DEAD) || species != GLOB.all_species[SPECIES_HUMAN]) //No dead or monkey organs! return FALSE return ..() @@ -154,7 +154,7 @@ if(B && prob(40)) reagents.remove_reagent("blood",0.1) blood_splatter(src,B,1) - if(config.organs_decay) + if(CONFIG_GET(flag/organs_can_decay)) if(prob(5)) take_damage(12, TOX) // Will cause toxin accumulation wounds else diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index 20e86e4740a..1fb3b46a8cf 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -29,23 +29,23 @@ if(burning) switch(amount) if(1 to 10) - msg = "\red Your [partname] burns." + msg = span_warning("Your [partname] burns.") if(11 to 90) flash_weak_pain() - msg = "\red Your [partname] burns badly!" + msg = span_warning("Your [partname] burns badly!") if(91 to 10000) flash_pain() - msg = "\red OH GOD! Your [partname] is on fire!" + msg = span_danger("OH GOD! Your [partname] is on fire!") else switch(amount) if(1 to 10) - msg = "Your [partname] hurts." + msg = span_warning("Your [partname] hurts.") if(11 to 90) flash_weak_pain() - msg = "Your [partname] hurts badly." + msg = span_warning("Your [partname] hurts badly.") if(91 to 10000) flash_pain() - msg = "OH GOD! Your [partname] is hurting terribly!" + msg = span_danger("OH GOD! Your [partname] is hurting terribly!") if(msg && (msg != last_pain_message || prob(10))) last_pain_message = msg to_chat(src, msg) @@ -67,9 +67,9 @@ if(flash_strength < 0) return - var/msg = "\red [message]" + var/msg = span_warning("[message]") if(flash_strength >= 1) - msg = "\red [message]" + msg = span_danger("[message]") // Anti message spam checks if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time))) diff --git a/code/modules/overmap/events/movable.dm b/code/modules/overmap/events/movable.dm index e2ca8f0843d..ed833b96eb3 100644 --- a/code/modules/overmap/events/movable.dm +++ b/code/modules/overmap/events/movable.dm @@ -106,7 +106,7 @@ start_y = rand(2, GLOB.maps_data.overmap_size - rand(5,10)) moving_vector = pick(NORTH, WEST, NORTHWEST) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) @@ -165,7 +165,7 @@ icon_stages[1] = pick(list("meteors0", "meteors1", "meteors2", "meteors3")) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return walk(src,turn(moving_vector, pick(45,-45,90,-90)),rand(100,160),0) @@ -198,10 +198,10 @@ icon_stages[1] = pick(list("dust0", "dust1", "dust2", "dust3")) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return spawn(450) del_event() qdel(src) -////// SPACE_COMET%%%::::::........ \ No newline at end of file +////// SPACE_COMET%%%::::::........ diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index bd68ab48553..e7fb5bf6823 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -58,7 +58,7 @@ habitability_class = HABITABILITY_BAD /obj/effect/overmap/sector/exoplanet/New(nloc, max_x, max_y) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return maxx = max_x ? max_x : world.maxx diff --git a/code/modules/overmap/exoplanets/planet_types/grass.dm b/code/modules/overmap/exoplanets/planet_types/grass.dm index 138f24a6bf9..a54a6034515 100644 --- a/code/modules/overmap/exoplanets/planet_types/grass.dm +++ b/code/modules/overmap/exoplanets/planet_types/grass.dm @@ -71,7 +71,7 @@ /turf/floor/exoplanet/grass/Initialize() . = ..() - if(config.use_overmap) + if(CONFIG_GET(flag/use_overmap)) var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"] if(istype(E) && E.grass_color) color = E.grass_color diff --git a/code/modules/overmap/exoplanets/turfs.dm b/code/modules/overmap/exoplanets/turfs.dm index 37b48d18163..73840632d26 100644 --- a/code/modules/overmap/exoplanets/turfs.dm +++ b/code/modules/overmap/exoplanets/turfs.dm @@ -11,7 +11,7 @@ return FALSE */ /turf/floor/exoplanet/New() - if(config.use_overmap) + if(CONFIG_GET(flag/use_overmap)) var/obj/effect/overmap/sector/exoplanet/E = map_sectors["[z]"] if(istype(E)) if(E.atmosphere) diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 160e54e9fd1..6d4dc7a852d 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -30,7 +30,7 @@ /obj/effect/overmap/Initialize() . = ..() - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return map_z = GetConnectedZlevels(z) @@ -42,7 +42,7 @@ start_x = start_x || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) start_y = start_y || rand(OVERMAP_EDGE, GLOB.maps_data.overmap_size - OVERMAP_EDGE) - if ((!eris_start_set) && (name == config.start_location)) + if ((!eris_start_set) && (name == CONFIG_GET(string/start_location))) var/obj/effect/overmap/ship/eris/E = (locate(/obj/effect/overmap/ship/eris) in GLOB.ships) start_x = E.start_x start_y = E.start_y @@ -113,4 +113,4 @@ H.get_known_sectors() /obj/effect/overmap/proc/add_landmark(obj/effect/shuttle_landmark/landmark) - generic_waypoints += landmark \ No newline at end of file + generic_waypoints += landmark diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index f539850dc02..ef0284449cd 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -85,7 +85,7 @@ user.reset_view(linked) user.client.view = "[2*NAVIGATION_VIEW_RANGE+1]x[2*NAVIGATION_VIEW_RANGE+1]" - else if(!config.use_overmap && user?.client?.holder) + else if(!CONFIG_GET(flag/use_overmap) && user?.client?.holder) // Let the new developers know why the helm console is unresponsive // (it's disabled by default on local server to make it start a bit faster) to_chat(user, "NOTE: overmap generation is disabled in server configuration.") diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 77a02790b3e..817740ff6c0 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -82,7 +82,7 @@ else if(href_list["addpen"]) if(!haspen) - var/obj/item/pen/W = usr.get_active_hand() + var/obj/item/pen/W = usr.get_active_held_item() if(istype(W, /obj/item/pen)) usr.drop_item() W.loc = src @@ -94,7 +94,7 @@ if(P && (P.loc == src) && istype(P, /obj/item/paper) && (P == toppaper) ) - var/obj/item/I = usr.get_active_hand() + var/obj/item/I = usr.get_active_held_item() if(istype(I, /obj/item/pen)) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index b7be8b7c06c..8c5d27f75ba 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -146,9 +146,9 @@ while(locid < MAX_FIELDS) var/istart = 0 if(links) - istart = findtext(info_links, "", laststart) + istart = findtext(info_links, "", laststart) else - istart = findtext(info, "", laststart) + istart = findtext(info, "", laststart) if(istart == 0) return // No field found with matching id @@ -229,7 +229,7 @@ //Count the fields var/laststart = 1 while(fields < MAX_FIELDS) - var/i = findtext(t, "", laststart) // + var/i = findtext(t, "", laststart) // if(i == 0) break laststart = i + 1 @@ -248,18 +248,18 @@ "You hold \the [P] up to \the [src], burning it slowly.") spawn(20) - if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) + if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit) user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) user.drop_from_inventory(src) new /obj/effect/decal/cleanable/ash(src.loc) qdel(src) else - to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper/Topic(href, href_list) @@ -268,7 +268,7 @@ return if(href_list["write"]) - if(!config.paper_input) + if(!CONFIG_GET(flag/paper_input)) to_chat(usr, span_warning("No matter how hard you try to write on \the [src], nothing shows up! (Paper input disabled in config.)")) return @@ -284,7 +284,7 @@ if(!t) return - var/obj/item/i = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. + var/obj/item/i = usr.get_active_held_item() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. var/iscrayon = 0 if(!istype(i, /obj/item/pen)) return @@ -393,7 +393,7 @@ return else if(istype(P, /obj/item/stamp)) - if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) + if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/clipboard) ) && loc.loc != user && user.get_active_held_item() != P)) return playsound(src,'sound/effects/Stamp.ogg',40,1) stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 6963c22da86..b75ab4f6b3f 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -79,18 +79,18 @@ "You hold \the [P] up to \the [src], burning it slowly.") spawn(20) - if(get_dist(src, user) < 2 && user.get_active_hand() == P && P.lit) + if(get_dist(src, user) < 2 && user.get_active_held_item() == P && P.lit) user.visible_message("[user] burns right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.", \ "You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.") - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) user.drop_from_inventory(src) new /obj/effect/decal/cleanable/ash(src.loc) qdel(src) else - to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + to_chat(user, span_red("You must hold \the [P] steady to burn \the [src].")) /obj/item/paper_bundle/examine(mob/user, extra_description = "") if(get_dist(user, src) < 2) @@ -145,7 +145,7 @@ ..() if((src in usr.contents) || (istype(src.loc, /obj/item/folder) && (src.loc in usr.contents))) usr.set_machine(src) - var/obj/item/in_hand = usr.get_active_hand() + var/obj/item/in_hand = usr.get_active_held_item() if(href_list["next_page"]) if(in_hand && (istype(in_hand, /obj/item/paper) || istype(in_hand, /obj/item/photo))) insert_sheet_at(usr, page+1, in_hand) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 528842a7cce..92a2e9b6d27 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -15,7 +15,7 @@ /obj/item/paper_bin/MouseDrop(mob/user as mob) if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr)))))) if(!isslime(usr) && !isanimal(usr)) - if( !usr.get_active_hand() ) //if active hand is empty + if( !usr.get_active_held_item() ) //if active hand is empty var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_ARM] diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 4fe48cf6153..fd6e0dcf119 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -64,10 +64,10 @@ if(!ismob(M)) return to_chat(user, span_warning("You stab [M] with the pen.")) -// M << "\red You feel a tiny prick!" //That's a whole lot of meta! +// M << span_red("You feel a tiny prick!") //That's a whole lot of meta! M.attack_log += text("\[[time_stamp()]\] Has been stabbed with [name] by [user.name] ([user.ckey])") user.attack_log += text("\[[time_stamp()]\] Used the [name] to stab [M.name] ([M.ckey])") - msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) [ADMIN_JMP(user)]") return /* diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 24f44288dd8..4e51a868fa7 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -45,7 +45,7 @@ src.state = STATE_DEFAULT if("login") var/mob/M = usr - var/obj/item/card/id/I = M.get_active_hand() + var/obj/item/card/id/I = M.get_active_held_item() if (I && istype(I)) if(src.check_access(I)) authenticated = 1 diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 393cb0bb3ae..c5820be292c 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -130,7 +130,7 @@ if(QUALITY_BOLT_TURNING in I.tool_qualities) if(anchored || linked_shielding.len) - to_chat(user, "\red Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!") + to_chat(user, span_red("Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!")) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) if(!anchored) user.visible_message("[user.name] secures the [src.name] to the floor.", \ @@ -148,7 +148,7 @@ if(istype(I, /obj/item/am_containment)) if(fueljar) - to_chat(user, "\red There is already a [fueljar] inside!") + to_chat(user, span_red("There is already a [fueljar] inside!")) return fueljar = I user.remove_from_mob(I) diff --git a/code/modules/power/antimatter/engine.dm b/code/modules/power/antimatter/engine.dm index 00cfa5b2222..5330fb81feb 100644 --- a/code/modules/power/antimatter/engine.dm +++ b/code/modules/power/antimatter/engine.dm @@ -108,8 +108,8 @@ H_fuel = 0 antiH_fuel = residual_matter - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud bang!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("You hear a loud bang!"))) //Q = k x (delta T) @@ -160,8 +160,8 @@ if(energy > convert2energy(8e-12)) //TOO MUCH ENERGY - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red You hear a loud whirring!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("You hear a loud whirring!"))) sleep(20) //Q = k x (delta T) @@ -179,8 +179,8 @@ antiH_fuel += antiH if(energy > convert2energy(8e-12)) //FAR TOO MUCH ENERGY STILL - for(var/mob/M in hearers(src, null)) - M.show_message(text("\red BANG!")) + for(var/mob/M in hearers(get_turf(src))) + M.show_message(text(span_red("BANG!"))) new /obj/effect/bhole(src.loc) else //this amount of energy is okay so it does the proper output thing @@ -204,4 +204,4 @@ stopping = 0 - return \ No newline at end of file + return diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm index f1273cdaef7..3b690c775e9 100644 --- a/code/modules/power/antimatter/shielding.dm +++ b/code/modules/power/antimatter/shielding.dm @@ -66,7 +66,7 @@ /obj/machinery/am_shielding/Destroy() if(control_unit) control_unit.remove_shielding(src) if(processing) shutdown_core() - visible_message("\red The [src.name] melts!") + visible_message(span_red("The [src.name] melts!")) //Might want to have it leave a mess on the floor but no sprites for now return ..() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6519e3d6411..928156d19b5 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -751,7 +751,7 @@ var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - user.visible_message("\red [user.name] slashes at the [name]!", "\blue You slash at the [name]!") + user.visible_message(span_danger("[user.name] slashes at the [name]!"), span_danger("You slash at the [name]!")) playsound(loc, 'sound/weapons/slash.ogg', 100, 1) var/allcut = wires.IsAllCut() @@ -759,12 +759,12 @@ if(beenhit >= pick(3, 4) && wiresexposed != 1) wiresexposed = 1 update_icon() - visible_message("\red The [name]'s cover flies open, exposing the wires!") + visible_message(span_red("The [name]'s cover flies open, exposing the wires!")) else if(wiresexposed == 1 && allcut == 0) wires.CutAll() update_icon() - visible_message("\red The [name]'s wires are shredded!") + visible_message(span_red("The [name]'s wires are shredded!")) else beenhit += 1 return diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index 511210cd276..f93665a5ba1 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -23,7 +23,7 @@ if(get_dist(user, src) < 2) extra_description += span_notice("\nClick any cell below to remove them from \the [src]:") for(var/obj/item/cell/battery in component_parts) - extra_description += span_notice("\n\icon[battery] [battery.name]") + extra_description += span_notice("\n[icon2html(battery, user)] [battery.name]") else extra_description += span_notice("\nThe hatch needs to be opened with a screwdriver to interact with the cells inside!") extra_description += span_notice("\nIt currently has [capacitors_amount] capacitors installed.") diff --git a/code/modules/power/breaker_box.dm b/code/modules/power/breaker_box.dm index 10d2fa439dc..d6a5df3b214 100644 --- a/code/modules/power/breaker_box.dm +++ b/code/modules/power/breaker_box.dm @@ -51,10 +51,10 @@ return busy = 1 - to_chat(user, "\green Updating power settings..") + to_chat(user, span_green("Updating power settings..")) if(do_after(user, 50, src)) set_state(!on) - to_chat(user, "\green Update Completed. New setting:[on ? "on": "off"]") + to_chat(user, span_green("Update Completed. New setting:[on ? "on": "off"]")) update_locked = 1 spawn(600) update_locked = 0 @@ -72,7 +72,7 @@ busy = 1 for(var/mob/O in viewers(user)) - O.show_message(text("\red [user] started reprogramming [src]!"), 1) + O.show_message(span_red("[user] started reprogramming [src]!"), 1) if(do_after(user, 50,src)) set_state(!on) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 47da4472194..c0f4b60ea28 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -238,7 +238,7 @@ var/list/possible_cable_coil_colours = list( else new/obj/item/stack/cable_coil(T, 1, color) - for(var/mob/O in viewers(src, null)) + for(var/mob/O in viewers(get_turf(src))) O.show_message(span_warning("[user] cuts the cable."), 1) if(d1 == DOWN || d2 == DOWN) @@ -642,14 +642,14 @@ var/list/possible_cable_coil_colours = list( if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - to_chat(usr, "\red You need at least 15 lengths to make restraints!") + to_chat(usr, span_red("You need at least 15 lengths to make restraints!")) return var/obj/item/handcuffs/cable/B = new /obj/item/handcuffs/cable(usr.loc) B.color = color to_chat(usr, span_notice("You wind some cable together to make some restraints.")) src.use(15) else - to_chat(usr, "\blue You cannot do that.") + to_chat(usr, span_blue("You cannot do that.")) /obj/item/stack/cable_coil/cyborg/verb/set_colour() set name = "Change Colour" diff --git a/code/modules/power/diesel_gen.dm b/code/modules/power/diesel_gen.dm index e81cafc1bb5..802f76f8137 100644 --- a/code/modules/power/diesel_gen.dm +++ b/code/modules/power/diesel_gen.dm @@ -170,9 +170,9 @@ var/obj/item/stack/addstack = I var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - user << "\blue The [src.name] is full!" + user << span_blue("The [src.name] is full!") return - user << "\blue You add [amount] sheet\s to the [src.name]." + user << span_blue("You add [amount] sheet\s to the [src.name].") sheets += amount addstack.use(amount) updateUsrDialog() diff --git a/code/modules/power/fractal_reactor.dm b/code/modules/power/fractal_reactor.dm index a40559a5aa6..36216ff7806 100644 --- a/code/modules/power/fractal_reactor.dm +++ b/code/modules/power/fractal_reactor.dm @@ -18,7 +18,7 @@ /obj/machinery/power/fractal_reactor/New() ..() if(!mapped_in) - to_chat(world, "\red WARNING: \black Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]") + to_chat(world, span_redtext(span_bold("WARNING: [span_alert("Map testing power source activated at: X:[src.loc.x] Y:[src.loc.y] Z:[src.loc.z]")]"))) /obj/machinery/power/fractal_reactor/Process() if(!powernet && !powernet_connection_failed) @@ -26,4 +26,4 @@ powernet_connection_failed = 1 spawn(150) // Error! Check again in 15 seconds. powernet_connection_failed = 0 - add_avail(power_generation_rate) \ No newline at end of file + add_avail(power_generation_rate) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index d96422a39d7..6b9b82cd4f8 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -282,8 +282,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_gravity(gravity_is_on) priority_announcement.Announce("The gravity generator was brought fully operational.") investigate_log("was brought full online and is now producing gravity.", "gravity") - var/area/area = get_area(src) - message_admins("The gravity generator was brought fully online. ([area.name])") + message_admins("The gravity generator was brought fully online. [ADMIN_JMP(src)]") /obj/machinery/gravity_generator/main/proc/grav_off() if(!GLOB.maps_data.station_levels.len) @@ -294,8 +293,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 update_gravity(gravity_is_on) priority_announcement.Announce("The gravity generator was brought offline.") investigate_log("was brought offline and there is now no gravity.", "gravity") - var/area/area = get_area(src) - message_admins("The gravity generator was brought offline with no backup generator. ([area.name])") + message_admins("The gravity generator was brought offline with no backup generator. [ADMIN_JMP(src)]") shake_everyone() /obj/machinery/gravity_generator/main/proc/update_gravity(var/is_on) @@ -340,7 +338,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/main/proc/shake_everyone() for(var/mob/M in SSmobs.mob_list | SShumans.mob_list) var/turf/our_turf = get_turf(src.loc) - if(M.client) + if(M.client && !isnewplayer(M)) shake_camera(M, 15, 1) M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3a00b8f2e79..ae89507f56e 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -435,7 +435,7 @@ if(prob(1+I.force * 5)) to_chat(user, "You hit the light, and it smashes!") - for(var/mob/M in viewers(src)) + for(var/mob/M in viewers(get_turf(src))) if(M == user) continue M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) @@ -526,8 +526,8 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) - for(var/mob/M in viewers(src)) - M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_danger("[user.name] smashed the light!"), 3, span_warning("You hear a tinkle of breaking glass"), 2) broken() return @@ -766,7 +766,7 @@ /obj/item/light/proc/shatter() if(status == LIGHT_OK || status == LIGHT_BURNED) - src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.") + src.visible_message(span_red("[name] shatters."), span_red("You hear a small glass object shatter.")) status = LIGHT_BROKEN force = WEAPON_FORCE_WEAK sharp = TRUE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 3c019bc6960..1cfef0c2ec8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -281,9 +281,9 @@ var/obj/item/stack/addstack = I var/amount = min((max_fuel_volume - sheets), addstack.amount) if(amount < 1) - to_chat(user, "\blue The [src.name] is full!") + to_chat(user, span_blue("The [src.name] is full!")) return - to_chat(user, "\blue You add [amount] sheet\s to the [src.name].") + to_chat(user, span_blue("You add [amount] sheet\s to the [src.name].")) sheets += amount addstack.use(amount) updateUsrDialog() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ebb14a76a77..c11266e1092 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -52,7 +52,7 @@ wifi_receiver = new(_wifi_id, src) /obj/machinery/power/emitter/Destroy() - message_admins("Emitter deleted at ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter deleted at ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter deleted at ([x],[y],[z])") investigate_log("deleted at ([x],[y],[z])","singulo") qdel(wifi_receiver) @@ -78,7 +78,7 @@ if(src.active==1) src.active = 0 to_chat(user, "You turn off [src].") - message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned off by [user.key]","singulo") else @@ -86,7 +86,7 @@ to_chat(user, "You turn on [src].") src.shot_number = 0 src.fire_delay = 100 - message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("Emitter turned on by [key_name(user, user.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("Emitter turned on by [user.ckey]([user]) in ([x],[y],[z])") investigate_log("turned on by [user.key]","singulo") playsound(loc, 'sound/machines/machine_switch.ogg', 100, 1) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index caa428ad34d..165e0faa7bc 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -205,8 +205,8 @@ field_generator power level display if(draw_power(round(power_draw)) >= power_draw) return 1 else - for(var/mob/M in viewers(src)) - M.show_message("\red \The [src] shuts down!") + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_red("\The [src] shuts down!")) turn_off() investigate_log("ran out of power and deactivated","singulo") src.power = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index 4eac81f4e87..df7aa46fd7e 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -62,7 +62,7 @@ var/radiation = (energy*2) M.apply_effect((radiation*3),IRRADIATE,0) M.updatehealth() - //M << "\red You feel odd." + //M << span_red("You feel odd.") return diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 00a2f429f87..cc571d3f0a2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -121,7 +121,7 @@ if(strength > strength_upper_limit) strength = strength_upper_limit else - message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer increased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer increased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("increased to [strength] by [usr.key]","singulo") strength_change() @@ -132,7 +132,7 @@ if(strength < 0) strength = 0 else - message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer decreased to [strength] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer decreased to [strength] by [usr.ckey]([usr]) in ([x],[y],[z])") investigate_log("decreased to [strength] by [usr.key]","singulo") strength_change() @@ -213,7 +213,7 @@ /obj/machinery/particle_accelerator/control_box/proc/toggle_power() src.active = !src.active investigate_log("turned [active?"ON":"OFF"] by [usr ? usr.key : "outside forces"]","singulo") - message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - JMP)",0,1) + message_admins("PA Control Computer turned [active ?"ON":"OFF"] by [key_name(usr, usr.client)](?) in ([x],[y],[z] - [ADMIN_JMP(src)])",0,1) log_game("PA Control Computer turned [active ?"ON":"OFF"] by [usr.ckey]([usr]) in ([x],[y],[z])") if(src.active) set_power_use(ACTIVE_POWER_USE) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 40e1685eff5..8e011c40098 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -83,7 +83,7 @@ var/count = locate(/obj/machinery/containment_field) in orange(30, src) if (!count) - message_admins("A singulo has been created without containment fields active ([x], [y], [z] - JMP).") + message_admins("A singulo has been created without containment fields active ([x], [y], [z] - [ADMIN_JMP(src)]).") investigate_log("was created. [count ? "" : "No containment fields were active."]", I_SINGULO) @@ -416,10 +416,10 @@ if (ishuman(M)) var/mob/living/carbon/human/H = M if(istype(H.glasses,/obj/item/clothing/glasses/powered/meson) && current_size != 11) - to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") + to_chat(H, "You look directly into The [src.name], good thing you had your protective eyewear on!") return else - to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") + to_chat(H, "You look directly into The [src.name], but your eyewear does absolutely nothing to protect you from it!") to_chat(M, span_danger("You look directly into The [src.name] and feel [current_size == 11 ? "helpless" : "weak"].")) M.apply_effect(3, STUN) for(var/mob/O in viewers(M, null)) @@ -435,11 +435,11 @@ for(var/mob/living/M in view(10, src.loc)) if(prob(67)) M.apply_effect(rand(energy), IRRADIATE) - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "Miraculously, it fails to kill you.") + to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + to_chat(M, "Miraculously, it fails to kill you.") else - to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") - to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.") + to_chat(M, "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + to_chat(M, "You don't even have a moment to react as you are reduced to ashes by the intense radiation.") M.dust() return diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 57dfacf9b32..ed51f125960 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -416,8 +416,8 @@ /obj/machinery/power/smes/proc/ion_act() if(isStationLevel(src.z)) if(prob(1)) //explosion - for(var/mob/M in viewers(src)) - M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2) + for(var/mob/M in viewers(get_turf(src))) + M.show_message(span_warning("The [src.name] is making strange noises!"), 3, span_warning("You hear sizzling electronics."), 2) sleep(10*pick(4,5,6,7,10,14)) var/datum/effect/effect/system/smoke_spread/smoke = new /datum/effect/effect/system/smoke_spread() smoke.set_up(3, 0, loc) diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index 14f0ff2a544..72c1c027db9 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -164,7 +164,7 @@ if(G.siemens_coefficient == 0) user_protected = 1 log_game("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100") - message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - JMP") + message_admins("SMES FAILURE: [src.x]X [src.y]Y [src.z]Z User: [usr.ckey], Intensity: [intensity]/100 - [ADMIN_JMP(src)]") switch (intensity) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index f06bb149ef0..82e36b0e4dd 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -306,9 +306,9 @@ nano_ui_interact(user) /obj/machinery/power/supermatter/attack_hand(mob/user as mob) - user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ - "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ - "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ + "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\ + "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") Consume(user) @@ -365,9 +365,9 @@ //If you fail the above, your tape will be eaten by the code below user.visible_message( - "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ - "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ - "Everything suddenly goes silent." + "\The [user] touches \a [W] to \the [src] as a silence fills the room...",\ + "You touch \the [W] to \the [src] when everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\ + "Everything suddenly goes silent." ) user.drop_from_inventory(W) @@ -380,12 +380,12 @@ if(istype(AM, /obj/effect)) return if(isliving(AM)) - AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ - "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ - "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") + AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\ + "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\ + "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.") else if(!grav_pulling) //To prevent spam, detonating supermatter does not indicate non-mobs being destroyed - AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ - "You hear a loud crack as you are washed with a wave of heat.") + AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\ + "You hear a loud crack as you are washed with a wave of heat.") Consume(AM) @@ -402,10 +402,10 @@ //Some poor sod got eaten, go ahead and irradiate people nearby. for(var/mob/living/l in range(10)) if(l in view()) - l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ - "The unearthly ringing subsides and you notice you have new radiation burns.", 2) + l.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\ + "The unearthly ringing subsides and you notice you have new radiation burns.", 2) else - l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) + l.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2) var/rads = 500 * sqrt( 1 / (get_dist(l, src) + 1) ) l.apply_effect(rads, IRRADIATE) @@ -428,7 +428,7 @@ /obj/machinery/power/supermatter/shard //Small subtype, less efficient and more sensitive, but less boom. name = "Supermatter Shard" - desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. \red You get headaches just from looking at it." + desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure." icon_state = "darkmatter_shard" base_icon_state = "darkmatter_shard" diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 40b366ad834..58974daf0a3 100755 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -67,7 +67,7 @@ /obj/item/ammo_casing/attack_hand(mob/user) - if((src.amount > 1) && (src == user.get_inactive_hand())) + if((src.amount > 1) && (src == user.get_inactive_held_item())) src.amount -= 1 var/obj/item/ammo_casing/new_casing = new src.type(src) new_casing.forceMove(get_turf(user)) @@ -271,7 +271,7 @@ visible_message("[user] tactically reloads [W] using only one hand!") /obj/item/ammo_magazine/attack_hand(mob/user) - if(user.get_inactive_hand() == src && stored_ammo.len) + if(user.get_inactive_held_item() == src && stored_ammo.len) var/obj/item/ammo_casing/stack = removeCasing() if(stack) if(stored_ammo.len) @@ -289,7 +289,7 @@ ..() /obj/item/ammo_magazine/AltClick(var/mob/living/user) - var/obj/item/W = user.get_active_hand() + var/obj/item/W = user.get_active_held_item() if(istype(W, /obj/item/ammo_casing)) var/obj/item/ammo_casing/C = W if(stored_ammo.len >= max_ammo) @@ -304,7 +304,7 @@ if(!C.mergeCasing(T, null, user)) insertCasing(T) else if(!W) - if(user.get_inactive_hand() == src && stored_ammo.len) + if(user.get_inactive_held_item() == src && stored_ammo.len) var/obj/item/ammo_casing/AC = removeCasing() if(AC) user.put_in_active_hand(AC) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4a1deef66ae..cff5d312510 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -817,7 +817,7 @@ to_chat(user, span_notice("\The [src] is now set to [new_mode.name].")) /obj/item/gun/proc/toggle_safety(mob/living/user) - if(restrict_safety || src != user.get_active_hand()) + if(restrict_safety || src != user.get_active_held_item()) return safety = !safety diff --git a/code/modules/projectiles/guns/breacher.dm b/code/modules/projectiles/guns/breacher.dm index 31f86cd33b4..5e4bfb518c4 100644 --- a/code/modules/projectiles/guns/breacher.dm +++ b/code/modules/projectiles/guns/breacher.dm @@ -100,7 +100,7 @@ return /*if(ishuman(user)) if(user.dna && user.dna.mutantrace == "adamantine") - to_chat(user, "\red Your metal fingers don't fit in the trigger guard!") + to_chat(user, span_red("Your metal fingers don't fit in the trigger guard!")) return*/ add_fingerprint(user) diff --git a/code/modules/projectiles/guns/energy/charge.dm b/code/modules/projectiles/guns/energy/charge.dm index cfd2408180c..15dc42b58d9 100644 --- a/code/modules/projectiles/guns/energy/charge.dm +++ b/code/modules/projectiles/guns/energy/charge.dm @@ -38,7 +38,7 @@ skip_hand_check = TRUE //We enable it if the gun is held in the user's active hand and the safety is off - if (skip_hand_check || L.get_active_hand() == gun) + if (skip_hand_check || L.get_active_held_item() == gun) //Lets also make sure it can fire var/can_fire = TRUE diff --git a/code/modules/projectiles/guns/launcher/pneumatic.dm b/code/modules/projectiles/guns/launcher/pneumatic.dm index eb1e065d227..5ff99580003 100644 --- a/code/modules/projectiles/guns/launcher/pneumatic.dm +++ b/code/modules/projectiles/guns/launcher/pneumatic.dm @@ -61,7 +61,7 @@ to_chat(user, "There is nothing to remove in \the [src].") /obj/item/gun/launcher/pneumatic/attack_hand(mob/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_hopper(user) else return ..() diff --git a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm index fd15edfffc6..8a17d0585b0 100644 --- a/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm +++ b/code/modules/projectiles/guns/launcher/projectile_grenade_launcher.dm @@ -114,7 +114,7 @@ ..() /obj/item/gun/projectile/shotgun/pump/grenade/makeshift/attack_hand(mob/user) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_underslung(user) else ..() diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 2da25794b2d..aab1ccf3af4 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -111,7 +111,7 @@ add_fingerprint(user) /obj/item/gun/launcher/syringe/attack_hand(mob/living/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) if(!darts.len) to_chat(user, span_warning("[src] is empty.")) return diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 019d7dde83b..7d714f28ed4 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -301,7 +301,7 @@ unload_ammo(user) /obj/item/gun/projectile/attack_hand(mob/user as mob) - if(user.get_inactive_hand() == src) + if(user.get_inactive_held_item() == src) unload_ammo(user, allow_dump=0) else return ..() diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 73f4c0bf87e..45013f20227 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -53,7 +53,7 @@ //We enable it if the gun is held in the user's active hand and the safety is off or if they are doing this from inside a mech - if (L.get_active_hand() == gun || ismech(L.loc)) + if (L.get_active_held_item() == gun || ismech(L.loc)) //Lets also make sure it can fire var/can_fire = TRUE diff --git a/code/modules/projectiles/guns/projectile/automatic/lmg.dm b/code/modules/projectiles/guns/projectile/automatic/lmg.dm index 4165c8c756b..b738cf72acd 100644 --- a/code/modules/projectiles/guns/projectile/automatic/lmg.dm +++ b/code/modules/projectiles/guns/projectile/automatic/lmg.dm @@ -58,7 +58,7 @@ return ..() //once closed, behave like normal /obj/item/gun/projectile/automatic/lmg/attack_hand(mob/user as mob) - if(!cover_open && user.get_inactive_hand() == src) + if(!cover_open && user.get_inactive_held_item() == src) toggle_cover(user) //open the cover playsound(src.loc, 'sound/weapons/guns/interact/lmg_open.ogg', 100, 1) else diff --git a/code/modules/projectiles/guns/projectile/automatic/z8.dm b/code/modules/projectiles/guns/projectile/automatic/z8.dm index 1e70f49ca8a..4b433dd2b9d 100644 --- a/code/modules/projectiles/guns/projectile/automatic/z8.dm +++ b/code/modules/projectiles/guns/projectile/automatic/z8.dm @@ -50,7 +50,7 @@ /obj/item/gun/projectile/automatic/z8/attack_hand(mob/user) var/datum/firemode/cur_mode = firemodes[sel_mode] - if(user.get_inactive_hand() == src && cur_mode.settings["use_launcher"]) + if(user.get_inactive_held_item() == src && cur_mode.settings["use_launcher"]) launcher.unload_underslung(user) else ..() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 558d1685893..f76231bda07 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -247,7 +247,7 @@ loc = get_turf(H.client.eye) if(!(loc.Adjacent(target))) loc = get_turf(H) - if(config.z_level_shooting && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel + if(CONFIG_GET(flag/z_level_shooting) && H.client.eye == H.shadow && !height) // Player is watching a higher zlevel var/newTurf = get_turf(H.shadow) if(!(locate(/obj/structure/catwalk) in newTurf)) // Can't shoot through catwalks loc = newTurf @@ -309,7 +309,7 @@ var/result = PROJECTILE_CONTINUE - if(config.z_level_shooting && height == HEIGHT_HIGH) + if(CONFIG_GET(flag/z_level_shooting) && height == HEIGHT_HIGH) if(target_mob.resting == TRUE || target_mob.stat == TRUE) return FALSE // Bullet flies overhead @@ -372,7 +372,7 @@ admin_attack_log(firer, target_mob, attacker_message, victim_message, admin_message) else target_mob.attack_log += "\[[time_stamp()]\] UNKNOWN SUBJECT (No longer exists) shot [target_mob]/[target_mob.ckey] with \a [src]" - msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] (JMP)") + msg_admin_attack("UNKNOWN shot [target_mob] ([target_mob.ckey]) with \a [src] [ADMIN_JMP(target_mob)]") if(target_mob.mob_classification & CLASSIFICATION_ORGANIC) var/turf/target_loca = get_turf(target_mob) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index eabbeab9953..01b0f5a547c 100755 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -164,13 +164,13 @@ if(prob(15)) H.apply_effect((rand(30,80)),IRRADIATE) H.Weaken(5) - for (var/mob/V in viewers(src)) - V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2) + for (var/mob/V in viewers(get_turf(src))) + V.show_message(span_danger("[M] writhes in pain as \his vacuoles boil."), 3, span_warning("You hear the crunching of leaves."), 2) else M.adjustFireLoss(rand(5,15)) - M.show_message("\red The radiation beam singes you!") + M.show_message(span_red("The radiation beam singes you!")) else if(istype(target, /mob/living/carbon/)) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message(span_blue("The radiation beam dissipates harmlessly through your body.")) else return 1 @@ -188,7 +188,7 @@ if((H.species.flags & IS_PLANT) && (H.nutrition < 500)) H.adjustNutrition(30) else if (istype(target, /mob/living/carbon/)) - M.show_message("\blue The radiation beam dissipates harmlessly through your body.") + M.show_message(span_blue("The radiation beam dissipates harmlessly through your body.")) else return 1 diff --git a/code/modules/reagents/bonsai.dm b/code/modules/reagents/bonsai.dm index 2bf40c1839e..a161968dd54 100644 --- a/code/modules/reagents/bonsai.dm +++ b/code/modules/reagents/bonsai.dm @@ -48,7 +48,7 @@ if(reagent_count > 10) var/amount_to_spawn = round(reagent_count/10) for(var/i = 0 to amount_to_spawn) - var/datum/seed/S = plant_controller.seeds[pick( + var/datum/seed/S = SSplants.seeds[pick( "tomato", "carrot", "corn", diff --git a/code/modules/reagents/holder.dm b/code/modules/reagents/holder.dm index e1ca2881521..5238822e58d 100644 --- a/code/modules/reagents/holder.dm +++ b/code/modules/reagents/holder.dm @@ -131,6 +131,7 @@ var/list/eligible_reactions = list() var/temperature = chem_temp + var/htmlicon = icon2html(my_atom, viewers(get_turf(src))) for(var/thing in reagent_list) var/datum/reagent/R = thing if(R.custom_temperature_effects(temperature)) @@ -162,7 +163,7 @@ if(my_atom) if(replace_message) - my_atom.visible_message(span_notice("\icon[my_atom] [replace_message]")) + my_atom.visible_message(span_notice("[htmlicon] [replace_message]")) if(replace_sound) playsound(my_atom, replace_sound, 80, 1) @@ -393,7 +394,7 @@ /datum/reagents/proc/trans_to(datum/target, amount = 1, multiplier = 1, copy = 0, ignore_isinjectable = FALSE) if(istype(target, /datum/reagents)) return trans_to_holder(target, amount, multiplier, copy) - else if(istype(target, /atom)) + else if(isatom(target)) var/atom/A = target touch(A) if(ismob(target)) diff --git a/code/modules/reagents/machinery/centrifuge.dm b/code/modules/reagents/machinery/centrifuge.dm index 7e92150ea02..53ab1768596 100644 --- a/code/modules/reagents/machinery/centrifuge.dm +++ b/code/modules/reagents/machinery/centrifuge.dm @@ -166,7 +166,7 @@ /obj/machinery/centrifuge/proc/finish() stop() playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] pings indicating that cycle is complete.") + visible_message("[icon2html(src, hearers(get_turf(src)))]\The [src] pings indicating that cycle is complete.") /obj/machinery/centrifuge/Topic(href, href_list) if(..()) diff --git a/code/modules/reagents/machinery/electrolyzer.dm b/code/modules/reagents/machinery/electrolyzer.dm index 53dbb732c82..15425a0b309 100644 --- a/code/modules/reagents/machinery/electrolyzer.dm +++ b/code/modules/reagents/machinery/electrolyzer.dm @@ -81,15 +81,16 @@ return if(on && beaker && beaker.reagents.total_volume) var/state = electrolysis(beaker, separation_beaker, convertion_coefficient) + update_icon() + var/htmlicon = icon2html(src, hearers(get_turf(src))) if(!state) on = FALSE playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] buzzes indicating that error has occured.") + visible_message("[htmlicon] \The [src] buzzes indicating that error has occured.") else if(state == -1) on = FALSE playsound(src.loc, 'sound/machines/ping.ogg', 50, 1, -3) - visible_message("\icon[src]\The [src] pings indicating that process is complete.") - update_icon() + visible_message("[htmlicon] \The [src] pings indicating that process is complete.") SSnano.update_uis(src) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 02eed7c36bd..9faa9376159 100644 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -401,7 +401,7 @@ var/obj/item/reagent_containers/container = I if(!container.standard_pour_into(user, src)) . = ..() else if (LAZYLEN(I.reagents)) . = ..() - else to_chat(user, span_notice("\icon[I] \the [I] seems that it is not suitable for a \icon[src] [src].")) + else to_chat(user, span_notice("[icon2html(I, user)] \the [I] seems that it is not suitable for a [icon2html(src, user)] [src].")) update_icon() /obj/item/storage/makeshift_grinder/afterattack(atom/target, mob/user, flag) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b9a47d442cc..3a1b0414730 100755 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -96,7 +96,7 @@ var/contained = reagents.log_list() target.attack_log += text("\[[time_stamp()]\] Has been splashed with [name] by [user.name] ([user.ckey]). Reagents: [contained]") user.attack_log += text("\[[time_stamp()]\] Used the [name] to splash [target.name] ([target.key]). Reagents: [contained]") - msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) splashed [target.name] ([target.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") user.visible_message( span_danger("[target] has been splashed with something by [user]!"), @@ -162,7 +162,7 @@ var/contained = reagents.log_list() target.attack_log += text("\[[time_stamp()]\] Has been fed [name] by [user.name] ([user.ckey]). Reagents: [contained]") user.attack_log += text("\[[time_stamp()]\] Fed [name] by [target.name] ([target.ckey]). Reagents: [contained]") - msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[key_name(user)] fed [key_name(target)] with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") reagents.trans_to_mob(target, issmall(user) ? CEILING(amount_per_transfer_from_this * 0.5, 1) : amount_per_transfer_from_this, CHEM_INGEST) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 7374f65acad..35133e22431 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -66,7 +66,7 @@ var/contained = reagents.log_list() M.attack_log += "\[[time_stamp()]\] Has been squirted with [name] by [user.name] ([user.ckey]). Reagents: [contained]" user.attack_log += "\[[time_stamp()]\] Used the [name] to squirt [M.name] ([M.key]). Reagents: [contained]" - msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD) user.visible_message( @@ -98,7 +98,7 @@ /obj/item/reagent_containers/dropper/update_icon() cut_overlays() - if(reagents.total_volume) + if(reagents?.total_volume) var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "dropper") filling.color = reagents.get_color() add_overlay(filling) diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 8879522cd8b..0acf709f428 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -23,7 +23,7 @@ sandwich_limit += 4 if(src.contents.len > sandwich_limit) - to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.") + to_chat(user, span_red("If you put anything else on \the [src] it's going to collapse.")) return else if(istype(W,/obj/item/material/shard)) to_chat(user, span_notice("You hide [W] in \the [src].")) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index d8c7c539dea..0d6c1d31ac6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3348,7 +3348,7 @@ return if(boxes.len > 0 ) - if(user.get_inactive_hand() != src ) + if(user.get_inactive_held_item() != src ) ..() return diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 5a7546dcdac..6ef2d41b5ce 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -37,7 +37,7 @@ // I think rig is advanced enough for this, and people will learn what causes this error if(RIG) playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1, -3) - RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") + RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") return // check without message else if(!H.can_inject(user, FALSE)) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 966bbedacc0..b6443ec363d 100755 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -44,7 +44,7 @@ to_chat(user, span_notice("You dissolve \the [src] in [target].")) user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagents.log_list()]") - msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) (JMP)") + msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagents.log_list()] (INTENT: [uppertext(user.a_intent)]) [ADMIN_JMP(user)]") reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 7430d05d1ee..6daf6acb79e 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -160,7 +160,7 @@ // I think rig is advanced enough for this, and people will learn what causes this error if(RIG) playsound(src.loc, 'sound/machines/buzz-two.ogg', 30, 1, -3) - RIG.visible_message("\icon[RIG]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") + RIG.visible_message("[icon2html(RIG, hearers(RIG))]\The [RIG] states \"Attention: User of this suit appears to be synthetic origin\".") return // check without message else if(!H.can_inject(user, FALSE)) @@ -264,13 +264,13 @@ if (target != user && H.getarmor(target_zone, ARMOR_MELEE) > 5 && prob(50)) for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) + O.show_message(span_red("[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!"), 1) user.remove_from_mob(src) qdel(src) user.attack_log += "\[[time_stamp()]\] Attacked [target.name] ([target.ckey]) with \the [src] (INTENT: HARM)." target.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: HARM)." - msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) (JMP)") + msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(target)] with [src.name] (INTENT: HARM) [ADMIN_JMP(user)]") return diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index c1ef302c050..75bceb40525 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -159,7 +159,7 @@ "You screw [src]'s faucet [modded ? "closed" : "open"]") modded = !modded if (modded) - message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. (JMP)") + message_admins("[key_name_admin(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel. [ADMIN_JMP(loc)]") log_game("[key_name(user)] opened fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]), leaking fuel.") leak_fuel(amount_per_transfer_from_this) if (istype(I,/obj/item/device/assembly_holder)) @@ -172,7 +172,7 @@ var/obj/item/device/assembly_holder/H = I if (istype(H.left_assembly,/obj/item/device/assembly/igniter) || istype(H.right_assembly,/obj/item/device/assembly/igniter)) - message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. (JMP)") + message_admins("[key_name_admin(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion. [ADMIN_JMP(loc)]") log_game("[key_name(user)] rigged fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) for explosion.") rig = I @@ -194,7 +194,7 @@ /obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) if(istype(Proj.firer)) - message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (JMP).") + message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) [ADMIN_JMP(loc)].") log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).") if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) ) diff --git a/code/modules/reagents/reagents.dm b/code/modules/reagents/reagents.dm index f22cb92fbb7..60fd45dd6ac 100644 --- a/code/modules/reagents/reagents.dm +++ b/code/modules/reagents/reagents.dm @@ -1,13 +1,15 @@ //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id /proc/initialize_chemical_reagents() - var/paths = typesof(/datum/reagent) - /datum/reagent - GLOB.chemical_reagents_list = list() + var/list/reagent_list = list() + + var/paths = subtypesof(/datum/reagent) + for(var/path in paths) var/datum/reagent/D = new path() - if(!D.name) - continue - GLOB.chemical_reagents_list[D.id] = D + reagent_list[D.id] = D + + . = reagent_list /datum/reagent var/name = "" diff --git a/code/modules/reagents/reagents/stims.dm b/code/modules/reagents/reagents/stims.dm index 4df667885f5..e04254f4971 100644 --- a/code/modules/reagents/reagents/stims.dm +++ b/code/modules/reagents/reagents/stims.dm @@ -89,7 +89,7 @@ /datum/reagent/stim/pro_surgeon/overdose(mob/living/carbon/M, alien) var/inverse_tough_mult = 1 - M.stats.getMult(STAT_TGH) if(prob(5 - (5 * inverse_tough_mult))) - M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others + M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others M.drop_item() if(prob(80 - (20 * inverse_tough_mult))) M.add_chemical_effect(CE_TOXIN, 5) @@ -286,7 +286,7 @@ if(prob(80 - (20 * inverse_tough_mult))) M.add_chemical_effect(CE_TOXIN, 10) if(prob(10 - (5 * inverse_tough_mult))) - M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_hand()].") // there is only two genders, male and others + M.custom_emote(1,"twitches and drops [M.gender == MALE ? "his" : "her"] [M.get_active_held_item()].") // there is only two genders, male and others M.drop_item() if(ishuman(M) && prob(80 - (60 * inverse_tough_mult))) var/mob/living/carbon/human/H = M diff --git a/code/modules/reagents/recipes.dm b/code/modules/reagents/recipes.dm index 9f8483294c3..38e2f44c3d5 100644 --- a/code/modules/reagents/recipes.dm +++ b/code/modules/reagents/recipes.dm @@ -1,38 +1,4 @@ -//Chemical Reactions - Initialises all /datum/chemical_reaction into a list -// It is filtered into multiple lists within a list. -// For example: -// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma -// Note that entries in the list are NOT duplicated. So if a reaction pertains to -// more than one chemical it will still only appear in only one of the sublists. -/proc/initialize_chemical_reactions() - var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction - GLOB.chemical_reactions_list = list() - - for(var/path in paths) - var/datum/chemical_reaction/D = new path() - for(var/id in D.required_reagents) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[required_reagents\] reagent with id \"[id]\" does not exist.") - for(var/id in D.catalysts) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[catalysts\] reagent with id [id] does not exist.") - for(var/id in D.inhibitors) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[inhibitors\] reagent with id [id] does not exist.") - for(var/id in D.byproducts) - if(!is_reagent_with_id_exist(id)) - error("recipe [D.type] created incorectly,\[byproducts\] reagent with id [id] does not exist.") - if(D.required_reagents && D.required_reagents.len) - if(D.result) - if(!GLOB.chemical_reactions_list_by_result[D.result]) - GLOB.chemical_reactions_list_by_result[D.result] = list() - GLOB.chemical_reactions_list_by_result[D.result] += D - var/reagent_id = D.required_reagents[1] - if(!GLOB.chemical_reactions_list[reagent_id]) - GLOB.chemical_reactions_list[reagent_id] = list() - GLOB.chemical_reactions_list[reagent_id] += D - //helper that ensures the reaction rate holds after iterating //Ex. REACTION_RATE(0.3) means that 30% of the reagents will react each chemistry tick (~2 seconds by default). #define REACTION_RATE(rate) (1 - (1-rate)**(1/PROCESS_REACTION_ITER)) @@ -208,8 +174,9 @@ if(mix_message && container && !ismob(container)) var/turf/T = get_turf(container) var/list/seen = viewers(4, T) + var/htmlicon = icon2html(container, seen) for(var/mob/M in seen) - M.show_message(span_notice("\icon[container] [mix_message]"), 1) + M.show_message(span_notice("[htmlicon] [mix_message]"), 1) playsound(T, reaction_sound, 80, 1) //obtains any special data that will be provided to the reaction products @@ -799,7 +766,7 @@ var/obj/item/slime_extract/T = holder.my_atom T.Uses-- if(T.Uses <= 0) - T.visible_message("\icon[T][span_notice("\The [T]'s power is consumed in the reaction.")]") + T.visible_message("[icon2html(T, viewers(T))][span_notice("\The [T]'s power is consumed in the reaction.")]") T.name = "used slime extract" T.desc = "This extract has been used up." diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index f850bcfe37a..444ccee36ca 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -63,7 +63,7 @@ visible_message(span_notice("[target] has been placed in the [src] by [user].")) user.attack_log += text("\[[time_stamp()]\] Has placed [target] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") - msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)") + msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(usr)]") return TRUE /obj/machinery/disposal/MouseDrop_T(var/obj/item/I, mob/user, src_location, over_location, src_control, over_control, params) @@ -131,7 +131,7 @@ if(istype(I, /obj/item/storage/bag)) var/obj/item/storage/bag/T = I - to_chat(user, "\blue You empty the bag.") + to_chat(user, span_blue("You empty the bag.")) for(var/obj/item/O in T.contents) T.remove_from_storage(O,src) T.update_icon() @@ -190,7 +190,7 @@ user.attack_log += text("\[[time_stamp()]\] Has placed [target.name] ([target.ckey]) in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [user.name] ([user.ckey])") - msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. (JMP)") + msg_admin_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit. [ADMIN_JMP(user)]") else return if (target.client) @@ -200,7 +200,7 @@ target.simple_move_animation(src) target.forceMove(src) - for (var/mob/C in viewers(src)) + for (var/mob/C in viewers(get_turf(src))) if(C == user) continue C.show_message(msg, 3) @@ -615,27 +615,16 @@ // called when player tries to move while in a pipe /obj/structure/disposalholder/relaymove(mob/user as mob) - - if(!isliving(user)) - return - - var/mob/living/U = user - - if (U.stat || U.last_special <= world.time) + if(!isliving(user) || user.incapacitated()) return - U.last_special = world.time+100 - - if (src.loc) - for (var/mob/M in hearers(src.loc.loc)) - to_chat(M, "CLONG, clong!") - - playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) + for(var/mob/M in range(5, get_turf(src))) + M.show_message("CLONG, clong!", MSG_AUDIBLE) + playsound(src.loc, 'sound/effects/clang.ogg', 50, FALSE, FALSE) // called to vent all gas in holder to a location /obj/structure/disposalholder/proc/vent_gas(var/atom/location) location.assume_air(gas) // vent all gas to turf - return /obj/structure/disposalholder/Destroy() qdel(gas) @@ -1201,7 +1190,7 @@ if(O.currTag)// Tag set sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) - to_chat(user, "\blue Changed filter to '[sortType]'.") + to_chat(user, span_blue("Changed filter to '[sortType]'.")) updatename() updatedesc() diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index a55689594b8..588a78061fa 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -62,7 +62,7 @@ if("Description") var/str = sanitize(input(usr,"Label text?","Set label","")) if(!str || !length(str)) - to_chat(usr, "\red Invalid text.") + to_chat(usr, span_red("Invalid text.")) return if(!examtext && !nameset) examtext = str @@ -173,7 +173,7 @@ if("Description") var/str = sanitize(input(usr,"Label text?","Set label","")) if(!str || !length(str)) - to_chat(usr, "\red Invalid text.") + to_chat(usr, span_red("Invalid text.")) return if(!examtext && !nameset) examtext = str @@ -305,7 +305,7 @@ else if(src.amount < 3) to_chat(user, span_warning("You need more paper.")) else - to_chat(user, "\blue The object you are trying to wrap is unsuitable for the sorting machinery!") + to_chat(user, span_blue("The object you are trying to wrap is unsuitable for the sorting machinery!")) if (src.amount <= 0) new /obj/item/c_tube( src.loc ) qdel(src) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 0b00565b409..a094c87492f 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -124,7 +124,7 @@ Note: Must be placed within 3 tiles of the R&D Console return if(linked_console) linked_console.handle_item_analysis(loaded_item) - for(var/mob/living/carbon/human/H in viewers(src)) + for(var/mob/living/carbon/human/H in viewers(get_turf(src))) SEND_SIGNAL_OLD(H, COMSING_DESTRUCTIVE_ANALIZER, loaded_item) if(istype(loaded_item,/obj/item/stack)) var/obj/item/stack/S = loaded_item diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index dfd28b8ba2f..cc326f9bb5d 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -96,10 +96,14 @@ var/global/list/obj/machinery/message_server/message_servers = list() authmsg += "[id_auth]
" if (stamp) authmsg += "[stamp]
" + + for (var/obj/machinery/requests_console/Console in allConsoles) + var/htmlicon = icon2html(Console, hearers(get_turf(Console))) + if (ckey(Console.department) == ckey(recipient)) if(Console.inoperable()) - Console.message_log += "Message lost due to console failure.
Please contact [station_name] system adminsitrator or AI for technical assistance.
" + Console.message_log += "Message lost due to console failure.
Please contact [station_name()] system adminsitrator or AI for technical assistance.
" continue if(Console.newmessagepriority < priority) Console.newmessagepriority = priority @@ -108,18 +112,18 @@ var/global/list/obj/machinery/message_server/message_servers = list() if(2) if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [sender]'"),,5) + Console.audible_message("[htmlicon] *The Requests Console beeps: 'PRIORITY Alert in [sender]'") Console.message_log += "High Priority message from [sender]
[authmsg]" else if(!Console.silent) playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1) - Console.audible_message(text("\icon[Console] *The Requests Console beeps: 'Message from [sender]'"),,4) + Console.audible_message("[htmlicon] *The Requests Console beeps: 'Message from [sender]'") Console.message_log += "Message from [sender]
[authmsg]" Console.set_light(2) /obj/machinery/message_server/attack_hand(user as mob) -// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays." +// user << span_blue("There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays.") to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]") active = !active update_icon() diff --git a/code/modules/sanity/breakdowns.dm b/code/modules/sanity/breakdowns.dm index 3022c0ee953..31cf033da29 100644 --- a/code/modules/sanity/breakdowns.dm +++ b/code/modules/sanity/breakdowns.dm @@ -175,7 +175,7 @@ )) holder.owner.custom_emote(message=emote) else if(!holder.owner.incapacitated()) - var/obj/item/W = holder.owner.get_active_hand() + var/obj/item/W = holder.owner.get_active_held_item() if(W) W.attack(holder.owner, holder.owner, ran_zone()) else @@ -649,7 +649,7 @@ candidates -= I continue if(!holder.owner.put_in_hands(I) && prob(50)) - holder.owner.unEquip(holder.owner.get_inactive_hand()) + holder.owner.unEquip(holder.owner.get_inactive_held_item()) holder.owner.put_in_hands(I) break diff --git a/code/modules/sanity/sanity_atom.dm b/code/modules/sanity/sanity_atom.dm index 5174a79c970..46b707c4b08 100644 --- a/code/modules/sanity/sanity_atom.dm +++ b/code/modules/sanity/sanity_atom.dm @@ -3,7 +3,7 @@ var/desc /datum/component/atom_sanity/Initialize(value, new_desc) - if(!istype(parent, /atom)) + if(!isatom(parent)) return COMPONENT_INCOMPATIBLE var/atom/A = parent affect = value diff --git a/code/modules/sanity/sanity_effects.dm b/code/modules/sanity/sanity_effects.dm index e9acbacebaf..f8b2e9e450d 100644 --- a/code/modules/sanity/sanity_effects.dm +++ b/code/modules/sanity/sanity_effects.dm @@ -2,7 +2,7 @@ owner.custom_emote(message = level < 20 ? pick_emote_20() : pick_emote_40()) /datum/sanity/proc/effect_quote() - to_chat(owner, span_danger(level < 20 ? "\icon['icons/effects/fabric_symbols_20.dmi'][pick_quote_20()]" : "\icon['icons/effects/fabric_symbols_40.dmi'][pick_quote_40()]")) + to_chat(owner, span_danger(level < 20 ? "[icon2html('icons/effects/fabric_symbols_20.dmi', owner)][pick_quote_20()]" : "[icon2html('icons/effects/fabric_symbols_40.dmi', owner)][pick_quote_40()]")) /datum/sanity/proc/effect_sound() var/sound/S = pick_sound() diff --git a/code/modules/sanity/sanity_mob.dm b/code/modules/sanity/sanity_mob.dm index 2f2f99f0481..15de35c307d 100644 --- a/code/modules/sanity/sanity_mob.dm +++ b/code/modules/sanity/sanity_mob.dm @@ -275,7 +275,7 @@ GLOBAL_VAR_INIT(GLOBAL_INSIGHT_MOD, 1) desires.Cut() if(!rest_timer_active) to_chat(owner, "[owner.stats.getPerk(PERK_ARTIST) ? "You have created art." : "You have rested well."]\ -
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\ +
Select what you wish to do with your fulfilled insight here and now or get to safety first if you are in danger.\
The prompt will appear in one minute.") rest_timer_active = TRUE rest_timer_time = 60 SECONDS diff --git a/code/modules/shield_generators/shield.dm b/code/modules/shield_generators/shield.dm index bc4da7d5ab6..ef98e60f5e6 100644 --- a/code/modules/shield_generators/shield.dm +++ b/code/modules/shield_generators/shield.dm @@ -351,7 +351,7 @@ Like for example singulo act and whatever. if (istype(hit_location)) var/area/A = get_area(hit_location) var/where = "[A? A.name : "Unknown Location"] | [hit_location.x], [hit_location.y]" - var/whereLink = "[where]" + var/whereLink = ADMIN_JMP(hit_location) message_admins("A meteor has impacted shields at ([whereLink])", 0, 1) log_game("A meteor has impacted shields at ([where]).") */ diff --git a/code/modules/shieldgen/emergency_shield.dm b/code/modules/shieldgen/emergency_shield.dm index d4a8bba736d..299fe77548b 100644 --- a/code/modules/shieldgen/emergency_shield.dm +++ b/code/modules/shieldgen/emergency_shield.dm @@ -233,16 +233,16 @@ if(is_open) to_chat(user, "The panel must be closed before operating this machine.") return - + var/iconhtml = icon2html(src, hearers(get_turf(src))) if (src.active) - user.visible_message("\blue \icon[src] [user] deactivated the shield generator.", \ - "\blue \icon[src] You deactivate the shield generator.", \ + user.visible_message(span_blue("[iconhtml] [user] deactivated the shield generator."), \ + span_blue("[iconhtml] You deactivate the shield generator."), \ "You hear heavy droning fade out.") src.shields_down() else if(anchored) - user.visible_message("\blue \icon[src] [user] activated the shield generator.", \ - "\blue \icon[src] You activate the shield generator.", \ + user.visible_message(span_blue("[iconhtml] [user] activated the shield generator."), \ + span_blue("[iconhtml] You activate the shield generator."), \ "You hear heavy droning.") src.shields_up() else diff --git a/code/modules/shieldgen/sheldwallgen.dm b/code/modules/shieldgen/sheldwallgen.dm index ec16555aa92..46bf87c03ab 100644 --- a/code/modules/shieldgen/sheldwallgen.dm +++ b/code/modules/shieldgen/sheldwallgen.dm @@ -33,13 +33,13 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(state != 1) - to_chat(user, "\red \The [src] needs to be firmly secured to the floor first.") + to_chat(user, span_red("\The [src] needs to be firmly secured to the floor first.")) return 1 if(src.locked && !issilicon(user)) - to_chat(user, "\red The controls are locked!") + to_chat(user, span_red("The controls are locked!")) return 1 if(power != 1) - to_chat(user, "\red \The [src] needs to be powered by wire underneath.") + to_chat(user, span_red("\The [src] needs to be powered by wire underneath.")) return 1 if(src.active >= 1) @@ -122,7 +122,7 @@ if(!power) - visible_message("\red The [src.name] shuts down due to lack of power!", \ + visible_message(span_red("The [src.name] shuts down due to lack of power!"), \ "You hear heavy droning fade out") active = FALSE for(var/fdir in GLOB.cardinal) @@ -229,11 +229,11 @@ src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") else - to_chat(user, "\red Access denied.") + to_chat(user, span_red("Access denied.")) else src.add_fingerprint(user) - visible_message("\red The [src.name] has been hit with \the [I.name] by [user.name]!") + visible_message(span_red("The [src.name] has been hit with \the [I.name] by [user.name]!")) /obj/machinery/shieldwallgen/emag_act() diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 6b3ce2a7bdd..db8ebdafb04 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -46,11 +46,11 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << span_red("Access denied.") if(QUALITY_BOLT_TURNING in I.tool_qualities) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) src.anchored = !src.anchored - src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].")) if(anchored) spawn(0) @@ -131,7 +131,7 @@ return if( href_list["toggle"] ) if(!active && !anchored) - usr << "\red The [src] needs to be firmly secured to the floor first." + usr << span_red("The [src] needs to be firmly secured to the floor first.") return active = !active if( href_list["charge_rate"] ) diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index c0f3211c818..abab689fdcd 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -63,12 +63,12 @@ user << "Controls are now [src.locked ? "locked." : "unlocked."]" updateDialog() else - user << "\red Access denied." + user << span_red("Access denied.") if(QUALITY_BOLT_TURNING in I.tool_qualities) if(I.use_tool(user, src, WORKTIME_FAST, QUALITY_BOLT_TURNING, FAILCHANCE_EASY, required_stat = STAT_MEC)) src.anchored = !src.anchored - src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + src.visible_message(span_blue("[icon2html(src, viewers(get_turf(src)))] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].")) if(active) toggle() @@ -189,7 +189,7 @@ return else if( href_list["toggle"] ) if (!active && !anchored) - usr << "\red The [src] needs to be firmly secured to the floor first." + usr << span_red("The [src] needs to be firmly secured to the floor first.") return toggle() else if( href_list["change_radius"] ) @@ -210,6 +210,8 @@ set background = 1 active = !active update_icon() + var/our_viewers = viewers(5,src) + var/htmlicon = icon2html(src, our_viewers) if(active) var/list/covered_turfs = get_shielded_turfs() var/turf/T = get_turf(src) @@ -220,15 +222,15 @@ field.Add(E) covered_turfs = null - for(var/mob/M in view(5,src)) - M << "\icon[src] You hear heavy droning start up." + for(var/mob/M in our_viewers) + to_chat(M, "[htmlicon] You hear heavy droning start up.") else for(var/obj/effect/energy_field/D in field) field.Remove(D) D.loc = null - for(var/mob/M in view(5,src)) - M << "\icon[src] You hear heavy droning fade out." + for(var/mob/M in our_viewers) + to_chat(M, "[htmlicon] You hear heavy droning fade out.") /obj/machinery/shield_gen/update_icon() if(stat & BROKEN) diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm index 4f0235833e3..7bee5738843 100644 --- a/code/modules/shuttles/landmarks.dm +++ b/code/modules/shuttles/landmarks.dm @@ -88,7 +88,7 @@ tag = landmark_tag+"-[x]-[y]" . = ..() base_area = get_area(src) - if(!config.use_overmap) + if(!CONFIG_GET(flag/use_overmap)) return add_to_sector(map_sectors["[z]"]) diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 1c441052c98..694a5ddc4e3 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -28,7 +28,7 @@ /datum/shuttle/autodock/ferry/emergency/shuttle_moved() if(next_location != waypoint_station) emergency_controller.shuttle_leaving() // This is a hell of a line. v - priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s")) + priority_announcement.Announce(replacetext(replacetext((emergency_controller.emergency_evacuation ? GLOB.maps_data.emergency_shuttle_leaving_dock : GLOB.maps_data.shuttle_leaving_dock), "%dock_name%", "[GLOB.dock_name]"), "%ETA%", "[round(emergency_controller.get_eta()/60,1)] minute\s")) else if(next_location == waypoint_offsite && emergency_controller.has_evacuated()) emergency_controller.shuttle_evacuated() ..() @@ -195,9 +195,9 @@ if (shuttle.in_use) shuttle_status = "Busy." else if (!shuttle.location) - shuttle_status = "Standing-by at [station_name]." + shuttle_status = "Standing-by at [station_name()]." else - shuttle_status = "Standing-by at [dock_name]." + shuttle_status = "Standing-by at [GLOB.dock_name]." if(WAIT_LAUNCH, FORCE_LAUNCH) shuttle_status = "Shuttle has recieved command and will depart shortly." if(WAIT_ARRIVE) @@ -253,6 +253,6 @@ //They selected an empty entry. Try to scan their id. var/mob/living/carbon/human/H = user if (istype(H)) - if (!read_authorization(H.get_active_hand())) //try to read what's in their hand first + if (!read_authorization(H.get_active_held_item())) //try to read what's in their hand first read_authorization(H.wear_id) . = TOPIC_REFRESH diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 70fcd371cb2..1a50c4ec1a5 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -35,7 +35,7 @@ var/obj/machinery/computer/C = user if(world.time <= reset_time) - C.visible_message(span_notice("[boss_name] will not allow the Special Operations shuttle to launch yet.")) + C.visible_message(span_notice("[GLOB.boss_name] will not allow the Special Operations shuttle to launch yet.")) if (((world.time - reset_time)/10) > 60) C.visible_message(span_notice("[-((world.time - reset_time)/10)/60] minutes remain!")) else @@ -66,12 +66,12 @@ if (!location) //just arrived home for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, span_danger("You have arrived at [boss_name]. Operation has ended!")) + to_chat(M, span_danger("You have arrived at [GLOB.boss_name]. Operation has ended!")) else //just left for the station launch_mauraders() for(var/turf/T in get_area_turfs(shuttle_area)) var/mob/M = locate(/mob) in T - to_chat(M, span_danger("You have arrived at [station_name]. Commence operation!")) + to_chat(M, span_danger("You have arrived at [station_name()]. Commence operation!")) // var/obj/machinery/light/small/readylight/light = locate() in T // if(light) light.set_state(1) diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm index bb2aacc79e3..ffbd2d0d8b8 100644 --- a/code/modules/shuttles/shuttles_multi.dm +++ b/code/modules/shuttles/shuttles_multi.dm @@ -53,12 +53,12 @@ /datum/shuttle/autodock/multi/antag/proc/announce_departure() if(cloaked || isnull(departure_message)) return - command_announcement.Announce(departure_message, announcer || "[boss_name]") + command_announcement.Announce(departure_message, announcer || "[GLOB.boss_name]") /datum/shuttle/autodock/multi/antag/proc/announce_arrival() if(cloaked || isnull(arrival_message)) return - command_announcement.Announce(arrival_message, announcer || "[boss_name]") + command_announcement.Announce(arrival_message, announcer || "[GLOB.boss_name]") /datum/shuttle/autodock/multi/antag/set_destination(var/destination_key, mob/user) if(!return_warning && destination_key == home_waypoint.name && current_location != home_waypoint) diff --git a/code/modules/surgery/old_cavity.dm b/code/modules/surgery/old_cavity.dm index 1a77943498c..5bd26378681 100644 --- a/code/modules/surgery/old_cavity.dm +++ b/code/modules/surgery/old_cavity.dm @@ -16,8 +16,8 @@ /datum/old_surgery_step/cavity/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\red [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", - "\red Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!" + span_red("[user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!"), + span_red("Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!") ) affected.createwound(CUT, 20) @@ -43,8 +43,8 @@ /datum/old_surgery_step/cavity/make_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\blue [user] makes some space inside [target]'s [affected.cavity_name] with \the [tool].", - "\blue You make some space inside [target]'s [affected.cavity_name] with \the [tool]." + span_blue("[user] makes some space inside [target]'s [affected.cavity_name] with \the [tool]."), + span_blue("You make some space inside [target]'s [affected.cavity_name] with \the [tool].") ) /datum/old_surgery_step/cavity/close_space @@ -70,6 +70,6 @@ /datum/old_surgery_step/cavity/close_space/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) user.visible_message( - "\blue [user] mends [target]'s [affected.cavity_name] walls with \the [tool].", - "\blue You mend [target]'s [affected.cavity_name] walls with \the [tool]." + span_blue("[user] mends [target]'s [affected.cavity_name] walls with \the [tool]."), + span_blue("You mend [target]'s [affected.cavity_name] walls with \the [tool].") ) diff --git a/code/modules/surgery/old_encased.dm b/code/modules/surgery/old_encased.dm index 38b7047148d..d4ea637828c 100644 --- a/code/modules/surgery/old_encased.dm +++ b/code/modules/surgery/old_encased.dm @@ -43,8 +43,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has cut [target]'s [affected.encased] open with \the [tool].", \ - "\blue You have cut [target]'s [affected.encased] open with \the [tool].") + user.visible_message(span_blue("[user] has cut [target]'s [affected.encased] open with \the [tool]."), \ + span_blue("You have cut [target]'s [affected.encased] open with \the [tool].")) affected.open = 2.5 /datum/old_surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -53,8 +53,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\red [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \ - "\red Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" ) + user.visible_message(span_red("[user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!") , \ + span_red("Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!") ) affected.createwound(CUT, 20) affected.fracture() @@ -89,8 +89,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] forces open [target]'s [affected.encased] with \the [tool]." - var/self_msg = "\blue You force open [target]'s [affected.encased] with \the [tool]." + var/msg = span_blue("[user] forces open [target]'s [affected.encased] with \the [tool].") + var/self_msg = span_blue("You force open [target]'s [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) affected.open = 3 @@ -101,8 +101,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, cracking [target]'s [affected.encased]!" - var/self_msg = "\red Your hand slips, cracking [target]'s [affected.encased]!" + var/msg = span_red("[user]'s hand slips, cracking [target]'s [affected.encased]!") + var/self_msg = span_red("Your hand slips, cracking [target]'s [affected.encased]!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -138,8 +138,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] bends [target]'s [affected.encased] back into place with \the [tool]." - var/self_msg = "\blue You bend [target]'s [affected.encased] back into place with \the [tool]." + var/msg = span_blue("[user] bends [target]'s [affected.encased] back into place with \the [tool].") + var/self_msg = span_blue("You bend [target]'s [affected.encased] back into place with \the [tool].") user.visible_message(msg, self_msg) affected.open = 2.5 @@ -150,8 +150,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\red [user]'s hand slips, bending [target]'s [affected.encased] the wrong way!" - var/self_msg = "\red Your hand slips, bending [target]'s [affected.encased] the wrong way!" + var/msg = span_red("[user]'s hand slips, bending [target]'s [affected.encased] the wrong way!") + var/self_msg = span_red("Your hand slips, bending [target]'s [affected.encased] the wrong way!") user.visible_message(msg, self_msg) affected.createwound(BRUISE, 20) @@ -193,8 +193,8 @@ return var/obj/item/organ/external/affected = target.get_organ(target_zone) - var/msg = "\blue [user] finish mending back [target]'s bones on [affected.encased] with \the [tool]." - var/self_msg = "\blue You finish mending back [target]'s bones on [affected.encased] with \the [tool]." + var/msg = span_blue("[user] finish mending back [target]'s bones on [affected.encased] with \the [tool].") + var/self_msg = span_blue("You finish mending back [target]'s bones on [affected.encased] with \the [tool].") user.visible_message(msg, self_msg) - affected.open = 2 \ No newline at end of file + affected.open = 2 diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index e8279878fc5..cc9b9232448 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -21,13 +21,13 @@ "You start cutting through [target]'s flesh with \the [tool].") /datum/old_surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts through [target]'s flesh with \the [tool].", \ - "\blue You cut through [target]'s flesh with \the [tool], revealing its silky innards.") + user.visible_message(span_blue("[user] cuts through [target]'s flesh with \the [tool]."), \ + span_blue("You cut through [target]'s flesh with \the [tool], revealing its silky innards.")) target.core_removal_stage = 1 /datum/old_surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s flesh with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s flesh with \the [tool]!") + user.visible_message(span_red("[user]'s hand slips, tearing [target]'s flesh with \the [tool]!"), \ + span_red("Your hand slips, tearing [target]'s flesh with \the [tool]!")) /datum/old_surgery_step/slime/cut_innards required_tool_quality = QUALITY_CUTTING @@ -42,13 +42,13 @@ "You start cutting [target]'s silky innards apart with \the [tool].") /datum/old_surgery_step/slime/cut_innards/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] cuts [target]'s innards apart with \the [tool], exposing the cores.", \ - "\blue You cut [target]'s innards apart with \the [tool], exposing the cores.") + user.visible_message(span_blue("[user] cuts [target]'s innards apart with \the [tool], exposing the cores."), \ + span_blue("You cut [target]'s innards apart with \the [tool], exposing the cores.")) target.core_removal_stage = 2 /datum/old_surgery_step/slime/cut_innards/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, tearing [target]'s innards with \the [tool]!", \ - "\red Your hand slips, tearing [target]'s innards with \the [tool]!") + user.visible_message(span_red("[user]'s hand slips, tearing [target]'s innards with \the [tool]!"), \ + span_red("Your hand slips, tearing [target]'s innards with \the [tool]!")) /datum/old_surgery_step/slime/saw_core required_tool_quality = QUALITY_SAWING @@ -64,8 +64,8 @@ /datum/old_surgery_step/slime/saw_core/end_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) target.cores-- - user.visible_message("\blue [user] cuts out one of [target]'s cores with \the [tool].",, \ - "\blue You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.") + user.visible_message(span_blue("[user] cuts out one of [target]'s cores with \the [tool]."),, \ + span_blue("You cut out one of [target]'s cores with \the [tool]. [target.cores] cores left.")) if(target.cores >= 0) new target.coretype(target.loc) @@ -74,5 +74,5 @@ /datum/old_surgery_step/slime/saw_core/fail_step(mob/living/user, mob/living/carbon/slime/target, target_zone, obj/item/tool) - user.visible_message("\red [user]'s hand slips, causing \him to miss the core!", \ - "\red Your hand slips, causing you to miss the core!") \ No newline at end of file + user.visible_message(span_red("[user]'s hand slips, causing \him to miss the core!"), \ + span_red("Your hand slips, causing you to miss the core!")) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index b4daa7456b0..3670213350b 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -92,7 +92,7 @@ return FALSE if(!tool) - tool = user.get_active_hand() + tool = user.get_active_held_item() var/quality = S.tool_quality(tool) if(!quality) diff --git a/code/modules/surgery/surgery_ui.dm b/code/modules/surgery/surgery_ui.dm index 5db5c31f465..c43d78482b4 100644 --- a/code/modules/surgery/surgery_ui.dm +++ b/code/modules/surgery/surgery_ui.dm @@ -195,7 +195,7 @@ var/target_stat = BP_IS_ROBOTIC(src) ? STAT_MEC : STAT_BIO var/removal_time = 70 * usr.stats.getMult(target_stat, STAT_LEVEL_PROF) var/target = get_surgery_target() - var/obj/item/I = user.get_active_hand() + var/obj/item/I = user.get_active_held_item() if(!I || !(QUALITY_CLAMPING in I.tool_qualities)) to_chat(user, span_warning("You need a tool with [QUALITY_CLAMPING] quality")) @@ -222,7 +222,7 @@ if("treat_wound") var/mob/living/user = usr - var/obj/item/I = user.get_active_hand() + var/obj/item/I = user.get_active_held_item() if(!user || !I) return diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 8a039304744..44408228525 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -22,7 +22,7 @@ //checks if projectile 'P' from turf 'from' can hit whatever is behind the table. Returns 1 if it can, 0 if bullet stops. /obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from) - if(config.z_level_shooting) + if(CONFIG_GET(flag/z_level_shooting)) if(P.height == HEIGHT_HIGH) return TRUE // Bullet is too high to hit P.height = (P.height == HEIGHT_LOW) ? HEIGHT_LOW : HEIGHT_CENTER @@ -50,7 +50,7 @@ valid = FALSE //But only from one side // Bullet is low enough to hit the table - if(config.z_level_shooting && P.height == HEIGHT_LOW) + if(CONFIG_GET(flag/z_level_shooting) && P.height == HEIGHT_LOW) valid = TRUE if(valid) diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index f6e31c5d445..c8d6e0de8b4 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -218,7 +218,7 @@ var/list/custom_table_appearance = list( return ..() /obj/structure/table/MouseDrop_T(obj/item/stack/material/what) - if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_hand() == what && Adjacent(usr)) + if(can_reinforce && isliving(usr) && (!usr.stat) && istype(what) && usr.get_active_held_item() == what && Adjacent(usr)) reinforce_table(what, usr) else return ..() diff --git a/code/modules/text_to_speech/tts_main.dm b/code/modules/text_to_speech/tts_main.dm index d796ad1bb5f..3296fae597c 100644 --- a/code/modules/text_to_speech/tts_main.dm +++ b/code/modules/text_to_speech/tts_main.dm @@ -15,10 +15,10 @@ GLOBAL_VAR_INIT(tts_error_raw, "") var/list/tts_seeds = list() /proc/initialize_text_to_speech() - if(!config.tts_key) + if(!CONFIG_GET(string/tts_key)) return - GLOB.tts_bearer = "Bearer [config.tts_key]" + GLOB.tts_bearer = "Bearer [CONFIG_GET(string/tts_key)]" if(!fexists("config/tts_seeds.txt")) return @@ -69,7 +69,7 @@ var/list/tts_seeds = list() fdel(.) return null GLOB.tts_request_succeeded++ - if(!config.tts_cache) + if(!CONFIG_GET(flag/tts_cache)) GLOB.tts_death_row += . addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS) @@ -109,7 +109,7 @@ var/list/tts_seeds = list() fdel(.) return "" GLOB.tts_request_succeeded++ - if(!config.tts_cache) + if(!CONFIG_GET(flag/tts_cache)) GLOB.tts_death_row += . addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cleanup_tts_file), .), 20 SECONDS) diff --git a/code/modules/tgchat/README.md b/code/modules/tgchat/README.md new file mode 100644 index 00000000000..95f28ae0e8c --- /dev/null +++ b/code/modules/tgchat/README.md @@ -0,0 +1,30 @@ +## /TG/ Chat + +/TG/ Chat, which will be referred to as TgChat from this point onwards, is a system in which we can send messages to clients in a controlled and semi-reliable manner. The standard way of sending messages to BYOND clients simply dumps whatever you output to them directly into their chat window, however BYOND allows us to load our own code on the client to change this behaviour in a way that allows us to do some pretty neat things. + +### Message Format + +TgChat handles sending messages from the server to the client through the use of JSON payloads, of which the format will change depending on the type of message and the intended client endpoint. An example of the payload for chat messages is as follows: +```json +{ + "sequence": 0, + "content": { + "type": ". . .", // ?optional + "text": ". . .", // ?optional !atleast-one + "html": ". . .", // ?optional !atleast-one + "avoidHighlighting": 0 // ?optional + }, +} +``` + +### Reliability + +In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of recieved sequence numbers. Should the client recieve an unexpected sequence number TgChat asks the server to resend any missing packets. + +### Ping System + +TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server recieves said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request. + +### Chat Tabs, Local Storage, and Highlighting + +To make organizing and managing chat easier and more functional for both players and admins, TgChat has the ability to filter out messages based on their primary tag, such as individual departmental radios, to a dedicated chat tab for easier reading and comprehension. These tabs can also be configured to highlist messages based on a simple keyword search. You can set a multitude of different keywords to search for and they will be highlighting for instant alerting of the client. Said tabs, highlighting rules, and your chat history will persist thanks to use of local storage on the client. Using local storage TgChat can ensure that your preferences are saved and maintained between client restarts and switching between other /TG/ servers. Local Storage is also used to keep your chat history aswell, should you need to scroll through your chat logs. diff --git a/code/modules/tgchat/message.dm b/code/modules/tgchat/message.dm new file mode 100644 index 00000000000..2e9bfe784ec --- /dev/null +++ b/code/modules/tgchat/message.dm @@ -0,0 +1,17 @@ +/** + * Message-related procs + * + * Message format (/list): + * - type - Message type, must be one of defines in `code/__DEFINES/chat.dm` + * - text - Plain message text + * - html - HTML message text + * - Optional metadata, can be any key/value pair. + * + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/proc/message_to_html(message) + // Here it is possible to add a switch statement + // to custom-handle various message types. + return message["html"] || message["text"] diff --git a/code/modules/tgchat/to_chat.dm b/code/modules/tgchat/to_chat.dm new file mode 100644 index 00000000000..9b99dbdea45 --- /dev/null +++ b/code/modules/tgchat/to_chat.dm @@ -0,0 +1,90 @@ +/*! + * Copyright (c) 2020 Aleksej Komarov + * SPDX-License-Identifier: MIT + */ + +/** + * Circumvents the message queue and sends the message + * to the recipient (target) as soon as possible. + */ +/proc/to_chat_immediate( + target, + html, + type = null, + text = null, + avoid_highlighting = FALSE, + // FIXME: These flags are now pointless and have no effect + handle_whitespace = TRUE, + trailing_newline = TRUE, + confidential = FALSE +) + // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "") + html = "[html]" + text = "[text]" + if(!target) + return + if(!html && !text) + if(istext(target)) + CRASH("Passed text without target in to_chat proc call.") + else + CRASH("Empty or null string in to_chat proc call.") + if(target == world) + target = GLOB.clients + + // Build a message + var/message = list() + if(type) message["type"] = type + if(text) message["text"] = text + if(html) message["html"] = html + if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting + + // send it immediately + SSchat.send_immediate(target, message) + +/** + * Sends the message to the recipient (target). + * + * Recommended way to write to_chat calls: + * ``` + * to_chat(client, + * type = MESSAGE_TYPE_INFO, + * html = "You have found [object]") + * ``` + */ +/proc/to_chat( + target, + html, + type = null, + text = null, + avoid_highlighting = FALSE, + // FIXME: These flags are now pointless and have no effect + handle_whitespace = TRUE, + trailing_newline = TRUE, + confidential = FALSE +) + if(isnull(Master) || !SSchat?.initialized || !MC_RUNNING(SSchat.init_stage)) + to_chat_immediate(target, html, type, text, avoid_highlighting, confidential = confidential) + return + + // Useful where the integer 0 is the entire message. Use case is enabling to_chat(target, some_boolean) while preventing to_chat(target, "") + html = "[html]" + text = "[text]" + + if(!target) + return + if(!html && !text) + if(istext(target)) + CRASH("Passed text without target in to_chat proc call.") + else + CRASH("Empty or null string in to_chat proc call.") + if(target == world) + target = GLOB.clients + + // Build a message + var/message = list() + if(type) message["type"] = type + if(text) message["text"] = text + if(html) message["html"] = html + if(avoid_highlighting) message["avoidHighlighting"] = avoid_highlighting + + SSchat.queue(target, message) diff --git a/code/modules/tgui/external.dm b/code/modules/tgui/external.dm index a5c599ef396..6e52af118aa 100644 --- a/code/modules/tgui/external.dm +++ b/code/modules/tgui/external.dm @@ -42,7 +42,7 @@ * * required user mob The mob interacting with the UI. * - * return list Statuic Data to be sent to the UI. + * return list Static Data to be sent to the UI. */ /datum/proc/ui_static_data(mob/user) return list() @@ -70,7 +70,7 @@ * change static data. */ /datum/proc/update_static_data_for_all_viewers() - for (var/datum/tgui/window as anything in SStgui.open_uis_by_src[REF(src)]) + for (var/datum/tgui/window as anything in open_uis) window.send_full_update() /** @@ -86,10 +86,14 @@ */ /datum/proc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) SHOULD_CALL_PARENT(TRUE) - SEND_SIGNAL_OLD(src, COMSIG_UI_ACT, usr, action) + SEND_SIGNAL(src, COMSIG_UI_ACT, usr, action, params) // If UI is not interactive or usr calling Topic is not the UI user, bail. if(!ui || ui.status != UI_INTERACTIVE) return TRUE + // if(action == "change_ui_state") + // var/mob/living/user = ui.user + // //write_preferences will make sure it's valid for href exploits. + // user.client.prefs.write_preference(GLOB.preference_entries[layout_prefs_used], params["new_state"]) /** * public diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index b35931d92d3..df14ad0ebf4 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -63,7 +63,7 @@ // Close UIs if mindless. if(!client) // && !HAS_TRAIT(src, TRAIT_PRESERVE_UI_WITHOUT_CLIENT)) return UI_CLOSE - // Disable UIs if unconcious. + // Disable UIs if unconscious. else if(stat) return UI_DISABLED // Update UIs if incapicitated but concious. @@ -71,8 +71,9 @@ return UI_UPDATE return UI_INTERACTIVE -/mob/living/shared_ui_interaction(src_object) +/mob/living/shared_ui_interaction(atom/src_object) . = ..() + // if(!(mobility_flags & MOBILITY_UI) && !(src_object.interaction_flags_atom & INTERACT_ATOM_IGNORE_MOBILITY) && . == UI_INTERACTIVE) // downgrade from UI_INTERACTIVE to UI_UPDATE when lying or resting. if((lying || resting) && . == UI_INTERACTIVE) return UI_UPDATE @@ -102,6 +103,11 @@ * return UI_state The state of the UI. */ /mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE, allow_tk = TRUE) + // var/obj/item/item_in_hand = get_active_held_item() + // if(istype(item_in_hand, /obj/item/machine_remote)) //snowflake, this lets you interact with all. + // var/obj/item/machine_remote/remote = item_in_hand + // if(remote.controlling_machine_or_bot == src_object) + // return UI_INTERACTIVE // If the object is obscured, close it. if(viewcheck && !(src_object in view(src))) return UI_CLOSE diff --git a/code/modules/tgui/states/admin.dm b/code/modules/tgui/states/admin.dm index 4da5061dfcb..eb12cb1eb6e 100644 --- a/code/modules/tgui/states/admin.dm +++ b/code/modules/tgui/states/admin.dm @@ -6,12 +6,26 @@ /** * tgui state: admin_state * - * Checks that the user is an admin, end-of-story. + * Checks if the user has specific admin permissions. */ -GLOBAL_DATUM_INIT(admin_state, /datum/ui_state/admin_state, new) +GLOBAL_LIST_EMPTY_TYPED(admin_states, /datum/ui_state/admin_state) +GLOBAL_PROTECT(admin_states) + +/datum/ui_state/admin_state + /// The specific admin permissions required for the UI using this state. + VAR_FINAL/required_perms = R_ADMIN + +/datum/ui_state/admin_state/New(required_perms = R_ADMIN) + . = ..() + src.required_perms = required_perms /datum/ui_state/admin_state/can_use_topic(src_object, mob/user) - if(check_rights_for(user.client, R_ADMIN)) + if(check_rights_for(user.client, required_perms)) return UI_INTERACTIVE return UI_CLOSE + +// /datum/ui_state/admin_state/vv_edit_var(var_name, var_value) +// if(var_name == NAMEOF(src, required_perms)) +// return FALSE +// return ..() diff --git a/code/modules/tgui/states/greyscale_menu.dm b/code/modules/tgui/states/greyscale_menu.dm new file mode 100644 index 00000000000..b08c0b8c980 --- /dev/null +++ b/code/modules/tgui/states/greyscale_menu.dm @@ -0,0 +1,14 @@ +/** + * tgui state: greyscale menu + * + * Checks that the target var of the greyscale menu meets the default can_use_topic criteria + */ + +GLOBAL_DATUM_INIT(greyscale_menu_state, /datum/ui_state/greyscale_menu_state, new) + +/datum/ui_state/greyscale_menu_state/can_use_topic(src_object, mob/user) + var/datum/greyscale_modify_menu/menu = src_object + if(!isatom(menu.target)) + return UI_INTERACTIVE + + return GLOB.default_state.can_use_topic(menu.target, user) diff --git a/code/modules/tgui/states/hands.dm b/code/modules/tgui/states/hands.dm index 9b4b7b1c811..0bd23aa27b9 100644 --- a/code/modules/tgui/states/hands.dm +++ b/code/modules/tgui/states/hands.dm @@ -25,7 +25,6 @@ GLOBAL_DATUM_INIT(hands_state, /datum/ui_state/hands_state, new) return UI_CLOSE /mob/living/silicon/robot/hands_can_use_topic(src_object) - for(var/obj/item/gripper/active_gripper in list(module_state_1, module_state_2, module_state_3)) - if(active_gripper.contains(src_object)) - return UI_INTERACTIVE + if(activated(src_object)) + return UI_INTERACTIVE return UI_CLOSE diff --git a/code/modules/tgui/states/holoposter.dm b/code/modules/tgui/states/holoposter.dm index 4a21e87f35a..43c2b23a8cb 100644 --- a/code/modules/tgui/states/holoposter.dm +++ b/code/modules/tgui/states/holoposter.dm @@ -2,14 +2,14 @@ GLOBAL_DATUM_INIT(holoposter_state, /datum/ui_state/holoposter_state, new) /datum/ui_state/holoposter_state/can_use_topic(obj/machinery/holoposter/src_object, mob/user) ASSERT(istype(src_object)) - + if(src_object.stat & NOPOWER) return UI_CLOSE - + if(isobserver(user) || issilicon(user)) return user.default_can_use_topic(src_object) - - if(!istype(user.get_active_hand(), /obj/item/tool/multitool)) + + if(!istype(user.get_active_held_item(), /obj/item/tool/multitool)) return UI_CLOSE - + return user.default_can_use_topic(src_object) diff --git a/code/modules/tgui/states/language_menu.dm b/code/modules/tgui/states/language_menu.dm index eaaa125786d..1786175f051 100644 --- a/code/modules/tgui/states/language_menu.dm +++ b/code/modules/tgui/states/language_menu.dm @@ -14,6 +14,6 @@ GLOBAL_DATUM_INIT(language_menu_state, /datum/ui_state/language_menu, new) if(check_rights_for(user.client, R_ADMIN)) . = UI_INTERACTIVE else if(istype(src_object, /datum/language_menu)) - var/datum/language_menu/LM = src_object - if(LM.language_holder.get_atom() == user) + var/datum/language_menu/my_languages = src_object + if(my_languages.language_holder.owner == user) . = UI_INTERACTIVE diff --git a/code/modules/tgui/states/new_player.dm b/code/modules/tgui/states/new_player.dm index cf6f83ed3a1..cd33bcfcfae 100644 --- a/code/modules/tgui/states/new_player.dm +++ b/code/modules/tgui/states/new_player.dm @@ -1,13 +1,10 @@ /** * tgui state: new_player_state * - * Checks that the user is a new_player, or if user is an admin + * Checks that the user is a /mob/dead/new_player */ GLOBAL_DATUM_INIT(new_player_state, /datum/ui_state/new_player_state, new) /datum/ui_state/new_player_state/can_use_topic(src_object, mob/user) - if(isnewplayer(user) || check_rights_for(user.client, R_ADMIN)) - return UI_INTERACTIVE - return UI_CLOSE - + return isnewplayer(user) ? UI_INTERACTIVE : UI_CLOSE diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm index f7278c86de4..ab8cd5f6246 100644 --- a/code/modules/tgui/states/not_incapacitated.dm +++ b/code/modules/tgui/states/not_incapacitated.dm @@ -29,6 +29,6 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate /datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user) if(user.stat != CONSCIOUS) return UI_CLOSE - if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc))) + if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc))) return UI_DISABLED return UI_INTERACTIVE diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm index 018e0fa0304..b144a375757 100644 --- a/code/modules/tgui/states/notcontained.dm +++ b/code/modules/tgui/states/notcontained.dm @@ -28,5 +28,5 @@ GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new) /mob/living/silicon/notcontained_can_use_topic(src_object) return default_can_use_topic(src_object) // Silicons use default bevhavior. -/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object) +/mob/living/basic/drone/notcontained_can_use_topic(src_object) return default_can_use_topic(src_object) // Drones use default bevhavior. diff --git a/code/modules/tgui/states/standing.dm b/code/modules/tgui/states/standing.dm new file mode 100644 index 00000000000..5d6a49c401e --- /dev/null +++ b/code/modules/tgui/states/standing.dm @@ -0,0 +1,17 @@ +/** + * tgui state: standing_state + * + * Checks that the user isn't incapacitated and is standing upright + */ + +GLOBAL_DATUM_INIT(standing_state, /datum/ui_state/not_incapacitated_state/standing, new) + +/datum/ui_state/not_incapacitated_state/standing + +/datum/ui_state/not_incapacitated_state/standing/can_use_topic(src_object, mob/user) + if (!isliving(user)) + return ..() + var/mob/living/living_user = user + if (living_user.body_position) + return UI_DISABLED + return ..() diff --git a/code/modules/tgui/status_composers.dm b/code/modules/tgui/status_composers.dm index 4e9952b25ac..2836302fd06 100644 --- a/code/modules/tgui/status_composers.dm +++ b/code/modules/tgui/status_composers.dm @@ -57,7 +57,7 @@ /// Returns a UI status such that advanced tool users will be able to interact, /// but everyone else can only watch. /proc/ui_status_user_is_advanced_tool_user(mob/user) - return user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE + return ISADVANCEDTOOLUSER(user) ? UI_INTERACTIVE : UI_UPDATE /// Returns a UI status such that silicons will be able to interact with whatever /// they would have access to if this was a machine. For example, AIs can @@ -111,3 +111,11 @@ return UI_CLOSE return UI_INTERACTIVE + +/// Return UI_INTERACTIVE if the user is inside the target atom, whether they can see it or not. +/// Return UI_CLOSE otherwise. +/proc/ui_status_user_inside(mob/user, atom/target) + if(target.contains(user)) + return UI_INTERACTIVE + + return UI_CLOSE diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 8386204e588..b889ab5b9af 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -11,7 +11,7 @@ var/mob/user /// The object which owns the UI. var/datum/src_object - /// The title of te UI. + /// The title of the UI. var/title /// The window_id for browse() and onclose(). var/datum/tgui_window/window @@ -37,8 +37,6 @@ var/datum/ui_state/state = null /// Rate limit client refreshes to prevent DoS. COOLDOWN_DECLARE(refresh_cooldown) - /// Are byond mouse events beyond the window passed in to the ui - var/mouse_hooked = FALSE /** * public @@ -103,22 +101,25 @@ )) else window.send_message("ping") + send_assets() + window.send_message("update", get_payload( + with_data = TRUE, + with_static_data = TRUE)) + SStgui.on_open(src) + + return TRUE + +/datum/tgui/proc/send_assets() var/flush_queue = window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/fontawesome)) flush_queue |= window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/tgfont)) + flush_queue |= window.send_asset(get_asset_datum( + /datum/asset/json/icon_ref_map)) for(var/datum/asset/asset in src_object.ui_assets(user)) flush_queue |= window.send_asset(asset) if (flush_queue) user.client.browse_queue_flush() - window.send_message("update", get_payload( - with_data = TRUE, - with_static_data = TRUE)) - if(mouse_hooked) - window.set_mouse_macro() - SStgui.on_open(src) - - return TRUE /** * public @@ -154,18 +155,6 @@ /datum/tgui/proc/set_autoupdate(autoupdate) src.autoupdate = autoupdate -/** - * public - * - * Enable/disable passing through byond mouse events to the window - * - * required value bool Enable/disable hooking. - */ -/datum/tgui/proc/set_mouse_hook(value) - src.mouse_hooked = value - //Handle unhooking/hooking on already open windows ? - - /** * public * @@ -241,13 +230,18 @@ json_data["config"] = list( "title" = title, "status" = status, - "interface" = interface, + "interface" = list( + "name" = interface, + // "layout" = user.client.prefs.read_preference(src_object.layout_prefs_used), + "layout" = TGUI_LAYOUT_GRID, + ), "refreshing" = refreshing, "window" = list( "key" = window_key, "size" = window_size, "fancy" = user.client.get_preference_value(/datum/client_preference/tgui_fancy), "locked" = user.client.get_preference_value(/datum/client_preference/tgui_lock), + // "scale" = user.client.get_preference_value(/datum/client_preference/ui_scale), ), "client" = list( "ckey" = user.client.ckey, @@ -275,7 +269,7 @@ * Run an update cycle for this UI. Called internally by SStgui * every second or so. */ -/datum/tgui/Process(delta_time, force = FALSE) +/datum/tgui/Process(seconds_per_tick, force = FALSE) if(closing) return var/datum/host = src_object.ui_host(user) diff --git a/code/modules/tgui/tgui_window.dm b/code/modules/tgui/tgui_window.dm index 4c311276279..34284dba42c 100644 --- a/code/modules/tgui/tgui_window.dm +++ b/code/modules/tgui/tgui_window.dm @@ -11,6 +11,7 @@ var/is_browser = FALSE var/status = TGUI_WINDOW_CLOSED var/locked = FALSE + var/visible = FALSE var/datum/tgui/locked_by var/datum/subscriber_object var/subscriber_delegate @@ -24,7 +25,8 @@ var/initial_inline_html var/initial_inline_js var/initial_inline_css - var/mouse_event_macro_set = FALSE + + var/list/oversized_payloads = list() /** * public @@ -220,12 +222,11 @@ /datum/tgui_window/proc/close(can_be_suspended = TRUE) if(!client) return - if(mouse_event_macro_set) - remove_mouse_macro() if(can_be_suspended && can_be_suspended()) log_tgui(client, context = "[id]/close (suspending)", window = src) + visible = FALSE status = TGUI_WINDOW_READY send_message("suspend") return @@ -233,6 +234,7 @@ context = "[id]/close", window = src) release_lock() + visible = FALSE status = TGUI_WINDOW_CLOSED message_queue = null // Do not close the window to give user some time @@ -301,6 +303,9 @@ if(istype(asset, /datum/asset/spritesheet)) var/datum/asset/spritesheet/spritesheet = asset send_message("asset/stylesheet", spritesheet.css_filename()) + else if(istype(asset, /datum/asset/spritesheet_batched)) + var/datum/asset/spritesheet_batched/spritesheet = asset + send_message("asset/stylesheet", spritesheet.css_filename()) send_raw_message(asset.get_serialized_url_mappings()) /** @@ -364,6 +369,9 @@ switch(type) if("ping") send_message("ping/reply", payload) + if("visible") + visible = TRUE + SEND_SIGNAL(src, COMSIG_TGUI_WINDOW_VISIBLE, client) if("suspend") close(can_be_suspended = TRUE) if("close") @@ -372,43 +380,48 @@ client << link(href_list["url"]) if("cacheReloaded") reinitialize() + if("chat/resend") + SSchat.handle_resend(client, payload) + if("oversizedPayloadRequest") + var/payload_id = payload["id"] + var/chunk_count = payload["chunkCount"] + var/permit_payload = chunk_count <= CONFIG_GET(number/tgui_max_chunk_count) + if(permit_payload) + create_oversized_payload(payload_id, payload["type"], chunk_count) + send_message("oversizePayloadResponse", list("allow" = permit_payload, "id" = payload_id)) + if("payloadChunk") + var/payload_id = payload["id"] + append_payload_chunk(payload_id, payload["chunk"]) + send_message("acknowlegePayloadChunk", list("id" = payload_id)) // /datum/tgui_window/vv_edit_var(var_name, var_value) // return var_name != NAMEOF(src, id) && ..() -/datum/tgui_window/proc/set_mouse_macro() - if(mouse_event_macro_set) +/datum/tgui_window/proc/create_oversized_payload(payload_id, message_type, chunk_count) + if(oversized_payloads[payload_id]) + stack_trace("Attempted to create oversized tgui payload with duplicate ID.") return - - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" + oversized_payloads[payload_id] = list( + "type" = message_type, + "count" = chunk_count, + "chunks" = list(), + "timeout" = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) ) - for(var/mouseMacro in byondToTguiEventMap) - var/command_template = ".output CONTROL PAYLOAD" - var/event_message = TGUI_CREATE_MESSAGE(byondToTguiEventMap[mouseMacro], null) - var target_control = is_browser \ - ? "[id]:update" \ - : "[id].browser:update" - var/with_id = replacetext(command_template, "CONTROL", target_control) - var/full_command = replacetext(with_id, "PAYLOAD", event_message) - - var/list/params = list() - params["parent"] = "default" //Technically this is external to tgui but whatever - params["name"] = mouseMacro - params["command"] = full_command - - winset(client, "[mouseMacro]Window[id]Macro", params) - mouse_event_macro_set = TRUE +/datum/tgui_window/proc/append_payload_chunk(payload_id, chunk) + var/list/payload = oversized_payloads[payload_id] + if(!payload) + return + var/list/chunks = payload["chunks"] + chunks += chunk + if(length(chunks) >= payload["count"]) + deltimer(payload["timeout"]) + var/message_type = payload["type"] + var/final_payload = chunks.Join() + remove_oversized_payload(payload_id) + on_message(message_type, json_decode(final_payload), list("type" = message_type, "payload" = final_payload, "tgui" = TRUE, "window_id" = id)) + else + payload["timeout"] = addtimer(CALLBACK(src, PROC_REF(remove_oversized_payload), payload_id), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) -/datum/tgui_window/proc/remove_mouse_macro() - if(!mouse_event_macro_set) - stack_trace("Unsetting mouse macro on tgui window that has none") - var/list/byondToTguiEventMap = list( - "MouseDown" = "byond/mousedown", - "MouseUp" = "byond/mouseup" - ) - for(var/mouseMacro in byondToTguiEventMap) - winset(client, null, "[mouseMacro]Window[id]Macro.parent=null") - mouse_event_macro_set = FALSE +/datum/tgui_window/proc/remove_oversized_payload(payload_id) + oversized_payloads -= payload_id diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm index 55485c5cc76..119be13d0c9 100644 --- a/code/modules/tgui_input/alert.dm +++ b/code/modules/tgui_input/alert.dm @@ -1,7 +1,7 @@ /** * Creates a TGUI alert window and returns the user's response. * - * This proc should be used to create alerts that the requester will wait for a response from. + * This proc should be used to create alerts that the caller will wait for a response from. * Arguments: * * user - The user to show the alert to. * * message - The content of the alert, shown in the body of the TGUI window. @@ -10,15 +10,19 @@ * * timeout - The timeout of the alert, after which the modal will close and qdel itself. Set to zero for no timeout. * * autofocus - The bool that controls if this alert should grab window focus. */ -/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE) +/proc/tgui_alert(mob/user, message = "", title, list/buttons = list("Ok"), timeout = 0, autofocus = TRUE, ui_state = GLOB.always_state) if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else - return + return null + + if(isnull(user.client)) + return null + // A gentle nudge - you should not be using TGUI alert for anything other than a simple message. if(length(buttons) > 3) log_tgui(user, "Error: TGUI Alert initiated with too many buttons. Use a list.", "TguiAlert") @@ -29,7 +33,7 @@ return alert(user, message, title, buttons[1], buttons[2]) if(length(buttons) == 3) return alert(user, message, title, buttons[1], buttons[2], buttons[3]) - var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus) + var/datum/tgui_alert/alert = new(user, message, title, buttons, timeout, autofocus, ui_state) alert.ui_interact(user) alert.wait() if (alert) @@ -59,20 +63,24 @@ var/autofocus /// Boolean field describing if the tgui_alert was closed by the user. var/closed + /// The TGUI UI state that will be returned in ui_state(). Default: always_state + var/datum/ui_state/state -/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus) +/datum/tgui_alert/New(mob/user, message, title, list/buttons, timeout, autofocus, ui_state) src.autofocus = autofocus src.buttons = buttons.Copy() src.message = message src.title = title + src.state = ui_state if (timeout) src.timeout = timeout start_time = world.time QDEL_IN(src, timeout) -/datum/tgui_alert/Destroy(force, ...) +/datum/tgui_alert/Destroy(force) SStgui.close_uis(src) - QDEL_NULL(buttons) + state = null + buttons?.Cut() return ..() /** @@ -94,7 +102,7 @@ closed = TRUE /datum/tgui_alert/ui_state(mob/user) - return GLOB.always_state + return state /datum/tgui_alert/ui_static_data(mob/user) var/list/data = list() @@ -103,7 +111,7 @@ data["message"] = message /* data["large_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_large) data["swapped_buttons"] = user.client.prefs.read_preference(/datum/preference/toggle/tgui_input_swapped) */ - data["large_buttons"] = FALSE + data["large_buttons"] = TRUE data["swapped_buttons"] = FALSE data["title"] = title return data @@ -114,7 +122,7 @@ data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS)) return data -/datum/tgui_alert/ui_act(action, list/params) +/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) . = ..() if (.) return diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm index 204848fd29c..5efaa846a30 100644 --- a/code/modules/tgui_input/list.dm +++ b/code/modules/tgui_input/list.dm @@ -16,7 +16,7 @@ if(!length(items)) return if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm index 3133461299d..9f85cdf07df 100644 --- a/code/modules/tgui_input/number.dm +++ b/code/modules/tgui_input/number.dm @@ -19,7 +19,7 @@ if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index 020af14cea7..876c4476f67 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -36,6 +36,7 @@ /datum/tgui_say/New(client/client, id) src.client = client window = new(client, id) + winset(client, "tgui_say", "size=1,1;is-visible=0;") window.subscribe(src, PROC_REF(on_message)) window.is_browser = TRUE @@ -62,11 +63,15 @@ */ /datum/tgui_say/proc/load() window_open = FALSE - winshow(client, "tgui_say", FALSE) + + winset(client, "tgui_say", "pos=848,500;is-visible=0;") + window.send_message("props", list( - lightMode = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode), - maxLength = max_length, + "lightMode" = client.prefs?.read_preference(/datum/preference/toggle/tgui_say_light_mode), + "scale" = client.prefs?.read_preference(/datum/preference/toggle/ui_scale), + "maxLength" = max_length, )) + stop_thinking() return TRUE @@ -82,11 +87,9 @@ if(!payload?["channel"]) CRASH("No channel provided to an open TGUI-Say") window_open = TRUE - if(payload["channel"] != OOC_CHANNEL) + if(payload["channel"] != OOC_CHANNEL && payload["channel"] != ADMIN_CHANNEL) start_thinking() - if(client.typing_indicators) - log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators enabled.") - else + if(!client.typing_indicators) log_speech_indicators("[key_name(client)] started typing at [loc_name(client.mob)], indicators DISABLED.") return TRUE @@ -97,9 +100,7 @@ /datum/tgui_say/proc/close() window_open = FALSE stop_thinking() - if(client.typing_indicators) - log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators enabled.") - else + if(!client.typing_indicators) log_speech_indicators("[key_name(client)] stopped typing at [loc_name(client.mob)], indicators DISABLED.") /** @@ -117,10 +118,10 @@ close() return TRUE if (type == "thinking") - if(payload["mode"] == TRUE) + if(payload["visible"] == TRUE) start_thinking() return TRUE - if(payload["mode"] == FALSE) + if(payload["visible"] == FALSE) stop_thinking() return TRUE return FALSE diff --git a/code/modules/tgui_input/say_modal/speech.dm b/code/modules/tgui_input/say_modal/speech.dm index 62d98b56d4c..0d95b855a15 100644 --- a/code/modules/tgui_input/say_modal/speech.dm +++ b/code/modules/tgui_input/say_modal/speech.dm @@ -33,17 +33,20 @@ /datum/tgui_say/proc/delegate_speech(entry, channel) switch(channel) if(SAY_CHANNEL) - client.mob.say(entry) + client.mob.say_verb(entry) return TRUE if(RADIO_CHANNEL) - client.mob.say(";" + entry) + client.mob.say_verb(";" + entry) return TRUE if(ME_CHANNEL) - client.mob.me(entry) + client.mob.me_verb(entry) return TRUE if(OOC_CHANNEL) client.ooc(entry) return TRUE + if(ADMIN_CHANNEL) + SSadmin_verbs.dynamic_invoke_verb(client, /datum/admin_verb/cmd_admin_say, entry) + return TRUE return FALSE /** @@ -65,6 +68,7 @@ log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators enabled.") else log_speech_indicators("[key_name(client)] FORCED to stop typing, indicators DISABLED.") + SEND_SIGNAL(src, COMSIG_HUMAN_FORCESAY) /** * Handles text entry and forced speech. diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 61ebd7c3745..7fc6a93f294 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -36,49 +36,41 @@ /datum/preference/toggle/typing_indicator/apply_to_client(client/client, value) client?.typing_indicators = value -/** Sets the mob as "thinking" - with indicator and variable thinking_IC */ +/** Sets the mob as "thinking" - with indicator and the TRAIT_THINKING_IN_CHARACTER trait */ /datum/tgui_say/proc/start_thinking() - if(!window_open || !client.typing_indicators) + if(!window_open) return FALSE - /// Special exemptions - if(isabductor(client.mob)) - return FALSE - client.mob.thinking_IC = TRUE - client.mob.create_thinking_indicator() + return client.start_thinking() /** Removes typing/thinking indicators and flags the mob as not thinking */ /datum/tgui_say/proc/stop_thinking() - client.mob?.remove_all_indicators() + return client.stop_thinking() /** * Handles the user typing. After a brief period of inactivity, * signals the client mob to revert to the "thinking" icon. */ /datum/tgui_say/proc/start_typing() - client.mob.remove_thinking_indicator() - if(!window_open || !client.typing_indicators || !client.mob.thinking_IC) + if(!window_open) return FALSE - client.mob.create_typing_indicator() - addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) + return client.start_typing() /** - * Callback to remove the typing indicator after a brief period of inactivity. + * Remove the typing indicator after a brief period of inactivity or during say events. * If the user was typing IC, the thinking indicator is shown. */ /datum/tgui_say/proc/stop_typing() - if(!client?.mob) - return FALSE - client.mob.remove_typing_indicator() - if(!window_open || !client.typing_indicators || !client.mob.thinking_IC) + if(!window_open) return FALSE - client.mob.create_thinking_indicator() + client.stop_typing() /// Overrides for overlay creation /mob/living/create_thinking_indicator() - if(active_thinking_indicator || active_typing_indicator || !thinking_IC || stat != CONSCIOUS ) + if(active_thinking_indicator || active_typing_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER)) return FALSE - active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_thinking_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]3", TYPING_LAYER) add_overlay(active_thinking_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_thinking_indicator() if(!active_thinking_indicator) @@ -87,10 +79,11 @@ active_thinking_indicator = null /mob/living/create_typing_indicator() - if(active_typing_indicator || active_thinking_indicator || !thinking_IC || stat != CONSCIOUS) + if(active_typing_indicator || active_thinking_indicator || stat != CONSCIOUS || !HAS_TRAIT(src, TRAIT_THINKING_IN_CHARACTER)) return FALSE - active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER, src, SOUND_EFFECT_VISUAL_PLANE) + active_typing_indicator = mutable_appearance('icons/mob/effects/talk.dmi', "[bubble_icon]0", TYPING_LAYER) add_overlay(active_typing_indicator) + play_fov_effect(src, 6, "talk", ignore_self = TRUE) /mob/living/remove_typing_indicator() if(!active_typing_indicator) @@ -99,7 +92,7 @@ active_typing_indicator = null /mob/living/remove_all_indicators() - thinking_IC = FALSE + REMOVE_TRAIT(src, TRAIT_THINKING_IN_CHARACTER, CURRENTLY_TYPING_TRAIT) remove_thinking_indicator() remove_typing_indicator() diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm index b229607d9ab..6f8911c1e1b 100644 --- a/code/modules/tgui_input/text.dm +++ b/code/modules/tgui_input/text.dm @@ -19,7 +19,7 @@ if (!user) user = usr if (!istype(user)) - if (istype(user, /client)) + if (isclient(user)) var/client/client = user user = client.mob else diff --git a/code/modules/tgui_panel/external.dm b/code/modules/tgui_panel/external.dm index 3e7dbc3178f..64717a03345 100644 --- a/code/modules/tgui_panel/external.dm +++ b/code/modules/tgui_panel/external.dm @@ -9,7 +9,7 @@ * tgui panel / chat troubleshooting verb */ /client/verb/fix_tgui_panel() - set name = "Fix chat" + set name = "Fix Chat" set category = "OOC" var/action log_tgui(src, "Started fixing.", context = "verb/fix_tgui_panel") @@ -19,22 +19,19 @@ // Failed to fix, using tgalert as fallback action = tgalert(src, "Did that work?", "", "Yes", "No, switch to old ui") if (action == "No, switch to old ui") - winset(src, "output", "on-show=&is-disabled=0&is-visible=1") - winset(src, "browseroutput", "is-disabled=1;is-visible=0") + winset(src, "output_selector.legacy_output_selector", "left=output_legacy") log_tgui(src, "Failed to fix.", context = "verb/fix_tgui_panel") /client/proc/nuke_chat() // Catch all solution (kick the whole thing in the pants) - winset(src, "output", "on-show=&is-disabled=0&is-visible=1") - winset(src, "browseroutput", "is-disabled=1;is-visible=0") + winset(src, "output_selector.legacy_output_selector", "left=output_legacy") if(!tgui_panel || !istype(tgui_panel)) log_tgui(src, "tgui_panel datum is missing", context = "verb/fix_tgui_panel") tgui_panel = new(src) tgui_panel.initialize(force = TRUE) // Force show the panel to see if there are any errors - winset(src, "output", "is-disabled=1&is-visible=0") - winset(src, "browseroutput", "is-disabled=0;is-visible=1") + winset(src, "output_selector.legacy_output_selector", "left=output_browser") /client/verb/refresh_tgui() set name = "Refresh TGUI" diff --git a/code/modules/tgui_panel/telemetry.dm b/code/modules/tgui_panel/telemetry.dm index 18e41247061..3abcb050f2a 100644 --- a/code/modules/tgui_panel/telemetry.dm +++ b/code/modules/tgui_panel/telemetry.dm @@ -66,76 +66,78 @@ if (!ckey) return - var/list/all_known_alts = GLOB.known_alts.load_known_alts() - var/list/our_known_alts = list() - - for (var/known_alt in all_known_alts) - if (known_alt[1] == ckey) - our_known_alts += known_alt[2] - else if (known_alt[2] == ckey) - our_known_alts += known_alt[1] - - var/list/found - - var/list/query_data = list() - - for(var/i in 1 to len) - if(QDELETED(client)) - // He got cleaned up before we were done - return - var/list/row = telemetry_connections[i] - - // Check for a malformed history object - if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"])) - return - - if (!isnull(GLOB.round_id)) - query_data += list(list( - "telemetry_ckey" = row["ckey"], - "address" = row["address"], - "computer_id" = row["computer_id"], - )) - - if (row["ckey"] in our_known_alts) - continue - - if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE)) - found = row - break - - CHECK_TICK - - // This fucker has a history of playing on a banned account. - if(found) - var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])" - message_admins(msg) - log_admin_private(msg) - log_suspicious_login(msg, access_log_mirror = FALSE) + // var/list/all_known_alts = GLOB.known_alts.load_known_alts() + // var/list/our_known_alts = list() + + // for (var/known_alt in all_known_alts) + // if (known_alt[1] == ckey) + // our_known_alts += known_alt[2] + // else if (known_alt[2] == ckey) + // our_known_alts += known_alt[1] + + // var/list/found + + // var/list/query_data = list() + + // for(var/i in 1 to len) + // if(QDELETED(client)) + // // He got cleaned up before we were done + // return + // var/list/row = telemetry_connections[i] + + // // Check for a malformed history object + // if (!row || row.len < 3 || (!row["ckey"] || !row["address"] || !row["computer_id"])) + // return + + // if (!isnull(GLOB.game_id)) + // query_data += list(list( + // "telemetry_ckey" = row["ckey"], + // "address" = row["address"], + // "computer_id" = row["computer_id"], + // )) + + // if (row["ckey"] in our_known_alts) + // continue + + // if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE)) + // found = row + // break + + // CHECK_TICK + + // // This fucker has a history of playing on a banned account. + // if(found) + // var/msg = "[key_name(client)] has a banned account in connection history! (Matched: [found["ckey"]], [found["address"]], [found["computer_id"]])" + // message_admins(msg) + // // log_admin_private(msg) + // log_admin(msg) + // log_suspicious_login(msg, access_log_mirror = FALSE) + // log_suspicious_login(msg, access_log_mirror = FALSE) // Only log them all at the end, since it's not as important as reporting an evader - for (var/list/one_query as anything in query_data) - var/datum/db_query/query = SSdbcore.NewQuery({" - INSERT INTO [format_table_name("telemetry_connections")] ( - ckey, - telemetry_ckey, - address, - computer_id, - first_round_id, - latest_round_id - ) VALUES( - :ckey, - :telemetry_ckey, - INET_ATON(:address), - :computer_id, - :round_id, - :round_id - ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id - "}, list( - "ckey" = ckey, - "telemetry_ckey" = one_query["telemetry_ckey"], - "address" = one_query["address"], - "computer_id" = one_query["computer_id"], - "round_id" = GLOB.round_id, - )) - query.Execute() - qdel(query) + // for (var/list/one_query as anything in query_data) + // var/datum/DBQuery/query = dbcon.NewQuery({" + // INSERT INTO [format_table_name("telemetry_connections")] ( + // ckey, + // telemetry_ckey, + // address, + // computer_id, + // first_round_id, + // latest_round_id + // ) VALUES( + // :ckey, + // :telemetry_ckey, + // INET_ATON(:address), + // :computer_id, + // :round_id, + // :round_id + // ) ON DUPLICATE KEY UPDATE latest_round_id = :round_id + // "}, list( + // "ckey" = ckey, + // "telemetry_ckey" = one_query["telemetry_ckey"], + // "address" = one_query["address"], + // "computer_id" = one_query["computer_id"], + // "round_id" = GLOB.game_id, + // )) + // query.Execute() + // qdel(query) diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index fb1fcd92811..4baf7f2e18f 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -39,7 +39,7 @@ /datum/tgui_panel/proc/initialize(force = FALSE) set waitfor = FALSE // Minimal sleep to defer initialization to after client constructor - sleep(1) + sleep(1 TICKS) initialized_at = world.time // Perform a clean initialization window.initialize( @@ -49,10 +49,11 @@ )) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/fontawesome)) window.send_asset(get_asset_datum(/datum/asset/simple/namespaced/tgfont)) - window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) + window.send_asset(get_asset_datum(/datum/asset/spritesheet_batched/chat)) // Other setup request_telemetry() addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) + window.send_message("testTelemetryCommand") /** * private @@ -61,7 +62,7 @@ */ /datum/tgui_panel/proc/on_initialize_timed_out() // Currently does nothing but sending a message to old chat. - SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.") + SEND_TEXT(client, "Failed to load fancy chat, click HERE to attempt to reload it.") /** * private diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index 8ba08fbe814..50a874fa44c 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(unit_test_mapping_logs) var/annotation_text = replacetext(text, "%", "%25") annotation_text = replacetext(annotation_text, "\n", "%0A") - log_world("::error file=[file],line=[line],title=[station_name]: [test_path]::[annotation_text]") + log_world("::error file=[file],line=[line],title=[station_name()]: [test_path]::[annotation_text]") // Normal log message log_entry += "\tREASON #[reasonID]: [text] at [file]:[line]" diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 790a4fadd17..2ec7f45126b 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -163,10 +163,10 @@ if(is_train_head() && ishuman(load)) var/mob/living/carbon/human/D = load - to_chat(D, "\red \b You ran over [H]!") + to_chat(D, span_red("\b You ran over [H]!")) visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])") - msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (JMP)") + msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). [ADMIN_JMP(src)]") else attack_log += text("\[[time_stamp()]\] ran over [H.name] ([H.ckey])") @@ -245,7 +245,7 @@ turn_off() key.loc = usr.loc - if(!usr.get_active_hand()) + if(!usr.get_active_held_item()) usr.put_in_hands(key) key = null diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index 863496bb0d6..7ea8564931e 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -48,7 +48,7 @@ if(emagged) if(isliving(A)) var/mob/living/M = A - visible_message("\red [src] knocks over [M]!") + visible_message(span_red("[src] knocks over [M]!")) M.apply_effects(5, 5) //knock people down if you hit them M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going @@ -62,8 +62,8 @@ if(ishuman(load)) var/mob/living/D = load - to_chat(D, "\red You hit [M]!") - msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. (JMP)") + to_chat(D, span_red("You hit [M]!")) + msg_admin_attack("[D.name] ([D.ckey]) hit [M.name] ([M.ckey]) with [src]. [ADMIN_JMP(src)]") //------------------------------------------- @@ -93,7 +93,7 @@ unload(user, direction) - to_chat(user, "\blue You climb down from [src].") + to_chat(user, span_blue("You climb down from [src].")) return 1 @@ -104,7 +104,7 @@ latch(C, user) else if(!load(C)) - to_chat(user, "\red You were unable to load [C] on [src].") + to_chat(user, span_red("You were unable to load [C] on [src].")) /obj/vehicle/train/attack_hand(mob/user as mob) if(user.stat || user.restrained() || !Adjacent(user)) @@ -142,22 +142,22 @@ //Note: there is a modified version of this in code\modules\vehicles\cargo_train.dm specifically for cargo train engines /obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user) if (get_dist(src, T) > 1) - to_chat(user, "\red [src] is too far away from [T] to hitch them together.") + to_chat(user, span_red("[src] is too far away from [T] to hitch them together.")) return if (lead) - to_chat(user, "\red [src] is already hitched to something.") + to_chat(user, span_red("[src] is already hitched to something.")) return if (T.tow) - to_chat(user, "\red [T] is already towing something.") + to_chat(user, span_red("[T] is already towing something.")) return //check for cycles. var/obj/vehicle/train/next_car = T while (next_car) if (next_car == src) - to_chat(user, "\red That seems very silly.") + to_chat(user, span_red("That seems very silly.")) return next_car = next_car.lead @@ -167,7 +167,7 @@ set_dir(lead.dir) if(user) - to_chat(user, "\blue You hitch [src] to [T].") + to_chat(user, span_blue("You hitch [src] to [T].")) update_stats() @@ -175,13 +175,13 @@ //detaches the train from whatever is towing it /obj/vehicle/train/proc/unattach(mob/user) if (!lead) - to_chat(user, "\red [src] is not hitched to anything.") + to_chat(user, span_red("[src] is not hitched to anything.")) return lead.tow = null lead.update_stats() - to_chat(user, "\blue You unhitch [src] from [lead].") + to_chat(user, span_blue("You unhitch [src] from [lead].")) lead = null update_stats() diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index cc16f15285b..0020a4686ab 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -118,7 +118,7 @@ if(I.use_tool(user, src, WORKTIME_NORMAL, tool_type, FAILCHANCE_EASY, required_stat = STAT_MEC)) health = min(maxhealth, health+10) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") + user.visible_message(span_red("[user] repairs [src]!"), span_blue("You repair [src]!")) return if(ABORT_CHECK) diff --git a/code/modules/webhook/webhook.dm b/code/modules/webhook/webhook.dm index 14e46e16e97..a6819c898b1 100644 --- a/code/modules/webhook/webhook.dm +++ b/code/modules/webhook/webhook.dm @@ -1,26 +1,26 @@ #define RESTART_WEBHOOK "restart" /proc/call_restart_webhook() - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/message = "<@&546427101247438849> Restart!" var/query_string = "type=restart" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/lobby_message(var/message = "Debug Message", var/color = "#FFFFFF", var/sender) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=lobbyalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /client/proc/discord_msg() set name = "Message Lobby" @@ -35,7 +35,7 @@ /proc/send2adminchat(var/initiator, var/original_msg) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return var/list/adm = get_admin_counts() @@ -44,49 +44,36 @@ spawn(0) //Unreliable world.Exports() var/query_string = "type=adminhelp" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&from=[url_encode(initiator)]" query_string += "&msg=[url_encode(html_decode(original_msg))]" query_string += "&admin_number=[allmins.len]" query_string += "&admin_number_afk=[afkmins.len]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/send_adminalert2adminchat(var/message = "Debug Message", var/color = "#FFFFFF", var/sender) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=adminalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") - -/proc/get_admin_counts(requiredflags = R_ADMIN) - . = list("total" = list(), "noflags" = list(), "afk" = list(), "stealth" = list(), "present" = list()) - for(var/client/X in GLOB.admins) - .["total"] += X - if(requiredflags != 0 && !check_rights(R_ADMIN, 0, X)) - .["noflags"] += X - else if(X.is_afk()) - .["afk"] += X - else if(X.holder.fakekey) - .["stealth"] += X - else - .["present"] += X + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") /proc/send2coders(var/message = "Debug Message", var/color = "#FFFFFF", var/sender, var/admiralty = 0) - if (!config.webhook_url || !config.webhook_key) + if (!CONFIG_GET(string/webhook_url) || !CONFIG_GET(string/webhook_key)) return spawn(0) var/query_string = "type=codealert" if(admiralty) query_string = "type=admiraltyalert" - query_string += "&key=[url_encode(config.webhook_key)]" + query_string += "&key=[url_encode(CONFIG_GET(string/webhook_key))]" query_string += "&msg=[url_encode(message)]" query_string += "&color=[url_encode(color)]" if(sender) query_string += "&from=[url_encode(sender)]" - world.Export("[config.webhook_url]?[query_string]") + world.Export("[CONFIG_GET(string/webhook_url)]?[query_string]") diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 7a1ca8bec47..08f68ec0c77 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -23,7 +23,12 @@ em {font-style: normal;font-weight: bold;} .ooc .elevated {color: #2e78d9;} .ooc .moderator {color: #184880;} .ooc .developer {color: #1b521f;} -.ooc .admin {color: #b82e00;} +.ooc {color: #b82e00;} +.adminobserverooc {color: #0099cc; font-weight: bold;} +.adminooc {color: #700038; font-weight: bold;} + +.adminsay {color: #FF4500; font-weight: bold;} +.admin {color: #386aff; font-weight: bold;} /* Admin: Private Messages */ .pm .howto {color: #ff0000; font-weight: bold; font-size: 200%;} @@ -65,7 +70,7 @@ em {font-style: normal;font-weight: bold;} .alert {color: #ff0000;} h1.alert, h2.alert {color: #000000;} -.emote {font-style: italic;} +.emote {} /* Game Messages */ diff --git a/config/.gitignore b/config/.gitignore index ec7ed9b452e..000b0d6b099 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -1,3 +1,4 @@ #ignore everything here, except subdirectories. * !*/ +!example/* diff --git a/config/example/access levels.txt b/config/example/access levels.txt deleted file mode 100644 index e6c0519069a..00000000000 --- a/config/example/access levels.txt +++ /dev/null @@ -1,79 +0,0 @@ -HOW TO CONVERT A MAP TO THE NEW (june 2008) ACCESS LEVEL SYSTEM -1. Open the .dmp file up in Notepad -2. Find all the "access = blahblah" attributes of doors. -3. Delete them. -4. Open the map up in Dream Maker. If you didn't get them all, it'll tell you so. -5. Assign the existing doors new access permissions using the method below. - -HOW TO MAKE A MAP USING THE NEW (june 2008) ACCESS LEVEL SYSTEM -1. Make a map as normal -2. Select a door that you want to not be accessible to everybody -3. Right click on it and edit its attributes -4. Make the "req_access_txt" attribute be a semicolon-separated list of the permissions required to open the doors -5. Repeat for all doors. - -For example, a brig door would have it be "2" while a door that requires you have toxins and teleporter access (for whatever reason) would have it be "9;20" - -Here is a list of the permissions and their numbers (this may be out of date, see code/game/access.dm for an updated version): - -access_security = 1 -access_brig = 2 -access_armory = 3 -access_forensics_lockers= 4 -access_medical = 5 -access_morgue = 6 -access_tox = 7 -access_tox_storage = 8 -access_genetics = 9 -access_engine = 10 -access_engine_equip= 11 -access_maint_tunnels = 12 -access_external_airlocks = 13 -access_emergency_storage = 14 -access_change_ids = 15 -access_ai_upload = 16 -access_teleporter = 17 -access_eva = 18 -access_heads = 19 -access_captain = 20 -access_all_personal_lockers = 21 -access_chapel_office = 22 -access_tech_storage = 23 -access_atmospherics = 24 -access_bar = 25 -access_janitor = 26 -access_crematorium = 27 -access_kitchen = 28 -access_robotics = 29 -access_rd = 30 -access_cargo = 31 -access_construction = 32 -access_chemistry = 33 -access_cargo_bot = 34 -access_hydroponics = 35 -access_manufacturing = 36 -access_library = 37 -access_lawyer = 38 -access_virology = 39 -access_cmo = 40 -access_qm = 41 -access_court = 42 -access_clown = 43 -access_mime = 44 -access_surgery = 45 -access_theatre = 46 -access_research = 47 -access_mining = 48 -access_mining_office = 49 //not in use -access_mailsorting = 50 -access_mint = 51 -access_mint_vault = 52 -access_heads_vault = 53 -access_mining_station = 54 -access_xenobiology = 55 -access_ce = 56 -access_hop = 57 -access_hos = 58 -access_RC_announce = 59 //Request console announcements -access_keycard_auth = 60 //Used for events which require at least two people to confirm them -access_tcomsat = 61 // has access to the entire telecomms satellite / machinery \ No newline at end of file diff --git a/config/example/comms.txt b/config/example/comms.txt new file mode 100644 index 00000000000..e316fe36161 --- /dev/null +++ b/config/example/comms.txt @@ -0,0 +1,29 @@ +## Communication key for receiving data through world/Topic(), you don't want to give this out. +## Must be set to something other than 'default_pwd' and at least 7 characters long to be valid. +#COMMS_KEY default_pwd + +## World address and port for server receiving cross server messages +## Use '+' to denote spaces in ServerName +## Repeat this entry to add more servers +#CROSS_SERVER ServerName byond:\\address:port + +## Name that the server calls itself in communications +#CROSS_COMMS_NAME + +## Network-name used for cross-server broadcasts made from communication consoles. +## Servers that do not match this network-name will have their messages discarded. +## Leaving this commented will allow all messages through, regardless of network. +#CROSS_COMMS_NETWORK default_network + + +## Uncomment to enable sending data to the IRC bot. +#USE_IRC_BOT + +## Host where the IRC bot is hosted. Port 45678 needs to be open. +#IRC_BOT_HOST localhost + +## IRC channel to send information to. Leave blank to disable. +#MAIN_IRC #main + +## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. +#ADMIN_IRC #admin diff --git a/config/example/config.txt b/config/example/config.txt index 3fd7a03dd75..86f8d580f58 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,13 +1,29 @@ -## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice +# You can use the "$include" directive to split your configs however you want + +$include game_options.txt +$include dbconfig.txt +$include comms.txt +$include resources.txt +$include ipconfig.txt +$include logging.txt + +# You can use the @ character at the beginning of a config option to lock it from being edited in-game +# Example usage: +# @SERVERNAME tgstation +# Which sets the SERVERNAME, and disallows admins from being able to change it using View Variables. +# @LOG_TWITTER 0 +# Which explicitly disables LOG_TWITTER, as well as locking it. +# There are various options which are hard-locked for security reasons. + +# Hashtags at the beginning of lines will not be parsed. This only applies at the beginning of the line. +# If you include a hashtag in a setting like so: MYHEXCOLORCONFIG #FF73D2 +# It will still be parsed + +## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name()" where station_name() is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice SERVERNAME CEV Eris: Endless Horizon -## Alert levels -ALERT_GREEN All threats to the ship have passed. Security may not have weapons visible, privacy laws are once again fully enforced. -ALERT_BLUE_UPTO The ship has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted. -ALERT_BLUE_DOWNTO The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed. -ALERT_RED_UPTO There is an immediate serious threat to the ship. Security may have weapons unholstered at all times. Random searches are allowed and advised. -ALERT_RED_DOWNTO The self-destruct mechanism has been deactivated, there is still however an immediate serious threat to the ship. Security may have weapons unholstered at all times, random searches are allowed and advised. -ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill. +## set a hosted by name for unix platforms +HOSTEDBY yournamehere ## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. #ADMIN_LEGACY_SYSTEM @@ -18,8 +34,26 @@ ALERT_DELTA The ship's self-destruct mechanism has been engaged. All crew are in ## Enables the memo system for admins, used to log on each player ADMIN_MEMO_SYSTEM -## Add a # here if you wish to use the setup where jobs have more access. This is intended for servers with low populations - where there are not enough players to fill all roles, so players need to do more than just one job. Also for servers where they don't want people to hide in their own departments. -JOBS_HAVE_MINIMAL_ACCESS +## Uncomment to block all attempts to profile, for performance reasons +#FORBID_ALL_PROFILING + +## Uncomment to block granting profiling privileges to users with R_DEBUG, for performance purposes +#FORBID_ADMIN_PROFILING + +## Can mods tempban? +MODS_CAN_TEMPBAN + +## Can mods job tempban? +MODS_CAN_JOB_TEMPBAN + +## Max amount of time mods can tempban for, in minutes +MOD_TEMPBAN_MAX + +## Max amount of time mods can tempban for, in minutes +MOD_JOB_TEMPBAN_MAX + +## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools. +#ROUNDS_UNTIL_HARD_RESTART 10 ## Unhash this entry to have certain jobs require your account to be at least a certain number of days old to select. You can configure the exact age requirement for different jobs by editing ## the minimal_player_age variable in the files in folder /code/game/jobs/job/.. for the job you want to edit. Set minimal_player_age to 0 to disable age requirement for that job. @@ -35,98 +69,24 @@ JOBS_HAVE_MINIMAL_ACCESS ## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental #USE_RECURSIVE_EXPLOSIONS -## log OOC channel -LOG_OOC - -## log client Say -LOG_SAY - -## log admin actions -LOG_ADMIN - -## log client access (logon/logoff) -LOG_ACCESS - -## log game actions (start of round, results, etc.) -LOG_GAME - -## log player votes -LOG_VOTE - -## log debug messages -##LOG_DEBUG - -## log client Whisper -LOG_WHISPER - -## log emotes -LOG_EMOTE - -## log attack messages -LOG_ATTACK - -## log pda messages -LOG_PDA - -## log all Topic() calls (for use by coders in tracking down Topic issues) -LOG_HREFS - -## log world.log and runtime errors to a file -LOG_RUNTIME - -## log admin warning messages -##LOG_ADMINWARN ## Also duplicates a bunch of other messages. - -## sql switching -SQL_ENABLED - ## disconnect players who did nothing during 10 minutes # KICK_INACTIVE +## Uncomment to have the changelog file automatically open when a user connects and hasn't seen the latest changelog +#AGGRESSIVE_CHANGELOG + ## Use Mentors instead of Moderators. Mentors are designed with the idea that ###they help in pushing new people to be better at roleplay. If you uncomment ###this it will reduce the rights that your mods have. #MENTORS -## probablities for game modes chosen in "secret" and "random" modes -## -## default probablity is 1, increase to make that mode more likely to be picked -## set to 0 to disable that mode -PROBABILITY EXTENDED 1 -PROBABILITY MALFUNCTION 1 -PROBABILITY NUCLEAR 1 -PROBABILITY WIZARD 1 -PROBABILITY CHANGELING 1 -PROBABILITY CULT 1 -PROBABILITY EXTEND-A-TRAITORMONGOUS 6 - -## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on. -#GENERATE_ASTEROID - -## Hash out to disable random events during the round. -ALLOW_RANDOM_EVENTS - -## if amount of traitors scales or not -TRAITOR_SCALING - -## if objectives are disabled -#OBJECTIVES_DISABLED - -## make ERT's be only called by admins -ERT_ADMIN_ONLY - -## If security is prohibited from being most antagonists -#PROTECT_ROLES_FROM_ANTAGONIST - ## Comment this out to stop admins being able to choose their personal ooccolor ALLOW_ADMIN_OOCCOLOR -## If metadata is supported -# ALLOW_METADATA +## Comment this out to stop admins being able to choose their personal asay color +ALLOW_ADMIN_ASAYCOLOR -## allow players to initiate a restart vote -#ALLOW_VOTE_RESTART ## allow players to initate a mode-change start #ALLOW_VOTE_MODE @@ -141,13 +101,10 @@ VOTE_PERIOD 600 #VOTE_AUTOGAMEMODE_TIMELEFT 100 ## prevents dead players from voting or starting votes -#NO_DEAD_VOTE - -## players' votes default to "No vote" (otherwise, default to "No change") -DEFAULT_NO_VOTE +#VOTE_NO_DEAD ## Allow ghosts to see antagonist through AntagHUD -ALLOW_ANTAG_HUD +ANTAG_HUD_ALLOWED ## If ghosts use antagHUD they are no longer allowed to join the round. ANTAG_HUD_RESTRICTED @@ -155,22 +112,39 @@ ANTAG_HUD_RESTRICTED ## allow AI job ALLOW_AI - ## disable abandon mob # NORESPAWN -## disables calling del(src) on newmobs if they logout before spawnin in -# DONT_DEL_NEWMOB +## Amount of time, in minutes, users must wait to respawn (as a human, assuming the server has respawn enabled) +RESPAWN_DELAY 30 -## set a hosted by name for unix platforms -HOSTEDBY yournamehere +## Uncomment to allow guests +#GUESTS_ALLOWED +## Prevents players form playing as mice +#DISABLE_PLAYER_MICE + +## Prevent newly-spawned mice from understanding human speech +#UNEDUCATED_MICE + +## Can ghosts possess animals? +GHOSTS_CAN_POSSESS_ANIMALS + +## Basically the flag for respawn. +#ABANDON_ALLOWED + +## Can drones spawn? +ALLOW_DRONE_SPAWN + +## How many maint drone can spawn? +MAX_MAINT_DRONES 5 + +## A drone will become available every X ticks since last drone spawn. Default is 2 minutes. +DRONE_BUILD_TIME 1200 ## Set to jobban "Guest-" accounts from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Set to 1 to jobban them from those positions, set to 0 to allow them. GUEST_JOBBAN -## Uncomment this to stop people connecting to your server without a registered ckey. (i.e. guest-* are all blocked from connecting) -GUEST_BAN ## Set to jobban everyone who's key is not listed in data/whitelist.txt from Captain, HoS, HoP, CE, RD, CMO, Warden, Security, Detective, and AI positions. ## Uncomment to 1 to jobban, leave commented out to allow these positions for everyone (but see GUEST_JOBBAN above and regular jobbans) # USEWHITELIST @@ -193,9 +167,11 @@ GUEST_BAN ##Github address GITHUBURL https://github.com/Endless-Horizon/CEV-Eris -## In-game features -## spawns a spellbook which gives object-type spells instead of verb-type spells for the wizard -# FEATURE_OBJECT_SPELL_SYSTEM +## Sets an MOTD of the server. +## You can use this multiple times, and the MOTDs will be appended in order. +## Based on config directory, so "motd.txt" points to "config/motd.txt" +MOTD motd.txt +#MOTD motd_extra.txt ##Toggle for having jobs load up from the .txt # LOAD_JOBS_FROM_TXT @@ -207,16 +183,14 @@ GITHUBURL https://github.com/Endless-Horizon/CEV-Eris ## The intention is to make adminPMs more visible. (although I fnd popups annoying so this defaults to off) #POPUP_ADMIN_PM -## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR -ALLOW_HOLIDAYS -## Defines the FPS for the world. 30 is the normal one, 45+ is smoother. -FPS 40 -## Defines if Tick Compensation is used. It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks. Recommended if tickrate is lowered. -#TICKCOMP +##Defines the ticklag for the world. Ticklag is the amount of time between game ticks (aka byond ticks) (in 1/10ths of a second). +## This also controls the client network update rate, as well as the default client fps +TICKLAG 0.5 -## Whether the server will talk to other processes through socket_talk -SOCKET_TALK 0 +## Defines the FPS for the world. 30 is the normal one, 45+ is smoother. +## (It's actually TPS (ticks per second) but lummox cant be bothered to change it.) +FPS 40 ## Uncomment this to ban use of ToR #TOR_BAN @@ -224,36 +198,11 @@ SOCKET_TALK 0 ## Comment this out to disable automuting #AUTOMUTE_ON -## How long the delay is before the Away Mission gate opens. Default is half an hour. -GATEWAY_DELAY 18000 - -## Remove the # to give assistants maint access. -ASSISTANT_MAINT - -## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. -## Malf and Rev will let the shuttle be called when the antags/protags are dead. -#CONTINUOUS_ROUNDS - ##Remove the # to let ghosts spin chairs GHOST_INTERACTION -## Password used for authorizing ircbot and other external tools. -#COMMS_PASSWORD - #FORBID_ADMIN_PROFILING -## Uncomment to enable sending data to the IRC bot. -#USE_IRC_BOT - -## Host where the IRC bot is hosted. Port 45678 needs to be open. -#IRC_BOT_HOST localhost - -## IRC channel to send information to. Leave blank to disable. -#MAIN_IRC #main - -## IRC channel to send adminhelps to. Leave blank to disable adminhelps-to-irc. -#ADMIN_IRC #admin - ## Path to the python2 executable on the system. Leave blank for default. ## Default is "python" on Windows, "/usr/bin/env python2" on UNIX. #PYTHON_PATH @@ -262,45 +211,14 @@ GHOST_INTERACTION ## This helps security and stability on Linux, but you need to compile the library first. #USE_LIB_NUDGE -## Uncommen to allow ghosts to write in blood during Cult rounds. -#ALLOW_CULT_GHOSTWRITER - -## Sets the minimum number of cultists needed for ghosts to write in blood. -REQ_CULT_GHOSTWRITER 6 - - -## Determines whether bones can be broken through excessive damage to the organ -## 0 means bones can't break, 1 means they can -BONES_CAN_BREAK 1 -## Determines whether limbs can be amputated through excessive damage to the organ -## 0 means limbs can't be amputated, 1 means they can -LIMBS_CAN_BREAK 1 - -## Uncomment this to prevent players from printing copy/pasted circuits -# DISABLE_CIRCUIT_PRINTING - -### REVIVAL ### - -## whether pod plants work or not -REVIVAL_POD_PLANTS 1 - -## whether cloning tubes work or not -REVIVAL_CLONING 1 - -## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite) -REVIVAL_BRAIN_LIFE -1 +## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools. +#ROUNDS_UNTIL_HARD_RESTART 10 ### Miscellaneous ### ## Config options which, of course, don't fit into previous categories. -## Remove the # in front of this config option to have loyalty implants spawn by default on your server. -#USE_LOYALTY_IMPLANTS - -## Remove # if you want your server have the Luna's job system -JOIN_UNASSIGNED - ## Uncomment to use overmap system for zlevel travel #USE_OVERMAP @@ -333,36 +251,58 @@ WEBHOOK_KEY testkey # Enable/disable IP reputation checking (present/nonpresent) #IP_REPUTATION -# Set the e-mail address problems can go to for IPR checks (e-mail address) +## Set the e-mail address problems can go to for IPR checks (e-mail address) IPR_EMAIL whatever@whatever.com -# Above this value, reputation scores are considered 'bad' (number) +## Above this value, reputation scores are considered 'bad' (number) IPR_BAD_SCORE 1 -# If you want the people disconnected. Otherwise it just logs. (present/nonpresent) +## If you want the people disconnected. Otherwise it just logs. (present/nonpresent) IPR_BLOCK_BAD_IPS -# If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) +## If players of a certain length of playtime are allowed anyway (REQUIRES DATABASE) (present/nonpresent) IPR_ALLOW_EXISTING -# And what that age is (number) +## And what that age is (number) IPR_MINIMUM_AGE 5 -# If provided, will look up additional IP reputation info from ipqualityscore.com +## If provided, will look up additional IP reputation info from ipqualityscore.com #IPQUALITYSCORE_APIKEY ABC12345YOURKEYHERE ###### Antiraid Settings -# Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins) +## Enable/disable 'paranoia logging' (notifying admins of new byond accounts joining, and player first-time joins) #PARANOIA_LOGGING -# Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB) +## Enable/disable 'panic bunker' (prevents new players from joining if they've never been seen before in the DB) #PANIC_BUNKER -# Set start location for CEV Eris uncomment ONE only. -RANDOM_START -#ASTEROID_START -#FORTRESS_START -#RUINS_START +###### DEBUG + +## Uncomment to enable debugging admin hrefs +#DEBUG_ADMIN_HREFS + +## Causes configuration errors to spit out runtimes +CONFIG_ERRORS_RUNTIME + +# Something related to debugging. +#DEBUGPARANOID + +##Error handling related options +## The "cooldown" time for each occurence of a unique error +#ERROR_COOLDOWN 600 + +## How many occurences before the next will silence them +#ERROR_LIMIT 90 + +## How long a unique error will be silenced for +#ERROR_SILENCE_TIME 6000 + +##How long to wait between messaging admins about occurences of a unique error +#ERROR_MSG_DELAY 50 + + +## Uncomment to allow admins with +DEBUG to start the byond-tracy profiler during the round. +#ALLOW_TRACY_START -# Generate loot data. -#GENERATE_LOOT_DATA +## Uncomment to allow admins with +DEBUG to queue the next round to run the byond-tracy profiler. +#ALLOW_TRACY_QUEUE diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt index 84f3d26cec5..8e374187797 100644 --- a/config/example/dbconfig.txt +++ b/config/example/dbconfig.txt @@ -8,10 +8,10 @@ ADDRESS localhost PORT 3306 # Database the population, death, karma, etc. tables may be found in -DATABASE ceveris +FEEDBACK_DATABASE ceveris # Username/Login used to access the database -LOGIN mylogin +FEEDBACK_LOGIN mylogin # Password used to access the database -PASSWORD mypassword +FEEDBACK_PASSWORD mypassword diff --git a/config/example/game_options.txt b/config/example/game_options.txt index 8b62f92f94d..16ac97f7a17 100644 --- a/config/example/game_options.txt +++ b/config/example/game_options.txt @@ -1,3 +1,17 @@ +### WORLD ### + +## Where the ship starts off in the universe. Options are: asteroid, space ruins, abandoned fortress, or random +START_LOCATION asteroid + +## Enable asteroid tunnel/cave generation. Will behave strangely if turned off with a map that expects it on. +#GENERATE_ASTEROID + +## Generate loot data. +#GENERATE_LOOT_DATA + +## Hash out to disable random events during the round. +ALLOW_RANDOM_EVENTS + ### HEALTH ### ## level of health at which a mob goes into continual shock (soft crit) @@ -9,36 +23,32 @@ HEALTH_THRESHOLD_CRIT -50 ## level of health at which a mob becomes dead HEALTH_THRESHOLD_DEAD -100 -## Determines whether bones can be broken through excessive damage to the organ -## 0 means bones can't break, 1 means they can -BONES_CAN_BREAK 1 ## Determines whether limbs can be amputated through excessive damage to the organ ## 0 means limbs can't be amputated, 1 means they can LIMBS_CAN_BREAK 1 -## multiplier which enables organs to take more damage before bones breaking or limbs being destroyed -## 100 means normal, 50 means half -ORGAN_HEALTH_MULTIPLIER 100 - -## multiplier which influences how fast organs regenerate naturally -## 100 means normal, 50 means half -ORGAN_REGENERATION_MULTIPLIER 75 - ### REVIVAL ### -## whether pod plants work or not -REVIVAL_POD_PLANTS 1 - -## whether cloning tubes work or not -REVIVAL_CLONING 1 - ## amount of time (in hundredths of seconds) for which a brain retains the "spark of life" after the person's death (set to -1 for infinite) REVIVAL_BRAIN_LIFE -1 - ### Miscellaneous ### ## Config options which, of course, don't fit into previous categories. -## Remove the # in front of this config option to have loyalty implants spawn by default on your server. -#USE_LOYALTY_IMPLANTS +## If security is prohibited from being most antagonists +#PROTECT_ROLES_FROM_ANTAGONIST + +## Reduces view range when wearing welding helmets +WELDER_VISION + +## Enter the hexcode for the light given off by space/stars +STARLIGHT #FFFFFF + +## Allows shooting between z-levels +Z_LEVEL_SHOOTING + +### AI + +## law zero for the AI +#LAW_ZERO ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'ALL LAWS OVERRIDDEN#*?&110010 diff --git a/config/example/ipconfig.txt b/config/example/ipconfig.txt new file mode 100644 index 00000000000..62858c69a10 --- /dev/null +++ b/config/example/ipconfig.txt @@ -0,0 +1,21 @@ +# Should we query IPs to get scores? Generates HTTP traffic to an API service. +#IP_REPUTATION + +# Left null because you MUST specify one otherwise you're making the internet worse. +#IPR_EMAIL example@example.com + +# Should we block anyone who meets the minimum score below? Otherwise we just log it (If paranoia logging is on, visibly in chat). +#IPR_BLOCK_BAD_IPS + +# The API returns a value between 0 and 1 (inclusive), with 1 being 'definitely VPN/Tor/Proxy'. Values equal/above this var are considered bad. +IPR_BAD_SCORE 1 + +# Should we allow known players to use VPNs/Proxies? If the player is already banned then obviously they still can't connect. +#IPR_ALLOW_EXISTING + +# How many days before a player is considered 'fine' for the purposes of allowing them to use VPNs. +#IPR_MINIMUM_AGE = 5 + +# API key for ipqualityscore.com. Optional additional service that can be used if an API key is provided. +#IPQUALITYSCORE_APIKEY ABCDEFGHIJKLMAOPQRSTUVQWXYZ + diff --git a/config/example/job_playtimes_template.txt b/config/example/job_playtimes_template.txt new file mode 100644 index 00000000000..a2baee5f0db --- /dev/null +++ b/config/example/job_playtimes_template.txt @@ -0,0 +1,31 @@ +Vagabond=0 +Captain=0 +First Officer=0 +NeoTheology Preacher=0 +NeoTheology Acolyte=0 +NeoTheology Agrolyte=0 +NeoTheology Custodian=0 +Club Manager=0 +Club Worker=0 +Club Artist=0 +Technomancer Exultant=0 +Technomancer=0 +Guild Merchant=0 +Guild Technician=0 +Guild Miner=0 +Moebius Biolab Officer=0 +Moebius Doctor=0 +Moebius Chemist=0 +Moebius Paramedic=0 +Moebius Bio-Engineer=0 +Moebius Expedition Overseer=0 +Moebius Scientist=0 +Moebius Roboticist=0 +Moebius Psychiatrist=0 +Ironhammer Commander=0 +Ironhammer Gunnery Sergeant=0 +Ironhammer Inspector=0 +Ironhammer Medical Specialist=0 +Ironhammer Operative=0 +AI=0 +Robot=0 diff --git a/config/example/jobs.txt b/config/example/jobs.txt deleted file mode 100644 index 060cf2d6a73..00000000000 --- a/config/example/jobs.txt +++ /dev/null @@ -1,37 +0,0 @@ -Captain=1 -Head of Personnel=1 -Head of Security=1 -Chief Engineer=1 -Research Director=1 -Chief Medical Officer=1 - -Station Engineer=5 -Roboticist=1 - -Medical Doctor=5 -Geneticist=2 -Virologist=1 - -Scientist=3 -Chemist=2 - -Bartender=1 -Botanist=2 -Chef=1 -Janitor=1 -Quartermaster=1 -Shaft Miner=3 - -Warden=1 -Detective=1 -Security Officer=5 - -Assistant=-1 -Atmospheric Technician=4 -Cargo Technician=3 -Chaplain=1 -Lawyer=2 -Librarian=1 - -AI=1 -Cyborg=1 \ No newline at end of file diff --git a/config/example/logging.txt b/config/example/logging.txt new file mode 100644 index 00000000000..3346dfb831e --- /dev/null +++ b/config/example/logging.txt @@ -0,0 +1,87 @@ +### Config Flags for logging, compatibility flags are at the top + +## Whether or not admin/adminprivate logging is also sent to LOG_CATEGORY_GAME for legacy log parsers +LOGGING_COMPAT_ADMINPRIVATE + +## Should we also log entries as human readable +LOG_AS_HUMAN_READABLE + + +## log OOC channel +LOG_OOC + +## log client Say +LOG_SAY + +## log admin actions +LOG_ADMIN + +## log admin warning messages +##LOG_ADMINWARN ## Also duplicates a bunch of other messages. + +## Log admin chat +LOG_ADMINCHAT + +## log client access (logon/logoff) +LOG_ACCESS + +## log crew manifest to separate file +LOG_MANIFEST + +## log game actions (start of round, results, etc.) +LOG_GAME + +## log player votes +LOG_VOTE + +## log manual target zone switching +LOG_ZONE_SWITCH + +## log debug messages +##LOG_DEBUG + +## log client Whisper +LOG_WHISPER + +## log emotes +LOG_EMOTE + +## log attack messages +LOG_ATTACK + +## log economy actions +LOG_ECON + +## log pda messages +LOG_PDA + +## log prayers +LOG_PRAYER + +## log world.log and runtime errors to a file +LOG_RUNTIME + +## log asset debug logs +# LOG_ASSET + +## log uplink purchases +LOG_UPLINK + +## Enables log entries for logins that failed due to suspicious circumstances (banned player, CID randomiser, spoofed BYOND version, etc.) to a dedicated file. +LOG_SUSPICIOUS_LOGIN + +## log silicons +LOG_SILICON + +## log telecomms messages +LOG_TELECOMMS + +## log speech indicators +LOG_SPEECH_INDICATORS + +## log all world.Topic() calls +# LOG_WORLD_TOPIC + +## Logs all links clicked in-game. Could be used for debugging and tracking down exploits. +## Should be used in conjunction with DEBUG_ADMIN_HREFS in config.txt +LOG_HREFS diff --git a/config/example/resources.txt b/config/example/resources.txt new file mode 100644 index 00000000000..e20ab1cf518 --- /dev/null +++ b/config/example/resources.txt @@ -0,0 +1,69 @@ +# External resources +# Set this to the location of a .zip with the server's .rsc inside of it. +# If you set this multiple times, the server will rotate between the links. +# To use this, the compile option PRELOAD_RSC must be set to 0 to keep byond from preloading resources +# Resource urls can not be encrypted (https://), as they are downloaded by byond, not IE, and byond can't into encryption + +#EXTERNAL_RSC_URLS http://tgstation13.download/byond/tgstationv2.zip + +######################## +# Browser Asset Config # +######################## +# Browser assets are any file included in interfaces. css, images, javascript, etc. +# This handles configuring how we get these to the player so interfaces can access them. + +# Asset Transport +# The normal way of getting assets to clients is to use the internal byond system. This can be slow and delay the opening of interface windows. It also doesn't allow the internal IE windows byond uses to cache anything. +# You can instead have the server save them to a website via a folder within the game server that the web server can read. This could be a simple webserver or something backed by a CDN. +# Valid values: simple, webroot. Simple is the default. +#ASSET_TRANSPORT webroot + + +# Simple asset transport configurable values. + +# Uncomment this to have the server passively send all browser assets to each client in the background. (instead of waiting for them to be needed) +# This should be uncommented in production and commented in development +#ASSET_SIMPLE_PRELOAD + + +# Webroot asset transport configurable values. + +# Local folder to save assets to. +# Assets will be saved in the format of asset.MD5HASH.EXT or in namespaces/hash/ as ASSET_FILE_NAME or asset.MD5HASH.EXT +#ASSET_CDN_WEBROOT data/asset-store/ + +# URL the folder from above can be accessed from. +# for best results the webserver powering this should return a long cache validity time, as all assets sent via this transport use hash based urls +# Encryption (https) is supported here, but linux clients will have issues if you require higher then tls 1.0. Windows clients down to windows 7 can handle tls 1.2 no issue. +# if you want to test this locally, you simpily run the `localhost-asset-webroot-server.py` python3 script to host assets stored in `data/asset-store/` via http://localhost:58715/ +#ASSET_CDN_URL http://localhost:58715/ + +# CDN webservers must provide CORS headers, or TGUI will break and not be able to load all elements. The following example is for IIS: +#
+
+
+
+
+