Merge pull request #5568 from Citadel-Station-13/upstream-merge-35746

[MIRROR] Actually fixes SCP 294 overlay problems
This commit is contained in:
deathride58
2018-02-18 23:30:20 +00:00
committed by GitHub
@@ -46,6 +46,7 @@
/obj/machinery/chem_dispenser/scp_294/ui_act(action, params)
if(..())
return
update_icon()
switch(action)
if("ejectBeaker")
if(beaker)
@@ -53,7 +54,6 @@
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
cut_overlays()
. = TRUE
if("input")
var/input_reagent = replacetext(lowertext(input("Enter the name of any liquid", "Input") as text), " ", "") //95% of the time, the reagent id is a lowercase/no spaces version of the name