cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes smartfridges not being able to dispense things with \improper or \proper in the name. (#7201)

Browse Source 
* Fixes smartfridges not being able to dispense things with \improper or \proper in the name. (#60417)

This PR fixes the inability for smartfridges to dispense items which specified \proper or \improper in their name. There are more details to the bug in the issue report, but this PR fixes it by using the format_text proc when comparing the names, which strips strings of the \improper and \proper tags so they can compare accurately.

This PR also cleans up a slight about of the smartfridge code. For some reason it had a unique case for needing to dispense only one item, but the loop is the same for both cases.

* Fixes smartfridges not being able to dispense things with \improper or \proper in the name.

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-28 22:57:37 +01:00
committed by GitHub
co-authored by MrMelbert
parent 4b17b3b520
commit 0bd8bd9a8c
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+12 -16
View File
@@ -215,32 +215,28 @@
desired = text2num(params["amount"])
else
desired = input("How many items?", "How many items would you like to take out?", 1) as null|num
if(!desired)
return FALSE
if(QDELETED(src) || QDELETED(usr) || !usr.Adjacent(src)) // Sanity checkin' in case stupid stuff happens while we wait for input()
return FALSE
if(desired == 1 && Adjacent(usr) && !issilicon(usr))
for(var/obj/item/O in src)
if(O.name == params["name"])
if(O in component_parts)
CRASH("Attempted removal of [O] component_part from vending machine via vending interface.")
dispense(O, usr)
break
if (visible_contents)
update_appearance()
return TRUE
for(var/obj/item/O in src)
for(var/obj/item/dispensed_item in src)
if(desired <= 0)
break
if(O.name == params["name"])
if(O in component_parts)
CRASH("Attempted removal of [O] component_part from vending machine via vending interface.")
dispense(O, usr)
// Grab the first item in contents which name matches our passed name.
// format_text() is used here to strip \improper and \proper from both names,
// which is required for correct string comparison between them.
if(format_text(dispensed_item.name) == format_text(params["name"]))
if(dispensed_item in component_parts)
CRASH("Attempted removal of [dispensed_item] component_part from smartfridge via smartfridge interface.")
dispense(dispensed_item, usr)
desired--
if (visible_contents)
update_appearance()
return TRUE
return FALSE