Skip to content

Commit

Permalink
Merge pull request #1 from NonQueueingMatt/action_button
Browse files Browse the repository at this point in the history
Action button fix
  • Loading branch information
Generalcamo authored Sep 21, 2024
2 parents a8c871f + bd494ce commit cb3caac
Show file tree
Hide file tree
Showing 383 changed files with 77,217 additions and 5,655 deletions.
14 changes: 13 additions & 1 deletion aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "code\__DEFINES\background.dm"
#include "code\__DEFINES\battle_monsters.dm"
#include "code\__DEFINES\byond_compat.dm"
#include "code\__DEFINES\callback.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\chemistry.dm"
#include "code\__DEFINES\circuitboard.dm"
#include "code\__DEFINES\color.dm"
Expand Down Expand Up @@ -98,8 +98,10 @@
#include "code\__DEFINES\modular_guns.dm"
#include "code\__DEFINES\move_force.dm"
#include "code\__DEFINES\movement.dm"
#include "code\__DEFINES\movespeed_modification.dm"
#include "code\__DEFINES\multiz.dm"
#include "code\__DEFINES\obj.dm"
#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\organs.dm"
#include "code\__DEFINES\origin_traits.dm"
#include "code\__DEFINES\outfit.dm"
Expand Down Expand Up @@ -259,6 +261,7 @@
#include "code\_globalvars\edible.dm"
#include "code\_globalvars\logging.dm"
#include "code\_globalvars\tgui.dm"
#include "code\_globalvars\lists\mobs.dm"
#include "code\_onclick\adjacent.dm"
#include "code\_onclick\ai.dm"
#include "code\_onclick\click.dm"
Expand Down Expand Up @@ -1345,6 +1348,7 @@
#include "code\game\objects\items\weapons\storage\pill_bottle.dm"
#include "code\game\objects\items\weapons\storage\secure.dm"
#include "code\game\objects\items\weapons\storage\slime_core_bag.dm"
#include "code\game\objects\items\weapons\storage\stickersheets.dm"
#include "code\game\objects\items\weapons\storage\storage.dm"
#include "code\game\objects\items\weapons\storage\toolbox.dm"
#include "code\game\objects\items\weapons\storage\uplink_kits.dm"
Expand Down Expand Up @@ -2929,6 +2933,10 @@
#include "code\modules\modular_computers\NTNet\NTNRC\message.dm"
#include "code\modules\modular_computers\NTNet\NTNRC\ntnrc.dm"
#include "code\modules\modular_computers\NTNet\NTNRC\user.dm"
#include "code\modules\movespeed\_movespeed_modifier.dm"
#include "code\modules\movespeed\modifiers\mobs.dm"
#include "code\modules\movespeed\modifiers\reagents.dm"
#include "code\modules\movespeed\modifiers\spells.dm"
#include "code\modules\multiz\_stubs.dm"
#include "code\modules\multiz\basic.dm"
#include "code\modules\multiz\hoist.dm"
Expand Down Expand Up @@ -3970,6 +3978,10 @@
#include "maps\away\ships\konyang\water_barge\water_barge.dm"
#include "maps\away\ships\konyang\water_barge\water_barge_areas.dm"
#include "maps\away\ships\konyang\water_barge\water_barge_ghostroles.dm"
#include "maps\away\ships\lone_spacer\lone_spacer.dm"
#include "maps\away\ships\lone_spacer\lone_spacer_areas.dm"
#include "maps\away\ships\lone_spacer\lone_spacer_ghostroles.dm"
#include "maps\away\ships\lone_spacer\lone_spacer_landmarks.dm"
#include "maps\away\ships\nka\nka_merchant\nka_merchant.dm"
#include "maps\away\ships\nka\nka_merchant\nka_merchant_areas.dm"
#include "maps\away\ships\nka\nka_merchant\nka_merchant_ghostroles.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/ZAS/Variable Settings.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ var/global/vs_control/vsc = new
vw = vars[ch]
if("[ch]_DESC" in vars) vw_desc = vars["[ch]_DESC"]
if("[ch]_NAME" in vars) vw_name = vars["[ch]_NAME"]
dat += "<b>[vw_name] = [vw]</b> <A href='?src=\ref[src];changevar=[ch]'>\[Change\]</A><br>"
dat += "<b>[vw_name] = [vw]</b> <A href='?src=[REF(src)];changevar=[ch]'>\[Change\]</A><br>"
dat += "<i>[vw_desc]</i><br><br>"
user << browse(dat,"window=settings")

Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/_common.dm
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#define GLOBAL_PROC "some_magic_bullshit"
#define DESC_PARENT "You shouldn't be seeing this. Please make an issue report."
10 changes: 10 additions & 0 deletions code/__DEFINES/_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
#define PASSTRACE (1<<16) //Used by turrets in the check_trajectory proc to target mobs hiding behind certain things (such as closets)
#define PASSRAILING (1<<17)

//Movement Types
#define GROUND (1<<0)
#define FLYING (1<<1)
#define VENTCRAWLING (1<<2)
#define FLOATING (1<<3)
/// When moving, will Cross() everything, but won't stop or Bump() anything.
#define PHASING (1<<4)
/// The mob is walking on the ceiling. Or is generally just, upside down.
#define UPSIDE_DOWN (1<<5)

//TURF FLAGS
/// If a turf is an usused reservation turf awaiting assignment
#define UNUSED_RESERVATION_TURF BITFLAG(1)
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -810,3 +810,8 @@
id = ACCESS_TRAMP_FREIGHTER
desc = "Independent Freighter Access"

#define ACCESS_LONE_SPACER 243
/datum/access/lone_spacer_access
id = ACCESS_LONE_SPACER
desc = "Independent Skiff Access"

2 changes: 2 additions & 0 deletions code/__DEFINES/callback.dm → code/__DEFINES/callbacks.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define GLOBAL_PROC "some_magic_bullshit"
/// A shorthand for the callback datum, [documented here](datum/callback.html)
#define CALLBACK new /datum/callback

///Per the DM reference, spawn(-1) will execute the spawned code immediately until a block is met.
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/chemistry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
#define CE_NOPULSE "heartstop" // Stops heartbeat
#define CE_SEDATE "sedation"
#define CE_SLOWDOWN "goslow"
#define CE_SPEEDBOOST "gofast" // Hyperzine
#define CE_STABLE "stable" // Epinephrine
#define CE_PACIFIED "pacified"
#define CE_PAINKILLER "painkiller"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
#define MOVE_ARG_NEW_LOC 1
/// The arugment of move_args which dictates our movement direction
#define MOVE_ARG_DIRECTION 2

///From base of mob/update_movespeed():area
#define COMSIG_MOB_MOVESPEED_UPDATED "mob_update_movespeed"
2 changes: 1 addition & 1 deletion code/__DEFINES/global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ GLOBAL_PROTECT(admin_log)
GLOBAL_LIST_EMPTY(signal_log)
GLOBAL_PROTECT(signal_log)

GLOBAL_LIST_EMPTY(lastsignalers) // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]"
GLOBAL_LIST_EMPTY(lastsignalers) // Keeps last 100 signals here in format: "[src] used REF(src) @ location [src.loc]: [freq]/[code]"
GLOBAL_PROTECT(lastsignalers)

GLOBAL_LIST_EMPTY(lawchanges) // Stores who uploaded laws to which silicon-based lifeform, and what the law was.
Expand Down
6 changes: 1 addition & 5 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@

#define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day

#define DEBUG_REF(D) (D ? "\ref[D]|[D] ([D.type])" : "NULL")
#define DEBUG_REF(D) (D ? "[REF(D)]|[D]] ([D.type])" : "NULL")

// MultiZAS directions.
#define NORTHUP (NORTH|UP)
Expand All @@ -283,10 +283,6 @@
#define NL_TEMPORARY_DISABLE 1
#define NL_PERMANENT_DISABLE 2

///Used for creating soft references to objects. A manner of storing an item reference
///DO NOT USE, USE `WEAKREF()`
#define SOFTREF(A) ref(A)

#define ADD_VERB_IN(the_atom,time,verb) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), the_atom, verb), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
#define ADD_VERB_IN_IF(the_atom,time,verb,callback) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), the_atom, verb, callback), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)

Expand Down
15 changes: 15 additions & 0 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//flags
#define IGNORE_NOSLOW (1 << 0)

//conflict types

#define MOVE_CONFLICT_JETPACK "JETPACK"

//ids
#define MOVESPEED_ID_SANITY "sanity_component"
#define MOVESPEED_ID_STIMULANTS "movespeed_stimulants"

#define MOVESPEED_ID_MOB_GRAB_STATE "mob_grab_state"
#define MOVESPEED_ID_MOB_WALK_RUN "mob_walk_run"

#define MOVESPEED_ID_MIDAS_BLIGHT "midas_blight_debuff"
4 changes: 4 additions & 0 deletions code/__DEFINES/obj_flags.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// Flags for specifically what kind of items to get in get_equipped_items
#define INCLUDE_POCKETS (1<<0)
// #define INCLUDE_ACCESSORIES (1<<1) //We use a different system for this
#define INCLUDE_HELD (1<<2)
2 changes: 1 addition & 1 deletion code/__HELPERS/area_movement.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

if(!A || !src) return

var/list/turfs_src = get_area_turfs("\ref[src]")
var/list/turfs_src = get_area_turfs("[REF(src)]")

if(!turfs_src.len)
return
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ lighting determines lighting capturing (optional), suppress_errors suppreses err

// Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
var/atom/A = thing
var/key = "[istype(A.icon, /icon) ? "[ref(A.icon)]" : A.icon]:[A.icon_state]"
var/key = "[istype(A.icon, /icon) ? "[REF(A.icon)]" : A.icon]:[A.icon_state]"


if (!bicon_cache[key]) // Doesn't exist, make it.
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/logging/_logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))

if(key)
if(include_link && C)
. += "<a href='?priv_msg=\ref[C];ticket=\ref[ticket]'>"
. += "<a href='?priv_msg=[REF(C)];ticket=[REF(ticket)]'>"

if(C && C.holder && C.holder.fakekey && !include_name)
. += "Administrator"
Expand Down Expand Up @@ -176,7 +176,7 @@ GLOBAL_LIST_INIT(testing_global_profiler, list("_PROFILE_NAME" = "Global"))

// Helper procs for building detailed log lines
/datum/proc/get_log_info_line()
return "[src] ([type]) (\ref[src])"
return "[src] ([type]) ([REF(src)])"

/area/get_log_info_line()
return "[..()] ([isnum(z) ? "[x],[y],[z]" : "0,0,0"])"
Expand Down
10 changes: 10 additions & 0 deletions code/__HELPERS/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,13 @@ Proc for attack log creation, because really why not
A.SetName(newname)

fully_replace_character_name(oldname,newname)

///Makes a call in the context of a different usr. Use sparingly
/world/proc/push_usr(mob/user_mob, datum/callback/invoked_callback, ...)
var/temp = usr
usr = user_mob
if (length(args) > 2)
. = invoked_callback.Invoke(arglist(args.Copy(3)))
else
. = invoked_callback.Invoke()
usr = temp
2 changes: 1 addition & 1 deletion code/__HELPERS/text.dm
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
var/list/urls = list()
var/i = 1
while (url_find_lazy.Find_char(message))
urls["\ref[urls]-[i]"] = url_find_lazy.match
urls["[REF(urls)]-[i]"] = url_find_lazy.match
i++

for (var/ref in urls)
Expand Down
6 changes: 3 additions & 3 deletions code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1187,16 +1187,16 @@ var/global/known_proc = /proc/get_type_ref_bytes
return "appearance"
return "unknown-object([refType])" // If you see this you found a new undetectable type. Feel free to add it here.

/proc/get_type_ref_bytes(var/V) // returns first 4 bytes from \ref which denote the object type (for objects that is)
return lowertext(copytext(ref(V), 4, 6))
/proc/get_type_ref_bytes(var/V) // returns first 4 bytes from a ref which denote the object type (for objects that is)
return lowertext(copytext(ref(V), 4, 6)) //Only allowed to remain the builtin ref proc because this shit depends on it and wasn't updated yet

/proc/format_text(text)
return replacetext(replacetext(text,"\proper ",""),"\improper ","")

/proc/topic_link(var/datum/D, var/arglist, var/content)
if(istype(arglist,/list))
arglist = list2params(arglist)
return "<a href='?src=\ref[D];[arglist]'>[content]</a>"
return "<a href='?src=[REF(D)];[arglist]'>[content]</a>"

/proc/get_random_colour(var/simple, var/lower, var/upper)
var/colour
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/lists/mobs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GLOBAL_LIST_EMPTY(mob_config_movespeed_type_lookup)
2 changes: 1 addition & 1 deletion code/_onclick/hud/radial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
if(!user || !anchor || !length(choices))
return
if(!uniqueid)
uniqueid = "defmenu_[SOFTREF(user)]_[SOFTREF(anchor)]"
uniqueid = "defmenu_[REF(user)]_[REF(anchor)]"

if(GLOB.radial_menus[uniqueid])
if(!no_repeat_close)
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/radial_persistent.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
if(!user || !anchor || !length(choices) || !select_proc)
return
if(!uniqueid)
uniqueid = "defmenu_\ref[user]_\ref[anchor]"
uniqueid = "defmenu_[REF(user)]_[REF(anchor)]"

if(GLOB.radial_menus[uniqueid])
return
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystems/arrivals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ SUBSYSTEM_DEF(arrivals)
return

if (istype(M))
current_mobs += SOFTREF(M)
current_mobs += REF(M)

can_fire = TRUE // Wake the process.

if (!wait_for_launch && shuttle.location == 1 && shuttle.moving_status == SHUTTLE_IDLE)
set_launch_countdown()

/datum/controller/subsystem/arrivals/proc/on_hotzone_exit(mob/living/M)
current_mobs -= SOFTREF(M)
current_mobs -= REF(M)

//called when the shuttle has arrived.

Expand Down
46 changes: 23 additions & 23 deletions code/controllers/subsystems/event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ SUBSYSTEM_DEF(events)
to_world(message)

/datum/controller/subsystem/events/proc/GetInteractWindow()
var/html = "<A align='right' href='?src=\ref[src];refresh=1'>Refresh</A>"
html += "<A align='right' href='?src=\ref[src];pause_all=[!GLOB.config.allow_random_events]'>Pause All - [GLOB.config.allow_random_events ? "Pause" : "Resume"]</A>"
var/html = "<A align='right' href='?src=[REF(src)];refresh=1'>Refresh</A>"
html += "<A align='right' href='?src=[REF(src)];pause_all=[!GLOB.config.allow_random_events]'>Pause All - [GLOB.config.allow_random_events ? "Pause" : "Resume"]</A>"

if(selected_event_container)
var/event_time = max(0, selected_event_container.next_event_time - world.time)
html += "<A align='right' href='?src=\ref[src];back=1'>Back</A><br>"
html += "<A align='right' href='?src=[REF(src)];back=1'>Back</A><br>"
html += "Time till start: [round(event_time / 600, 0.1)]<br>"
html += "<div class='block'>"
html += "<h2>Available [severity_to_string[selected_event_container.severity]] Events (queued & running events will not be displayed)</h2>"
Expand All @@ -138,13 +138,13 @@ SUBSYSTEM_DEF(events)
for(var/datum/event_meta/EM in selected_event_container.available_events)
html += "<tr>"
html += "<td>[EM.name]</td>"
html += "<td><A align='right' href='?src=\ref[src];set_weight=\ref[EM]'>[EM.weight]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];set_weight=[REF(EM)]'>[EM.weight]</A></td>"
html += "<td>[EM.min_weight]</td>"
html += "<td>[EM.max_weight]</td>"
html += "<td><A align='right' href='?src=\ref[src];toggle_oneshot=\ref[EM]'>[EM.one_shot]</A></td>"
html += "<td><A align='right' href='?src=\ref[src];toggle_enabled=\ref[EM]'>[EM.enabled]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];toggle_oneshot=[REF(EM)]'>[EM.one_shot]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];toggle_enabled=[REF(EM)]'>[EM.enabled]</A></td>"
html += "<td><span class='alert'>[selected_event_container.get_weight(EM, active_with_role)]</span></td>"
html += "<td><A align='right' href='?src=\ref[src];remove=\ref[EM];EC=\ref[selected_event_container]'>Remove</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];remove=[REF(EM)];EC=[REF(selected_event_container)]'>Remove</A></td>"
html += "</tr>"
html += "</table>"
html += "</div>"
Expand All @@ -154,16 +154,16 @@ SUBSYSTEM_DEF(events)
html += "<table[table_options]>"
html += "<tr><td[row_options2]>Name</td><td[row_options2]>Type</td><td[row_options1]>Weight</td><td[row_options1]>OneShot</td></tr>"
html += "<tr>"
html += "<td><A align='right' href='?src=\ref[src];set_name=\ref[new_event]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
html += "<td><A align='right' href='?src=\ref[src];set_type=\ref[new_event]'>[new_event.event_type ? new_event.event_type : "Select Type"]</A></td>"
html += "<td><A align='right' href='?src=\ref[src];set_weight=\ref[new_event]'>[new_event.weight ? new_event.weight : 0]</A></td>"
html += "<td><A align='right' href='?src=\ref[src];toggle_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];set_name=[REF(new_event)]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];set_type=[REF(new_event)]'>[new_event.event_type ? new_event.event_type : "Select Type"]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];set_weight=[REF(new_event)]'>[new_event.weight ? new_event.weight : 0]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];toggle_oneshot=[REF(new_event)]'>[new_event.one_shot]</A></td>"
html += "</tr>"
html += "</table>"
html += "<A align='right' href='?src=\ref[src];add=\ref[selected_event_container]'>Add</A><br>"
html += "<A align='right' href='?src=[REF(src)];add=[REF(selected_event_container)]'>Add</A><br>"
html += "</div>"
else
html += "<A align='right' href='?src=\ref[src];toggle_report=1'>Round End Report: [report_at_round_end ? "On": "Off"]</A><br>"
html += "<A align='right' href='?src=[REF(src)];toggle_report=1'>Round End Report: [report_at_round_end ? "On": "Off"]</A><br>"
html += "<div class='block'>"
html += "<h2>Event Start</h2>"

Expand All @@ -177,16 +177,16 @@ SUBSYSTEM_DEF(events)
html += "<td>[worldtime2text(max(EC.next_event_time, world.time))]</td>"
html += "<td>[round(next_event_at / 600, 0.1)]</td>"
html += "<td>"
html += "<A align='right' href='?src=\ref[src];dec_timer=2;event=\ref[EC]'>--</A>"
html += "<A align='right' href='?src=\ref[src];dec_timer=1;event=\ref[EC]'>-</A>"
html += "<A align='right' href='?src=\ref[src];inc_timer=1;event=\ref[EC]'>+</A>"
html += "<A align='right' href='?src=\ref[src];inc_timer=2;event=\ref[EC]'>++</A>"
html += "<A align='right' href='?src=[REF(src)];dec_timer=2;event=[REF(EC)]'>--</A>"
html += "<A align='right' href='?src=[REF(src)];dec_timer=1;event=[REF(EC)]'>-</A>"
html += "<A align='right' href='?src=[REF(src)];inc_timer=1;event=[REF(EC)]'>+</A>"
html += "<A align='right' href='?src=[REF(src)];inc_timer=2;event=[REF(EC)]'>++</A>"
html += "</td>"
html += "<td>"
html += "<A align='right' href='?src=\ref[src];pause=\ref[EC]'>[EC.delayed ? "Resume" : "Pause"]</A>"
html += "<A align='right' href='?src=[REF(src)];pause=[REF(EC)]'>[EC.delayed ? "Resume" : "Pause"]</A>"
html += "</td>"
html += "<td>"
html += "<A align='right' href='?src=\ref[src];interval=\ref[EC]'>[EC.delay_modifier]</A>"
html += "<A align='right' href='?src=[REF(src)];interval=[REF(EC)]'>[EC.delay_modifier]</A>"
html += "</td>"
html += "</tr>"
html += "</table>"
Expand All @@ -201,9 +201,9 @@ SUBSYSTEM_DEF(events)
var/datum/event_meta/EM = EC.next_event
html += "<tr>"
html += "<td>[severity_to_string[severity]]</td>"
html += "<td><A align='right' href='?src=\ref[src];select_event=\ref[EC]'>[EM ? EM.name : "Random"]</A></td>"
html += "<td><A align='right' href='?src=\ref[src];view_events=\ref[EC]'>View</A></td>"
html += "<td><A align='right' href='?src=\ref[src];clear=\ref[EC]'>Clear</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];select_event=[REF(EC)]'>[EM ? EM.name : "Random"]</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];view_events=[REF(EC)]'>View</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];clear=[REF(EC)]'>Clear</A></td>"
html += "</tr>"
html += "</table>"
html += "</div>"
Expand All @@ -224,7 +224,7 @@ SUBSYSTEM_DEF(events)
html += "<td>[EM.name]</td>"
html += "<td>[worldtime2text(ends_at)]</td>"
html += "<td>[ends_in]</td>"
html += "<td><A align='right' href='?src=\ref[src];stop=\ref[E]'>Stop</A></td>"
html += "<td><A align='right' href='?src=[REF(src)];stop=[REF(E)]'>Stop</A></td>"
html += "</tr>"
html += "</table>"
html += "</div>"
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystems/garbage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ SUBSYSTEM_DEF(garbage)
if(!check_rights(R_ADMIN, user = admin?.mob))
continue
// Used to be to_chat(admin, "## TESTING: GC: -- [ADMIN_VV(D)] | [type] was unable to be GC'd --") but we do not have that macro
to_chat(admin, "## TESTING: GC: -- <a href='?_src_=vars;Vars=\ref[D]'>VV</a> | [type] was unable to be GC'd --")
to_chat(admin, "## TESTING: GC: -- <a href='?_src_=vars;Vars=[REF(D)]'>VV</a> | [type] was unable to be GC'd --")
#endif
I.failures++

Expand Down
Loading

0 comments on commit cb3caac

Please sign in to comment.