Merge remote-tracking branch 'origin/master' into semi-sync

2020-12-29 10:37:06 +08:00
parent 7e2da69d23 1772c83a75
commit 51143f89e5
36 changed files with 236 additions and 49 deletions
@@ -81,6 +81,12 @@
 							var/obj/machinery/portable_atmospherics/P = item_to_retrieve.loc
 							P.disconnect()
 							P.update_icon()
+						else if(istype(item_to_retrieve.loc, /obj/machinery/disposal) || istype(item_to_retrieve.loc, /obj/structure/disposalpipe))	//If it's in disposals, only recall the item.
+							break
+						else if(istype(item_to_retrieve.loc, /obj/machinery/nuclearbomb))	//I feel like yandev
+							break	//Just to be sure.
+
+

 						item_to_retrieve = item_to_retrieve.loc