Skip to content

Commit

Permalink
Fixed destination tagger not working if the destination area has an a…
Browse files Browse the repository at this point in the history
…postrophe (Aurorastation#19265)

Fixed destination tagger not working if the destination area has an
apostrophe in the name.
  • Loading branch information
FluffyGhoster authored May 31, 2024
1 parent 51faab1 commit c7b373c
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 5 deletions.
13 changes: 8 additions & 5 deletions code/modules/recycling/sortingmachinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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>"
Expand All @@ -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
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/fluffyghost-fixdesttagerapostrophe.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: FluffyGhost

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed destination tagger not working if the destination area has an apostrophe in the name."

0 comments on commit c7b373c

Please sign in to comment.