Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839

[MIRROR] [s] Adds a security token to all admin hrefs
This commit is contained in:
LetterJay
2017-09-12 01:17:56 -05:00
committed by GitHub
32 changed files with 750 additions and 637 deletions
+4 -4
View File
@@ -614,10 +614,10 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons)
. += "---"
var/turf/curturf = get_turf(src)
if (curturf)
.["Jump to"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
.["Add reagent"] = "?_src_=vars;addreagent=\ref[src]"
.["Trigger EM pulse"] = "?_src_=vars;emp=\ref[src]"
.["Trigger explosion"] = "?_src_=vars;explode=\ref[src]"
.["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
.["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=\ref[src]"
.["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=\ref[src]"
.["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=\ref[src]"
/atom/proc/drop_location()
var/atom/L = loc
+1 -1
View File
@@ -497,7 +497,7 @@
/atom/movable/vv_get_dropdown()
. = ..()
. -= "Jump to"
.["Follow"] = "?_src_=holder;adminplayerobservefollow=\ref[src]"
.["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[src]"
/atom/movable/proc/ex_check(ex_id)
if(!ex_id)
+1 -1
View File
@@ -199,7 +199,7 @@
/obj/vv_get_dropdown()
. = ..()
.["Delete all of type"] = "?_src_=vars;delall=\ref[src]"
.["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=\ref[src]"
/obj/examine(mob/user)
..()