Skip to content

fixes statpanel by porting #66971 and #63991 from tg #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manofpepsi wants to merge 1 commit into
base: master
Choose a base branch
from
+1,485 −1,459
Open

fixes statpanel by porting #66971 and #63991 from tg #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions code/__DEFINES/statpanel.dm
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions code/__HELPERS/verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,8 @@
for(var/thing in verbs_list)
var/procpath/verb_to_add = thing
output_list[++output_list.len] = list(verb_to_add.category, verb_to_add.name)
output_list = url_encode(json_encode(output_list))

target << output("[output_list];", "statbrowser:add_verb_list")
target.stat_panel.send_message("add_verb_list", output_list)

/**
* handles removing verb and sending it to browser to update, use this for removing verbs
Expand Down Expand Up @@ -91,6 +90,5 @@
for(var/thing in verbs_list)
var/procpath/verb_to_remove = thing
output_list[++output_list.len] = list(verb_to_remove.category, verb_to_remove.name)
output_list = url_encode(json_encode(output_list))

target << output("[output_list];", "statbrowser:remove_verb_list")
target.stat_panel.send_message("remove_verb_list", output_list)
4 changes: 2 additions & 2 deletions code/_onclick/click.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@
var/turf/T = get_turf(src)
if(T && (isturf(loc) || isturf(src)) && user.TurfAdjacent(T))
user.listed_turf = T
user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
user.client.stat_panel.send_message("create_listedturf", T.name)

///The base proc of when something is right clicked on when alt is held - generally use alt_click_secondary instead
/atom/proc/alt_click_on_secondary(atom/A)
Expand All @@ -425,7 +425,7 @@
var/turf/T = get_turf(A)
if(T && user.TurfAdjacent(T))
user.listed_turf = T
user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
user.client.stat_panel.send_message("create_listedturf", T.name)

/mob/proc/TurfAdjacent(turf/T)
return T.Adjacent(src)
Expand Down
Loading
Loading