Merge branch 'master' into upstream-merge-33470

2017-12-21 03:24:03 -06:00
parent 1b6b8a7c00 56ecc13289
commit 3973b368de
327 changed files with 4405 additions and 3275 deletions
@@ -241,7 +241,7 @@
 		container_type = NONE
 	else
 		to_chat(user, "<span class='notice'>[src] can now be attached, modified, and refuelled.</span>")
-		container_type = OPENCONTAINER
+		container_type = OPENCONTAINER_1
 	add_fingerprint(user)

 /obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user)