diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index 200f76590cce2..70f5b921c6652 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -116,7 +116,7 @@
/// Gets the ban cache of the passed in client
/// If the cache has not been generated, we start off a query
-/// If we still have a query going for this request, we just sleep until it's recieved back
+/// If we still have a query going for this request, we just sleep until it's received back
/proc/retrieve_ban_cache(client/player_client)
if(QDELETED(player_client))
return
@@ -622,7 +622,7 @@
duration = text2num(duration)
if (!(interval in list("SECOND", "MINUTE", "HOUR", "DAY", "WEEK", "MONTH", "YEAR")))
interval = "MINUTE"
- var/time_message = "[duration] [lowertext(interval)]" //no DisplayTimeText because our duration is of variable interval type
+ var/time_message = "[duration] [LOWER_TEXT(interval)]" //no DisplayTimeText because our duration is of variable interval type
if(duration > 1) //pluralize the interval if necessary
time_message += "s"
var/note_reason = "Banned from [roles_to_ban[1] == "Server" ? "the server" : " Roles: [roles_to_ban.Join(", ")]"] [isnull(duration) ? "permanently" : "for [time_message]"] - [reason]"
@@ -1310,3 +1310,6 @@
output += ""
panel.set_content(jointext(output, ""))
panel.open()
+
+#undef MAX_ADMINBANS_PER_ADMIN
+#undef MAX_ADMINBANS_PER_HEADMIN
diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm
index 98f38d2d69bbd..843df13f5b09e 100644
--- a/code/modules/admin/sql_message_system.dm
+++ b/code/modules/admin/sql_message_system.dm
@@ -513,7 +513,7 @@
alphatext = "filter: alpha(opacity=[alpha]); opacity: [alpha/100];"
var/list/data = list("
")
if(severity)
- data += "![]([SSassets.transport.get_asset_url("[lowertext(severity)]_button.png")])
"
+ data += "![]([SSassets.transport.get_asset_url("[LOWER_TEXT(severity)]_button.png")])
"
data += "[timestamp] | [server_name] | [admin_key][secret ? " | - Secret" : ""] | [get_exp_format(text2num(playtime))] Living Playtime"
if(expire_timestamp)
data += " | Expires [expire_timestamp]"
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 4a64f05f3cc0a..631ce2b60840d 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -164,37 +164,6 @@
*/
-
-#define SDQL2_STATE_ERROR 0
-#define SDQL2_STATE_IDLE 1
-#define SDQL2_STATE_PRESEARCH 2
-#define SDQL2_STATE_SEARCHING 3
-#define SDQL2_STATE_EXECUTING 4
-#define SDQL2_STATE_SWITCHING 5
-#define SDQL2_STATE_HALTING 6
-
-#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential")
-#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true")
-
-#define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0)
-#define SDQL2_OPTION_BLOCKING_CALLS (1<<1)
-#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick.
-#define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3)
-
-#define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS)
-
-#define SDQL2_IS_RUNNING (state == SDQL2_STATE_EXECUTING || state == SDQL2_STATE_SEARCHING || state == SDQL2_STATE_SWITCHING || state == SDQL2_STATE_PRESEARCH)
-#define SDQL2_HALT_CHECK if(!SDQL2_IS_RUNNING) {state = SDQL2_STATE_HALTING; return FALSE;};
-
-#define SDQL2_TICK_CHECK ((options & SDQL2_OPTION_HIGH_PRIORITY)? CHECK_TICK_HIGH_PRIORITY : CHECK_TICK)
-
-#define SDQL2_STAGE_SWITCH_CHECK if(state != SDQL2_STATE_SWITCHING){\
- if(state == SDQL2_STATE_HALTING){\
- state = SDQL2_STATE_IDLE;\
- return FALSE}\
- state = SDQL2_STATE_ERROR;\
- CRASH("SDQL2 fatal error");};
-
/client/proc/SDQL2_query(requested_query as message)
set category = "Debug"
if(!check_rights(R_DEBUG)) //Shouldn't happen... but just to be safe.
@@ -1024,7 +993,7 @@ GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list())
return null
else if(expression [start] == "{" && long)
- if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1
+ if(LOWER_TEXT(copytext(expression[start + 1], 1, 3)) != "0x") //3 == length("0x") + 1
to_chat(usr, "Invalid pointer syntax: [expression[start + 1]]")
return null
v = locate("\[[expression[start + 1]]]")
@@ -1212,3 +1181,5 @@ GLOBAL_LIST_INIT(sdql2_queries, GLOB.sdql2_queries || list())
for(var/datum/SDQL2_query/query as anything in GLOB.sdql2_queries)
if(query.id == id)
return query
+
+#undef SDQL_qdel_datum
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
index 254821ec0e66d..ed30ab20da3d3 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
@@ -90,7 +90,7 @@
return null
/datum/SDQL_parser/proc/tokenl(i)
- return lowertext(token(i))
+ return LOWER_TEXT(token(i))
/datum/SDQL_parser/proc/query_options(i, list/node)
var/list/options = list()
@@ -605,7 +605,7 @@
node += "null"
i++
- else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum_safe(hex2num(copytext(token(i), 3))))//3 == length("0x") + 1
+ else if(LOWER_TEXT(copytext(token(i), 1, 3)) == "0x" && isnum_safe(hex2num(copytext(token(i), 3))))//3 == length("0x") + 1
node += hex2num(copytext(token(i), 3))
i++
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index f4fd1f9051b61..ed3c30dd369d2 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -69,8 +69,8 @@
/proc/_log(X, Y)
return log(X, Y)
-/proc/_lowertext(T)
- return lowertext(T)
+/proc/_LOWER_TEXT(T)
+ return LOWER_TEXT(T)
/proc/_matrix(a, b, c, d, e, f)
return matrix(a, b, c, d, e, f)
diff --git a/code/modules/admin/verbs/_help.dm b/code/modules/admin/verbs/_help.dm
index 527e18933f716..6c5b3eb44d034 100644
--- a/code/modules/admin/verbs/_help.dm
+++ b/code/modules/admin/verbs/_help.dm
@@ -882,10 +882,10 @@
if(found.mind?.special_role)
is_antag = 1
founds[++founds.len] = list("name" = found.name,
- "real_name" = found.real_name,
- "ckey" = found.ckey,
- "key" = found.key,
- "antag" = is_antag)
+ "real_name" = found.real_name,
+ "ckey" = found.ckey,
+ "key" = found.key,
+ "antag" = is_antag)
msg += "[original_word](?|F) "
continue
msg += "[original_word] "
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index e0bc62fa62601..65bd7975a1123 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -251,7 +251,7 @@
var/client/C = GLOB.directory[target]
var/datum/help_ticket/ticket = C ? C.current_adminhelp_ticket : GLOB.ahelp_tickets.CKey2ActiveTicket(target)
- var/compliant_msg = trim(lowertext(msg))
+ var/compliant_msg = trim(LOWER_TEXT(msg))
var/tgs_tagged = "[sender](TGS/External)"
var/list/splits = splittext(compliant_msg, " ")
if(splits.len && splits[1] == "ticket")
@@ -352,3 +352,5 @@
return stealth
#undef EXTERNALREPLYCOUNT
+
+#undef TGS_AHELP_USAGE
diff --git a/code/modules/admin/verbs/beakerpanel.dm b/code/modules/admin/verbs/beakerpanel.dm
index 9aa7070e2e890..3becfcf5a80df 100644
--- a/code/modules/admin/verbs/beakerpanel.dm
+++ b/code/modules/admin/verbs/beakerpanel.dm
@@ -86,15 +86,15 @@
.select2-selection { border-radius: 0px !important; }
ul {
- list-style-type: none; /* Remove bullets */
- padding: 0; /* Remove padding */
- margin: 0; /* Remove margins */
+ list-style-type: none; /* Remove bullets */
+ padding: 0; /* Remove padding */
+ margin: 0; /* Remove margins */
}
ul li {
- margin-top: -1px; /* Prevent double borders */
- padding: 12px; /* Add some padding */
- color: #ffffff;
+ margin-top: -1px; /* Prevent double borders */
+ padding: 12px; /* Add some padding */
+ color: #ffffff;
text-decoration: none;
background: #40628a;
border: 1px solid #161616;
@@ -103,23 +103,23 @@
}
.remove-reagent {
- background-color: #d03000;
+ background-color: #d03000;
}
.container-control {
- width: 48%;
- float: left;
- padding-right: 10px;
+ width: 48%;
+ float: left;
+ padding-right: 10px;
}
.reagent > div, .reagent-div {
float: right;
width: 200px;
}
input.reagent {
- width: 50%;
+ width: 50%;
}
.grenade-data {
- display: inline-block;
+ display: inline-block;
}