Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412

[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
parent 914cc38a2d c42304737a
commit 6cc0ea6af0
12 changed files with 682 additions and 620 deletions
@@ -67,6 +67,9 @@
 		deconstruct(FALSE)

 /obj/structure/transit_tube_pod/container_resist(mob/living/user)
+	if(!user.incapacitated())
+		empty_pod()
+		return
 	if(!moving)
 		user.changeNext_move(CLICK_CD_BREAKOUT)
 		user.last_special = world.time + CLICK_CD_BREAKOUT