Merge pull request #13904 from DeltaFire15/summonitem-stuff

Adds some more instant summons safety
2020-12-28 13:53:46 -07:00
parent 4e51f914f5 687c6a9e6f
commit cc0556267e
1 changed files with 6 additions and 0 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