From f021ed2716aee5f92cdd837ebf781c4a045f53ef Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 12 Dec 2017 13:59:26 -0500
Subject: [PATCH] Merge pull request #33450 from ShizCalev/sec-lockers

Adds security departmental lockers to Box & Pubby
---
 _maps/map_files/BoxStation/BoxStation.dmm     | 11 +++++++----
 _maps/map_files/PubbyStation/PubbyStation.dmm | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 7500589d4d..ac1547ea7f 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -25737,7 +25737,7 @@
 /turf/open/floor/plasteel/red/side,
 /area/security/checkpoint/medical)
 "bmO" = (
-/obj/structure/closet,
+/obj/structure/closet/secure_closet/security/med,
 /turf/open/floor/plasteel/red/side{
 	dir = 10
 	},
@@ -30888,10 +30888,10 @@
 /obj/machinery/light_switch{
 	pixel_y = -25
 	},
-/obj/structure/closet,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/closet/secure_closet/security/cargo,
 /turf/open/floor/plasteel/red/side{
 	dir = 10
 	},
@@ -30992,6 +30992,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side,
 /area/security/checkpoint/supply)
 "byU" = (
@@ -31252,7 +31253,7 @@
 /obj/machinery/airalarm{
 	pixel_y = 25
 	},
-/obj/structure/closet,
+/obj/structure/closet/secure_closet/security/science,
 /turf/open/floor/plasteel/red/side{
 	dir = 9
 	},
@@ -31722,6 +31723,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side{
 	dir = 8
 	},
@@ -38541,6 +38543,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side{
 	dir = 4
 	},
@@ -41664,7 +41667,7 @@
 	departmentType = 5;
 	pixel_y = 30
 	},
-/obj/structure/closet,
+/obj/structure/closet/secure_closet/security/engine,
 /turf/open/floor/plasteel/red/side{
 	dir = 1
 	},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 4f892c8d3b..d9b49b5288 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -16841,7 +16841,7 @@
 	name = "Security Post - Cargo APC";
 	pixel_x = -24
 	},
-/obj/structure/closet/wardrobe/red,
+/obj/structure/closet/secure_closet/security/cargo,
 /turf/open/floor/plasteel/red/side{
 	dir = 10
 	},
@@ -25671,6 +25671,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side{
 	dir = 8
 	},
@@ -26220,7 +26221,7 @@
 	dir = 4;
 	network = list("SS13")
 	},
-/obj/structure/closet/wardrobe/red,
+/obj/structure/closet/secure_closet/security/med,
 /turf/open/floor/plasteel/red/side{
 	dir = 10
 	},
@@ -34088,6 +34089,7 @@
 /area/security/checkpoint/science)
 "bDI" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side{
 	dir = 4
 	},
@@ -34751,7 +34753,6 @@
 /turf/open/floor/plasteel/red/side,
 /area/security/checkpoint/science)
 "bEY" = (
-/obj/structure/closet/wardrobe/red,
 /obj/machinery/power/apc{
 	dir = 4;
 	name = "Science Security APC";
@@ -34761,6 +34762,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/structure/closet/secure_closet/security/science,
 /turf/open/floor/plasteel/red/side{
 	dir = 6
 	},
@@ -41881,6 +41883,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/closet/wardrobe/red,
 /turf/open/floor/plasteel/red/side{
 	dir = 4
 	},
@@ -42230,7 +42233,7 @@
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_x = 32
 	},
-/obj/structure/closet/wardrobe/red,
+/obj/structure/closet/secure_closet/security/engine,
 /turf/open/floor/plasteel/red/side{
 	dir = 6
 	},