Merge branch 'master' into Wheelchairs

code/modules/crafting/craft.dm

@@ -21,6 +21,8 @@
 							CAT_BURGER,
 							CAT_CAKE,
 							CAT_EGG,
+							CAT_SUSHI, //Called Fish
+							CAT_ICE,   //Called Frozen
 							CAT_MEAT,
 							CAT_MISCFOOD,
 							CAT_PASTRY,
@@ -28,7 +30,6 @@
 							CAT_PIZZA,
 							CAT_SALAD,
 							CAT_SANDWICH,
-							CAT_SUSHI,
 							CAT_SOUP,
 							CAT_SPAGHETTI),
                         CAT_CLOTHING) //Clothing subcategories

code/modules/crafting/recipes.dm

@@ -10,7 +10,6 @@
 	var/category = CAT_NONE //where it shows up in the crafting UI
 	var/subcategory = CAT_NONE
 
-
 /datum/crafting_recipe/pin_removal
 	name = "Pin Removal"
 	result = /obj/item/gun
@@ -324,6 +323,18 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 
+/datum/crafting_recipe/irifle
+	name = "Improvised Rifle(7.62mm)"
+	result = /obj/item/gun/ballistic/shotgun/boltaction/improvised
+	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+				/obj/item/pipe = 2,
+				/obj/item/weaponcrafting/stock = 1,
+				/obj/item/stack/packageWrap = 5)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 100
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
 /datum/crafting_recipe/chainsaw
 	name = "Chainsaw"
 	result = /obj/item/twohanded/required/chainsaw
@@ -407,7 +418,6 @@
 	reqs = list(/obj/item/paper = 5)
 	category = CAT_MISC
 
-
 /datum/crafting_recipe/flashlight_eyes
 	name = "Flashlight Eyes"
 	result = /obj/item/organ/eyes/robotic/flashlight
@@ -548,6 +558,14 @@
 				/obj/item/stack/sheet/animalhide/ashdrake = 5)
 	category = CAT_PRIMAL
 
+/datum/crafting_recipe/bonebag
+	name = "Bone Satchel"
+	result = /obj/item/storage/backpack/satchel/bone
+	time = 30
+	reqs = list(/obj/item/stack/sheet/bone = 3,
+				/obj/item/stack/sheet/sinew = 2)
+	category = CAT_PRIMAL
+
 /datum/crafting_recipe/gold_horn
 	name = "Golden Bike Horn"
 	result = /obj/item/bikehorn/golden
@@ -623,6 +641,7 @@
 				  /obj/item/assembly/igniter = 1)
 	category = CAT_MISC
 
+
 /datum/crafting_recipe/wheelchair
 	name = "Wheelchair"
 	result = /obj/vehicle/ridden/wheelchair
@@ -631,7 +650,6 @@
 	time = 100
 	category = CAT_MISC
 
-
 /datum/crafting_recipe/rcl
 	name = "Makeshift Rapid Cable Layer"
 	result = /obj/item/twohanded/rcl/ghetto
@@ -745,17 +763,20 @@
 
 /datum/crafting_recipe/paperwork
 	name = "Filed Paper Work"
-	result =  /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
-	time = 90 //Takes time for people to file and complete paper work!
+	result =  /obj/item/folder/paperwork_correct
+	time = 60 //Takes time for people to file and complete paper work!
 	reqs = list(/obj/item/pen = 1,
-					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2)
+					/obj/item/folder/paperwork = 2)
 	category = CAT_MISC
 
 /datum/crafting_recipe/ghettojetpack
 	name = "Improvised Jetpack"
 	result = /obj/item/tank/jetpack/improvised
 	time = 30
-	reqs = list(/obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right
+	reqs = list(/obj/item/tank/internals/oxygen = 2,
+				/obj/item/extinguisher = 1,
+				/obj/item/pipe = 3,
+				/obj/item/stack/cable_coil = 30)
 	category = CAT_MISC
 	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)