Merge branch 'master' into hydrotraysResprite

ss220club · Feb 8, 2025 · fc92909 · fc92909
2 parents c5c68ba + 76230a8
commit fc92909
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm
@@ -1527,9 +1527,7 @@
 /obj/effect/turf_decal/tile/blue/anticorner/contrasted{
 	dir = 8
 	},
-/obj/structure/closet/secure_closet/medical3{
-	req_access = null
-	},
+/obj/structure/closet/secure_closet/medical_ghostbar,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},

diff --git a/modular_ss220/aesthetics/closets/code/closets.dm b/modular_ss220/aesthetics/closets/code/closets.dm
@@ -9,3 +9,26 @@
 
 /obj/structure/closet/secure_closet/personal/cabinet
 	icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi'
+
+// MARK: Ghost Bar
+/obj/structure/closet/secure_closet/medical_ghostbar
+	name = "medical doctor's locker"
+	icon_state = "med_secure"
+	opened_door_sprite = "white_secure"
+
+/obj/structure/closet/secure_closet/medical_ghostbar/populate_contents()
+	if(prob(50))
+		new /obj/item/storage/backpack/medic(src)
+	else
+		new /obj/item/storage/backpack/satchel_med(src)
+	new /obj/item/storage/backpack/duffel/medical(src)
+	new /obj/item/clothing/under/rank/medical/doctor(src)
+	new /obj/item/clothing/suit/storage/labcoat(src)
+	new /obj/item/clothing/shoes/white(src)
+	new /obj/item/clothing/gloves/color/latex/nitrile(src)
+	new /obj/item/defibrillator/loaded(src)
+	new /obj/item/handheld_defibrillator(src)
+	new /obj/item/handheld_defibrillator(src)
+	new /obj/item/storage/belt/medical(src)
+	new /obj/item/clothing/glasses/hud/health(src)
+	new /obj/item/clothing/shoes/sandal/white(src)