Supermatter sliver theft now works (#2115)

This commit is contained in:
CitadelStationBot
2017-07-24 06:05:55 -05:00
committed by kevinz000
parent 64966027e7
commit f14fab916b
+2 -1
View File
@@ -167,6 +167,7 @@
T.sliver.forceMove(src)
sliver = T.sliver
T.sliver = null
T.icon_state = "supermatter_tongs"
icon_state = "core_container_loaded"
to_chat(user, "<span class='warning'>Container is sealing...</span>")
addtimer(CALLBACK(src, .proc/seal), 50)
@@ -212,7 +213,7 @@
/obj/item/weapon/hemostat/supermatter/afterattack(atom/O, mob/user, proximity)
if(!sliver)
return
if(ismovableatom(O))
if(ismovableatom(O) && O != sliver)
Consume(O)
to_chat(usr, "<span class='notice'>\The [sliver] is dusted along with \the [O]!</span>")
QDEL_NULL(sliver)