Code Cleanup + Cushions

code/__DEFINES/construction.dm

@@ -87,6 +87,7 @@
 #define CAT_ROBOT	"Robots"
 #define CAT_MISC	"Misc"
 #define CAT_PRIMAL  "Tribal"
+//#define CAT_CARPENTRY	"Carpentry" need to get this to work
 #define CAT_CLOTHING	"Clothing"
 #define CAT_FOOD	"Foods"
 #define CAT_BREAD	"Breads"

code/game/objects/items/storage/belt.dm

@@ -61,7 +61,12 @@
 		/obj/item/clothing/gloves,
 		/obj/item/holosign_creator,
 		/obj/item/forcefield_projector,
-		/obj/item/assembly/signaler
+		/obj/item/assembly/signaler,
+		/obj/item/carpentry/handsaw,
+		/obj/item/carpentry/hammer,
+		/obj/item/carpentry/sandpaper,
+		/obj/item/carpentry/borer,
+		/obj/item/carpentry/glue
 		))
 	STR.can_hold = can_hold
 

code/modules/cargo/packs/misc.dm

@@ -397,11 +397,11 @@
 	name = "Carpentry Crate"
 	desc = "Make money at cargo by learning some carpentry and making custom furniture."
 	cost = 1000
-	contains = list(/obj/item/handsaw,
-					/obj/item/hammer,
-					/obj/item/glue,
-					/obj/item/borer,
-					/obj/item/sandpaper)
+	contains = list(/obj/item/carpentry/handsaw,
+					/obj/item/carpentry/hammer,
+					/obj/item/carpentry/glue,
+					/obj/item/carpentry/borer,
+					/obj/item/carpentry/sandpaper)
 	crate_name = "carpentry crate"
 
 

code/modules/crafting/craft.dm

@@ -9,6 +9,7 @@
 				CAT_PRIMAL,
 				CAT_FOOD,
 				CAT_CLOTHING)
+				//CAT_CARPENTRY
 	var/list/subcategories = list(
 						list(	//Weapon subcategories
 							CAT_WEAPON,
@@ -439,4 +440,4 @@
 /datum/mind/proc/teach_crafting_recipe(R)
 	if(!learned_recipes)
 		learned_recipes = list()
-	learned_recipes |= R
+	learned_recipes |= R