Skip to content

Commit

Permalink
Merge pull request #18 from NebulaSS13/dev
Browse files Browse the repository at this point in the history 
Update from Neb dev
  • Loading branch information
@MistakeNot4892
MistakeNot4892 authored Jun 24, 2024
2 parents 7364505 + eb78b0b commit 349c6ed
Show file tree
Hide file tree
Showing 212 changed files with 1,035 additions and 1,041 deletions.
2 changes: 1 addition & 1 deletion code/_helpers/logging.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ var/global/log_end= world.system_type == UNIX ? ascii2text(13) : ""

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

. += key

Expand Down
2 changes: 1 addition & 1 deletion code/_macros.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

/proc/place_meta_charset(content)
if(istext(content))
content = "<meta charset=\"utf-8\">" + content
content = "<!DOCTYPE html><meta charset=\"utf-8\">" + content
return content

#define to_chat(target, message) target << (message)
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/screen/screen_holomap.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
/obj/screen/holomap_legend/Initialize(mapload, mob/_owner, ui_style, ui_color, ui_alpha, map_color, text)
. = ..()
saved_color = map_color
maptext = "<a href='?src=\ref[src]' style=\"font-family: 'Small Fonts'; color: [map_color]; -dm-text-outline: 1 [COLOR_BLACK]; font-size: 6px\">[text]</a>"
maptext = "<a href='byond://?src=\ref[src]' style=\"font-family: 'Small Fonts'; color: [map_color]; -dm-text-outline: 1 [COLOR_BLACK]; font-size: 6px\">[text]</a>"
alpha = 255

/obj/screen/holomap_legend/handle_click(mob/user, params)
Expand Down
46 changes: 23 additions & 23 deletions code/controllers/subsystems/event.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ SUBSYSTEM_DEF(event)
//Event manager UI
/datum/controller/subsystem/event/proc/GetInteractWindow()
var/allow_random_events = get_config_value(/decl/config/toggle/allow_random_events)
var/html = "<A align='right' href='?src=\ref[src];refresh=1'>Refresh</A>"
html += "<A align='right' href='?src=\ref[src];pause_all=[!allow_random_events]'>Pause All - [allow_random_events ? "Pause" : "Resume"]</A>"
var/html = "<A align='right' href='byond://?src=\ref[src];refresh=1'>Refresh</A>"
html += "<A align='right' href='byond://?src=\ref[src];pause_all=[!allow_random_events]'>Pause All - [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='byond://?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 @@ -142,13 +142,13 @@ SUBSYSTEM_DEF(event)
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='byond://?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='byond://?src=\ref[src];toggle_oneshot=\ref[EM]'>[EM.one_shot]</A></td>"
html += "<td><A align='right' href='byond://?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='byond://?src=\ref[src];remove=\ref[EM];EC=\ref[selected_event_container]'>Remove</A></td>"
html += "</tr>"
html += "</table>"
html += "</div>"
Expand All @@ -158,16 +158,16 @@ SUBSYSTEM_DEF(event)
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='byond://?src=\ref[src];set_name=\ref[new_event]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
html += "<td><A align='right' href='byond://?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='byond://?src=\ref[src];set_weight=\ref[new_event]'>[new_event.weight ? new_event.weight : 0]</A></td>"
html += "<td><A align='right' href='byond://?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='byond://?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='byond://?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 @@ -181,16 +181,16 @@ SUBSYSTEM_DEF(event)
html += "<td>[worldtime2stationtime(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='byond://?src=\ref[src];dec_timer=2;event=\ref[EC]'>--</A>"
html += "<A align='right' href='byond://?src=\ref[src];dec_timer=1;event=\ref[EC]'>-</A>"
html += "<A align='right' href='byond://?src=\ref[src];inc_timer=1;event=\ref[EC]'>+</A>"
html += "<A align='right' href='byond://?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='byond://?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='byond://?src=\ref[src];interval=\ref[EC]'>[EC.delay_modifier]</A>"
html += "</td>"
html += "</tr>"
html += "</table>"
Expand All @@ -205,9 +205,9 @@ SUBSYSTEM_DEF(event)
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='byond://?src=\ref[src];select_event=\ref[EC]'>[EM ? EM.name : "Random"]</A></td>"
html += "<td><A align='right' href='byond://?src=\ref[src];view_events=\ref[EC]'>View</A></td>"
html += "<td><A align='right' href='byond://?src=\ref[src];clear=\ref[EC]'>Clear</A></td>"
html += "</tr>"
html += "</table>"
html += "</div>"
Expand All @@ -228,7 +228,7 @@ SUBSYSTEM_DEF(event)
html += "<td>[EM.name]</td>"
html += "<td>[worldtime2stationtime(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='byond://?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/initialization/codex.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(codex)
var/datum/codex_entry/linked_entry = get_entry_by_string(key)
var/replacement = linkRegex.group[4]
if(linked_entry)
replacement = "<a href='?src=\ref[SScodex];show_examined_info=\ref[linked_entry];show_to=\ref[viewer]'>[replacement]</a>"
replacement = "<a href='byond://?src=\ref[SScodex];show_examined_info=\ref[linked_entry];show_to=\ref[viewer]'>[replacement]</a>"
string = replacetextEx(string, linkRegex.match, replacement)
return string

Expand Down
8 changes: 4 additions & 4 deletions code/controllers/subsystems/vote.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,24 @@ SUBSYSTEM_DEF(vote)
if(active_vote)
. += active_vote.interface(C.mob)
if(admin)
. += "(<a href='?src=\ref[src];cancel=1'>Cancel Vote</a>) "
. += "(<a href='byond://?src=\ref[src];cancel=1'>Cancel Vote</a>) "
else
. += "<h2>Start a vote:</h2><hr><ul>"
for(var/vote_type in vote_prototypes)
var/datum/vote/vote_datum = vote_prototypes[vote_type]
. += "<li><a href='?src=\ref[src];vote=\ref[vote_datum.type]'>"
. += "<li><a href='byond://?src=\ref[src];vote=\ref[vote_datum.type]'>"
if(vote_datum.can_run(C.mob))
. += "[capitalize(vote_datum.name)]"
else
. += "<font color='grey'>[capitalize(vote_datum.name)] (Disallowed)</font>"
. += "</a>"
var/toggle = vote_datum.check_toggle()
if(admin && toggle)
. += "\t(<a href='?src=\ref[src];toggle=1;vote=\ref[vote_datum.type]'>toggle; currently [toggle]</a>)"
. += "\t(<a href='byond://?src=\ref[src];toggle=1;vote=\ref[vote_datum.type]'>toggle; currently [toggle]</a>)"
. += "</li>"
. += "</ul><hr>"

. += "<a href='?src=\ref[src];close=1' style='position:absolute;right:50px'>Close</a></body></html>"
. += "<a href='byond://?src=\ref[src];close=1' style='position:absolute;right:50px'>Close</a></body></html>"
return JOINTEXT(.)

/datum/controller/subsystem/vote/proc/show_panel(mob/user, force_open)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystems/zcopy.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ SUBSYSTEM_DEF(zcopy)
/datum/controller/subsystem/zcopy/proc/fmt_label(label, atom/target, vv = TRUE)
. = "\icon[target] <b>\[[label]\]</b> "
if (vv)
. += "(<a href='?_src_=vars;Vars=\ref[target]'>VV</a>) "
. += "(<a href='byond://?_src_=vars;Vars=\ref[target]'>VV</a>) "

/datum/controller/subsystem/zcopy/proc/debug_fmt_planelist(list/things, list/out, turf/original)
if (things)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/communication/pray.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
if(!M.client)
continue
if(M.client.holder && M.client.get_preference_value(/datum/client_preference/staff/show_chat_prayers) == PREF_SHOW)
receive_communication(communicator, M, "\[<A HREF='?_src_=holder;adminspawnprayreward=\ref[communicator]'>SC</a>\] \[<A HREF='?_src_=holder;narrateto=\ref[communicator]'>DN</a>\]<span class='notice'>[html_icon(cross)] <b>[SPAN_PURPLE("PRAY: ")][key_name(communicator, 1)]: </b>[message]</span>")
receive_communication(communicator, M, "\[<A HREF='byond://?_src_=holder;adminspawnprayreward=\ref[communicator]'>SC</a>\] \[<A HREF='byond://?_src_=holder;narrateto=\ref[communicator]'>DN</a>\]<span class='notice'>[html_icon(cross)] <b>[SPAN_PURPLE("PRAY: ")][key_name(communicator, 1)]: </b>[message]</span>")
else if(communicator == M) //Give it to ourselves
receive_communication(communicator, M, "<span class='notice'>[html_icon(cross)] <b>You send the prayer, \"[message]\" out into the heavens.</b></span>")

Expand Down
2 changes: 1 addition & 1 deletion code/datums/extensions/multitool/circuitboards/buildtype_select.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
if(path == board.build_path)
dat += "<td><span class='good'>&#9724</span></td><td>[initial(thing.name)]</td>"
else
dat += "<td><span class='bad'>&#9724</span></td><td><a href='?src=\ref[src];choose=\ref[path]'>[initial(thing.name)]</a></td>"
dat += "<td><span class='bad'>&#9724</span></td><td><a href='byond://?src=\ref[src];choose=\ref[path]'>[initial(thing.name)]</a></td>"
dat += "</tr>"
dat += "</table>"
return JOINTEXT(dat)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/extensions/multitool/circuitboards/shuttle_console.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
var/obj/item/stock_parts/circuitboard/shuttle_console/board = holder
var/dat = list()
dat += "<b>Current Selected Shuttle:</b> [board.shuttle_tag || "NONE"]<br>"
dat += "<a href='?src=\ref[src];sync=1'>Synchronize to current shuttle.</a>"
dat += "<a href='byond://?src=\ref[src];sync=1'>Synchronize to current shuttle.</a>"
return JOINTEXT(dat)

/datum/extension/interactive/multitool/circuitboards/shuttle_console/on_topic(href, href_list, user)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/extensions/multitool/circuitboards/stationalert.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
. += "<tr>"
. += "<td>[AH.category]</td>"
if(AH in SA.alarm_handlers)
. += "<td><span class='good'>&#9724</span>Active</td><td><a href='?src=\ref[src];remove=\ref[AH]'>Inactivate</a></td>"
. += "<td><span class='good'>&#9724</span>Active</td><td><a href='byond://?src=\ref[src];remove=\ref[AH]'>Inactivate</a></td>"
else
. += "<td><span class='bad'>&#9724</span>Inactive</td><td><a href='?src=\ref[src];add=\ref[AH]'>Activate</a></td>"
. += "<td><span class='bad'>&#9724</span>Inactive</td><td><a href='byond://?src=\ref[src];add=\ref[AH]'>Activate</a></td>"
. += "</tr>"
. += "</table>"

Expand Down
2 changes: 1 addition & 1 deletion code/datums/extensions/multitool/items/cable.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
if(cable_coil.color == possible_cable_colours[cable_color])
. += "<td>Selected</td>"
else
. += "<td><a href='?src=\ref[src];select_color=[cable_color]'>Select</a></td>"
. += "<td><a href='byond://?src=\ref[src];select_color=[cable_color]'>Select</a></td>"
. += "</tr>"
. += "</table>"

Expand Down
28 changes: 14 additions & 14 deletions code/datums/extensions/multitool/items/stock_parts_radio.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
var/obj/item/stock_parts/radio/radio = holder
if(radio.status & PART_STAT_INSTALLED)
return STATUS_CLOSE
return ..()
return ..()

/datum/extension/interactive/multitool/radio/interact(obj/item/multitool/M, mob/user)
if(extension_status(user) != STATUS_INTERACTIVE)
Expand Down Expand Up @@ -34,15 +34,15 @@
var/obj/item/stock_parts/radio/radio = holder
var/list/dat = list()

dat += "<a href='?src=\ref[src];unlink=1'>Unlink Machine</a><br>"
dat += "<a href='byond://?src=\ref[src];unlink=1'>Unlink Machine</a><br>"
var/obj/machinery/actual_machine = machine && machine.resolve()
if(actual_machine && actual_machine.can_apply_preset_to(radio))
dat += "<a href='?src=\ref[src];stockreset=1'>Reset to Machine Defaults</a><br>"
dat += "<a href='byond://?src=\ref[src];stockreset=1'>Reset to Machine Defaults</a><br>"
dat += "<b>Configuration for \the [radio].</b><br>"
dat += "Frequency: <a href='?src=\ref[src];frequency=1'>[radio.frequency || "none"]</a><br>"
dat += "ID: <a href='?src=\ref[src];id_tag=1'>[radio.id_tag || "none"]</a><br>"
dat += "Filter: <a href='?src=\ref[src];filter=1'>[radio.filter || "none"]</a><br>"
dat += "Encryption key: <a href='?src=\ref[src];encryption=1'>[radio.encryption || "none"]</a><br>"
dat += "Frequency: <a href='byond://?src=\ref[src];frequency=1'>[radio.frequency || "none"]</a><br>"
dat += "ID: <a href='byond://?src=\ref[src];id_tag=1'>[radio.id_tag || "none"]</a><br>"
dat += "Filter: <a href='byond://?src=\ref[src];filter=1'>[radio.filter || "none"]</a><br>"
dat += "Encryption key: <a href='byond://?src=\ref[src];encryption=1'>[radio.encryption || "none"]</a><br>"
return JOINTEXT(dat)

/datum/extension/interactive/multitool/radio/on_topic(href, href_list, user)
Expand Down Expand Up @@ -98,13 +98,13 @@
. += "<table>"
for(var/thing in selected_events)
. += "<tr>"
. += "<td><a href='?src=\ref[src];[table_tag]=1;remove=[thing]'>(-)</a></td>"
. += "<td><a href='?src=\ref[src];[table_tag]=1;rename=[thing]'>[thing]</a></td>"
. += "<td><a href='byond://?src=\ref[src];[table_tag]=1;remove=[thing]'>(-)</a></td>"
. += "<td><a href='byond://?src=\ref[src];[table_tag]=1;rename=[thing]'>[thing]</a></td>"
var/decl/public_access/variable = selected_events[thing]
. += "<td><a href='?src=\ref[src];[table_tag]=1;new_val=[thing]'>[variable.name]</a></td>"
. += "<td><a href='?src=\ref[src];[table_tag]=1;desc=\ref[variable]'>(?)</a></td>"
. += "<td><a href='byond://?src=\ref[src];[table_tag]=1;new_val=[thing]'>[variable.name]</a></td>"
. += "<td><a href='byond://?src=\ref[src];[table_tag]=1;desc=\ref[variable]'>(?)</a></td>"
. += "</tr>"
. += "<tr><td><a href='?src=\ref[src];[table_tag]=1;add=1'>(+)</a></td></tr>"
. += "<tr><td><a href='byond://?src=\ref[src];[table_tag]=1;add=1'>(+)</a></td></tr>"
. += "</table>"

/datum/extension/interactive/multitool/radio/proc/event_list_topic(list/selected_events, list/valid_events, mob/user, href_list)
Expand Down Expand Up @@ -202,9 +202,9 @@

dat += "<b>Choose event:</b><br>"
if(radio.event)
dat += "<a href='?src=\ref[src];event=1;new_val=event'>[radio.event]</a> (<a href='?src=\ref[src];event=1;desc=\ref[radio.event]'>?</a>)"
dat += "<a href='byond://?src=\ref[src];event=1;new_val=event'>[radio.event]</a> (<a href='byond://?src=\ref[src];event=1;desc=\ref[radio.event]'>?</a>)"
else
dat += "<a href='?src=\ref[src];event=1;add=1'>(+)</a>"
dat += "<a href='byond://?src=\ref[src];event=1;add=1'>(+)</a>"
dat += "<br>"
dat += "<b>Transmit on event:</b><br>"
dat += event_list_to_selection_table("on_event", radio.transmit_on_event)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/extensions/multitool/multitool.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
. += "<b>Buffer Memory:</b><br>"
var/buffer_name = multitool.get_buffer_name()
if(buffer_name)
. += "[buffer_name] <a href='?src=\ref[src];send=\ref[multitool.buffer_object]'>Send</a> <a href='?src=\ref[src];purge=1'>Purge</a><br>"
. += "[buffer_name] <a href='byond://?src=\ref[src];send=\ref[multitool.buffer_object]'>Send</a> <a href='byond://?src=\ref[src];purge=1'>Purge</a><br>"
else
. += "No connection stored in the buffer."

Expand Down
2 changes: 1 addition & 1 deletion code/datums/mind/memory.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
if(owner_name != last_owner_name)
output += "<B>[current.real_name]'s Memories</B><HR>"
last_owner_name = owner_name
output += "[M.memory] <a href='?src=\ref[src];remove_memory=\ref[M]'>\[Remove\]</a>"
output += "[M.memory] <a href='byond://?src=\ref[src];remove_memory=\ref[M]'>\[Remove\]</a>"

if(objectives.len > 0)
output += "<HR><B>Objectives:</B>"
Expand Down
10 changes: 5 additions & 5 deletions code/datums/mind/mind.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

var/out = "<B>[name]</B>[(current&&(current.real_name!=name))?" (as [current.real_name])":""]<br>"
out += "Mind currently owned by key: [key] [active?"(synced)":"(not synced)"]<br>"
out += "Assigned role: [assigned_role]. <a href='?src=\ref[src];role_edit=1'>Edit</a><br>"
out += "Assigned role: [assigned_role]. <a href='byond://?src=\ref[src];role_edit=1'>Edit</a><br>"
out += "<hr>"
out += "Factions and special roles:<br><table>"
var/list/all_antag_types = decls_repository.get_decls_of_subtype(/decl/special_role)
Expand All @@ -126,16 +126,16 @@
var/num = 1
for(var/datum/objective/O in objectives)
out += "<b>Objective #[num]:</b> [O.explanation_text] "
out += " <a href='?src=\ref[src];obj_delete=\ref[O]'>\[remove\]</a><br>"
out += " <a href='byond://?src=\ref[src];obj_delete=\ref[O]'>\[remove\]</a><br>"
num++
out += "<br><a href='?src=\ref[src];obj_announce=1'>\[announce objectives\]</a>"
out += "<br><a href='byond://?src=\ref[src];obj_announce=1'>\[announce objectives\]</a>"

else
out += "None."
out += "<br><a href='?src=\ref[src];obj_add=1'>\[add\]</a><br><br>"
out += "<br><a href='byond://?src=\ref[src];obj_add=1'>\[add\]</a><br><br>"

var/datum/goal/ambition/ambition = SSgoals.ambitions[src]
out += "<b>Ambitions:</b> [ambition ? ambition.description : "None"] <a href='?src=\ref[src];amb_edit=\ref[src]'>\[edit\]</a></br>"
out += "<b>Ambitions:</b> [ambition ? ambition.description : "None"] <a href='byond://?src=\ref[src];amb_edit=\ref[src]'>\[edit\]</a></br>"
show_browser(usr, out, "window=edit_memory[src]")

/datum/mind/proc/get_goal_from_href(var/href)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/repositories/client.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var/global/repository/client/client_repository = new()
return "[key]/([name]) (DC)"
if(check_if_offline && !client_by_ckey(ckey))
return "[key]/([name]) (DC)"
return pm_link ? "<a href='?priv_msg=[ref];ticket=\ref[ticket]'>[key]</a>/([name])[rank2text()]" : "[key]/([name])"
return pm_link ? "<a href='byond://?priv_msg=[ref];ticket=\ref[ticket]'>[key]</a>/([name])[rank2text()]" : "[key]/([name])"

/datum/client_lite/proc/rank2text()
var/client/C = client_by_ckey(ckey)
Expand Down
2 changes: 1 addition & 1 deletion code/datums/trading/trading_verbs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
to_chat(src, "<b>[hub.name]:</b>")
for(var/a in hub.traders)
var/datum/trader/T = a
to_chat(src, "[T.name] <a href='?_src_=vars;Vars=\ref[T]'>\ref[T]</a>")
to_chat(src, "[T.name] <a href='byond://?_src_=vars;Vars=\ref[T]'>\ref[T]</a>")

/client/proc/add_trader()
set category = "Debug"
Expand Down
Loading

0 comments on commit 349c6ed

Please sign in to comment.