diff --git a/.gitignore b/.gitignore
index e32aa6c2a0..af769434e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ vchat.db*
 *.dmb
 *.lk
 *.backup
+*.before
 *.pyc
 data/
 cfg/
diff --git a/code/game/objects/structures/crates_lockers/__closets.dm b/code/game/objects/structures/crates_lockers/__closets.dm
index 24b68bdf2a..5ddc162125 100644
--- a/code/game/objects/structures/crates_lockers/__closets.dm
+++ b/code/game/objects/structures/crates_lockers/__closets.dm
@@ -478,3 +478,8 @@
 	dump_contents()
 	spawn(1) qdel(src)
 	return 1
+
+// Just a generic cabinet for mappers to use
+/obj/structure/closet/cabinet
+	name = "cabinet"
+	closet_appearance = /decl/closet_appearance/cabinet
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index c3b5f7216c..fc6a950a50 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -238,16 +238,10 @@
 /obj/structure/closet/crate/hat
 	desc = "A crate filled with Valuable Collector's Hats!."
 	name = "Hat Crate"
-	icon_state = "crate"
-	icon_opened = "crateopen"
-	icon_closed = "crate"
 
 /obj/structure/closet/crate/contraband
 	name = "Poster crate"
 	desc = "A random assortment of posters manufactured by providers NOT listed under NanoTrasen's whitelist."
-	icon_state = "crate"
-	icon_opened = "crateopen"
-	icon_closed = "crate"
 */
 
 /obj/structure/closet/crate/medical