Merge pull request #10351 from Citinited/duct-tape-stick-tweak

You can stick duct tape to more than just paper now
This commit is contained in:
variableundefined
2018-12-11 20:18:05 +08:00
committed by GitHub
26 changed files with 204 additions and 167 deletions
@@ -148,8 +148,8 @@
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
label_text = tmp_label
update_name_label()
if(istype(I,/obj/item/storage/bag))
..()
else
return ..()
/obj/item/reagent_containers/glass/proc/update_name_label()
if(label_text == "")
@@ -201,6 +201,7 @@
overlays += lid
if(assembly)
overlays += "assembly"
..()
/obj/item/reagent_containers/glass/beaker/verb/remove_assembly()
set name = "Remove Assembly"