Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items

code/game/objects/structures/crates_lockers/closets.dm

@@ -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

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -47,6 +47,25 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 	return
 
+/obj/structure/closet/secure_closet/paramedic
+    name = "paramedic's locker"
+    req_access = list(ACCESS_MEDICAL)
+    icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+    ..()
+    new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/defibrillator/loaded(src)
+    new /obj/item/clothing/gloves/color/latex/nitrile(src)
+    new /obj/item/storage/belt/medical(src)
+    new /obj/item/clothing/glasses/hud/health(src)
+    new /obj/item/pinpointer/crew(src)
+    new /obj/item/sensor_device(src)
+    return
+
 /obj/structure/closet/secure_closet/CMO
 	name = "\proper chief medical officer's locker"
 	req_access = list(ACCESS_CMO)