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

2020-12-28 09:35:58 +08:00
parent 1095142a5f 3e3ca7c8a7
commit ce5ab2f3a4
11 changed files with 61 additions and 23 deletions
@@ -446,8 +446,11 @@
 			var/mob/living/L = O
 			if(!issilicon(L))
 				L.DefaultCombatKnockdown(40)
-			O.forceMove(T)
-			close()
+			if(istype(src, /obj/structure/closet/supplypod/extractionpod))
+				O.forceMove(src)
+			else
+				O.forceMove(T)
+				close()
 	else
 		O.forceMove(T)
 	return 1