Merge pull request #9242 from VOREStation/upstream-merge-7724

[MIRROR] Wall Cabinets & Crate Markings

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

@@ -1380,6 +1380,36 @@
 		"glass" = COLOR_WHITE
 	)
 
+// Wall cabinets
+/decl/closet_appearance/wall_double
+	base_icon =  'icons/obj/closets/bases/wall_double.dmi'
+	decal_icon = 'icons/obj/closets/decals/wall_double.dmi'
+	decals = list(
+		"vent"
+	)
+	extra_decals = null
+
+/decl/closet_appearance/wall_double/kitchen
+	decals = null
+	color = COLOR_OFF_WHITE
+
+/decl/closet_appearance/wall_double/medical
+	decals = null
+	color = COLOR_OFF_WHITE
+	extra_decals = list(
+		"stripe_outer" = COLOR_BLUE_GRAY,
+		"stripe_inner" = COLOR_OFF_WHITE,
+		"cross" = COLOR_BLUE_GRAY
+	)
+
+/decl/closet_appearance/wall_double/fire_safety
+	color = COLOR_RED_LIGHT
+	decals = null
+	extra_decals = list(
+		"stripes" = COLOR_OFF_WHITE,
+		"glass" = COLOR_WHITE
+	)
+
 // Carts
 /decl/closet_appearance/cart
 	color = COLOR_GRAY20

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

@@ -10,7 +10,7 @@
 	anchored = 1
 	store_mobs = 0
 
-//spawns endless (3 sets) amounts of breathmask, emergency oxy tank and crowbar
+//spawns 2 sets of breathmask, emergency oxy tank and crowbar
 
 /obj/structure/closet/walllocker/emerglocker
 	name = "emergency locker"
@@ -75,4 +75,109 @@
 
 /obj/structure/closet/walllocker/medical/east
 	pixel_x = 32
-	dir = EAST
+	dir = EAST
+//VOREStation Add End
+
+//double-size "cabinet" lockers, from Killian
+/obj/structure/closet/walllocker_double
+	desc = "A wall mounted storage cabinet."
+	name = "Wall Cabinet"
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double
+	density = 0
+	anchored = 1
+	plane = TURF_PLANE
+	layer = ABOVE_TURF_LAYER
+
+/obj/structure/closet/walllocker_double/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/east
+	pixel_x = 32
+	dir = EAST
+
+/obj/structure/closet/walllocker_double/kitchen
+	desc = "A wall mounted storage cabinet, for the kitchen. Now where's the flour gone..?"
+	name = "Kitchen Cabinet"
+	icon = 'icons/obj/closets/bases/wall_double.dmi'
+	closet_appearance = /decl/closet_appearance/wall_double/kitchen
+	density = 0
+	anchored = 1
+
+/obj/structure/closet/walllocker_double/kitchen/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/kitchen/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/kitchen/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/kitchen/east
+	pixel_x = 32
+	dir = EAST
+	
+/obj/structure/closet/walllocker_double/medical
+	name = "Medical Cabinet"
+	desc = "A wall mounted medical supply cabinet. Probably full of drugs!"	//not actually full of drugs, sorry!
+	closet_appearance = /decl/closet_appearance/wall_double/medical
+
+/obj/structure/closet/walllocker_double/medical/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/medical/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/medical/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/medical/east
+	pixel_x = 32
+	dir = EAST
+	
+/obj/structure/closet/walllocker_double/hydrant
+	name = "fire-safety closet"
+	desc = "It's a storage cabinet packed with fire-fighting supplies."
+	closet_appearance = /decl/closet_appearance/wall_double/fire_safety
+	anchored = 1
+	density = 0
+	wall_mounted = 1
+
+	starts_with = list(
+		/obj/item/clothing/suit/fire/firefighter,
+		/obj/item/clothing/mask/gas,
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank/oxygen/red,
+		/obj/item/weapon/extinguisher,
+		/obj/item/clothing/head/hardhat/red)
+
+/obj/structure/closet/walllocker_double/hydrant/north
+	pixel_y = 32
+	dir = SOUTH
+
+/obj/structure/closet/walllocker_double/hydrant/south
+	pixel_y = -32
+	dir = NORTH
+
+/obj/structure/closet/walllocker_double/hydrant/west
+	pixel_x = -32
+	dir = WEST
+
+/obj/structure/closet/walllocker_double/hydrant/east
+	pixel_x = 32
+	dir = EAST