cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 15:01:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed destination tagger not working if the destination area has an apostrophe (#19265)

Browse Source 
Fixed destination tagger not working if the destination area has an
apostrophe in the name.
This commit is contained in:
Fluffy
2024-05-31 20:15:05 +00:00
committed by GitHub
parent 51faab108a
commit c7b373ca8f
2 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/sortingmachinery.dm
+8 -5
View File
@@ -258,12 +258,12 @@
obj_flags = OBJ_FLAG_CONDUCTABLE
slot_flags = SLOT_BELT
/obj/item/device/destTagger/proc/openwindow(mob/user as mob)
/obj/item/device/destTagger/proc/openwindow(mob/user)
var/dat = "<tt><center><h1><b>TagMaster 2.3</b></h1></center>"
dat += "<table style='width:100%; padding:4px;'><tr>"
for(var/i = 1, i <= SSdisposals.tagger_locations.len, i++)
dat += "<td><a href='?src=\ref[src];nextTag=[SSdisposals.tagger_locations[i]]'>[SSdisposals.tagger_locations[i]]</a></td>"
dat += "<td><a href='?src=\ref[src];nextTag=[html_encode(SSdisposals.tagger_locations[i])]'>[SSdisposals.tagger_locations[i]]</a></td>"
if (i % 4==0)
dat += "</tr><tr>"
@@ -273,20 +273,23 @@
user << browse(dat, "window=destTagScreen;size=450x375")
onclose(user, "destTagScreen")
/obj/item/device/destTagger/attack_self(mob/user as mob)
/obj/item/device/destTagger/attack_self(mob/user)
openwindow(user)
return
/obj/item/device/destTagger/Topic(href, href_list)
src.add_fingerprint(usr)
if(href_list["nextTag"] && (href_list["nextTag"] in SSdisposals.tagger_locations))
src.currTag = href_list["nextTag"]
if(href_list["nextTag"] && (html_decode(href_list["nextTag"]) in SSdisposals.tagger_locations))
src.currTag = html_decode(href_list["nextTag"])
if(href_list["nextTag"] == "CUSTOM")
var/dest = input("Please enter custom location.", "Location", src.currTag ? src.currTag : "None")
if(dest != "None")
src.currTag = dest
else
src.currTag = 0
openwindow(usr)
/obj/machinery/disposal/deliveryChute