TG: Comitted on behalf of BubbleWrap

- Boxes can now be collapsed down into cardboard sheets.
- Cardboard sheets are stackable (like glass and metal).
- Cardboard sheets can be made back into boxes when needed.
- Cardboard sheets can also be made into a cardboard cyborg costume.
Revision: r3028
Author: 	 trubblebass

code/defines/obj/storage.dm

@@ -8,13 +8,13 @@
 	max_combined_w_class = 21
 
 /obj/item/weapon/storage/backpack/cultpack
-	name = "Trophy Rack"
+	name = "trophy rack"
-	desc = "A backpack and trophy rack, useful for both carrying extra gear and proudly declaring your insanity "
+	desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
 	icon_state = "cultpack"
 
 /obj/item/weapon/storage/trashbag
 	name = "trash bag"
-	desc = "For picking up all that trash."
+	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
 	icon_state = "trashbag"
 	item_state = "trashbag"
 	w_class = 4.0
@@ -31,16 +31,17 @@
 */
 /obj/item/weapon/storage/pill_bottle
 	name = "pill bottle"
-	desc = "A reasonable place to put your pills."
+	desc = "It's an airtight container for storing medication."
 	icon_state = "pill_canister"
 	icon = 'chemical.dmi'
 	item_state = "contsolid"
 	w_class = 2.0
 	can_hold = list("/obj/item/weapon/reagent_containers/pill")
+	var/mode = 1 // pickup mode
 
 /obj/item/weapon/storage/dice
-	name = "dice pack"
+	name = "pack of dice"
-	desc = "Apparently this has dice in them."
+	desc = "It's a small container with dice inside."
 	icon_state = "pill_canister"
 	icon = 'chemical.dmi'
 	item_state = "contsolid"
@@ -66,6 +67,7 @@
 	desc = "Full of goodness."
 	icon_state = "implant"
 	item_state = "syringe_kit"
+
 /obj/item/weapon/storage/cupbox
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
@@ -304,10 +306,11 @@
 	icon_state = "firstaid"
 
 /obj/item/weapon/storage/syringes
-	name = "Syringes"
+	name = "syringes"
 	desc = "A box full of syringes."
 	desc = "A biohazard alert warning is printed on the box"
 	icon_state = "syringe"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
 
 /obj/item/weapon/storage/firstaid/toxin
 	name = "Toxin First Aid"
@@ -543,6 +546,76 @@
 	icon_state = "box"
 	item_state = "syringe_kit"
 
+
+
+
+/obj/structure/closet/syndicate/resources/
+	desc = "It's an emergancy storage closet for repairs."
+
+/obj/structure/closet/syndicate/resources/New()
+	..()
+
+	var/list/resources_common = list(
+
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/rods
+	)
+
+	var/list/resources_rare = list(
+
+	/obj/item/stack/sheet/gold,
+	/obj/item/stack/sheet/silver,
+	/obj/item/stack/sheet/plasma,
+	/obj/item/stack/sheet/uranium,
+	/obj/item/stack/sheet/diamond
+
+	)
+
+	sleep(2)
+
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources_common)
+			var/obj/item/stack/R = new res(src)
+			R.amount = rand(40,R.max_amount)
+
+		for(var/res in resources_rare)
+			var/obj/item/stack/R = new res(src)
+			R.amount = rand(10,25)
+
+	return
+
+/obj/structure/closet/syndicate/resources/everything
+	desc = "It's an emergancy storage closet for repairs."
+
+/obj/structure/closet/syndicate/resources/everything/New()
+
+
+	var/list/resources = list(
+
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/gold,
+	/obj/item/stack/sheet/silver,
+	/obj/item/stack/sheet/plasma,
+	/obj/item/stack/sheet/uranium,
+	/obj/item/stack/sheet/diamond,
+	/obj/item/stack/sheet/clown,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/rods
+
+	)
+
+	sleep(2)
+
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources)
+			var/obj/item/stack/R = new res(src)
+			R.amount = R.max_amount
+
+	return
+
 // Belt Bags/Satchels
 
 /obj/item/weapon/storage/backpack/satchel_norm

code/game/chemistry.dm

@@ -182,6 +182,7 @@
 	name = "Beaker Box"
 	icon_state = "beaker"
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
 
 /obj/item/weapon/storage/beakerbox/New()
 	..()

code/game/machinery/cloning.dm

@@ -781,6 +781,7 @@
 	name = "Diskette Box"
 	icon_state = "disk_kit"
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
 
 /obj/item/weapon/storage/diskbox/New()
 	..()

code/game/objects/stacks/metal.dm

@@ -138,3 +138,20 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 //	var/turf/simulated/floor/W = S.ReplaceWithFloor()
 //	W.make_plating()
 	return
+
+// CARDBOARD SHEET - BubbleWrap
+
+// /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0)
+var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
+	new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \
+	new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/lightbox/tubes), \
+	new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/lightbox/bulbs), \
+	new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/mousetraps), \
+	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
+	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/helmet/cardborg), \
+)
+
+/obj/item/stack/sheet/cardboard
+	New(var/loc, var/amount=null)
+		recipes = cardboard_recipes
+		return ..()

code/modules/clothing/head/hats.dm

@@ -6,8 +6,8 @@
 	var/list/allowed = list()
 
 /obj/item/clothing/head/cakehat
-	name = "cakehat"
+	name = "cake-hat"
-	desc = "It is a cakehat!"
+	desc = "It's tasty looking!"
 	icon_state = "cake0"
 	var/onfire = 0.0
 	var/status = 0
@@ -15,17 +15,17 @@
 	var/fire_resist = T0C+1300	//this is the max temp it can stand before you start to cook. although it might not burn away, you take damage
 
 /obj/item/clothing/head/caphat
-	name = "Captain's hat"
+	name = "captain's hat"
 	icon_state = "captain"
 	desc = "It's good being the king."
-	flags = FPRINT|TABLEPASS
+	flags = FPRINT|TABLEPASS|SUITSPACE
 	item_state = "caphat"
 
 /obj/item/clothing/head/centhat
-	name = "Cent. Comm. hat"
+	name = "\improper CentComm. hat"
 	icon_state = "centcom"
-	desc = "It's even better to be the emperor."
+	desc = "It's good to be emperor."
-	flags = FPRINT|TABLEPASS
+	flags = FPRINT|TABLEPASS|SUITSPACE
 	item_state = "centhat"
 
 /obj/item/clothing/head/deathsquad/beret
@@ -43,42 +43,43 @@
 	item_state = "pwig"
 
 /obj/item/clothing/head/that
-	name = "Top hat"
+	name = "top-hat"
-	desc = "An amish looking hat."
+	desc = "It's an amish looking hat."
 	icon_state = "tophat"
 	item_state = "that"
 	flags = FPRINT|TABLEPASS
 
 
 /obj/item/clothing/head/chefhat
-	name = "Chef's Hat"
+	name = "chef's hat"
+	desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
 	icon_state = "chef"
 	item_state = "chef"
 	desc = "The commander in chef's head wear."
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/redcoat
-	name = "Redcoat hat"
+	name = "redcoat's hat"
 	icon_state = "redcoat"
-	desc = "I guess it's a redhead."
+	desc = "<i>'I guess it's a redhead.'</i>"
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/mailman
-	name = "Mailman Hat"
+	name = "mailman's hat"
 	icon_state = "mailman"
-	desc = "Right-on-time mail service head wear."
+	desc = "<i>'Right-on-time'</i> mail service head wear."
 	flags = FPRINT | TABLEPASS
 
 /obj/item/clothing/head/plaguedoctorhat
-	name = "Plague doctor's hat"
+	name = "plague doctor's hat"
-	desc = "Once used by Plague doctors. Now useless."
+	desc = "These were once used by Plague doctors. They're pretty much useless."
 	icon_state = "plaguedoctor"
 	flags = FPRINT | TABLEPASS
 	permeability_coefficient = 0.01
 
 /obj/item/clothing/head/beret
 	name = "beret"
-	desc = "A beret. A mime's favorite headwear."
+	desc = "A beret, a mime's favorite headwear."
 	icon_state = "beret"
 	flags = FPRINT | TABLEPASS
 
@@ -91,10 +92,11 @@
 	icon_state = "cueball"
 	flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	item_state="cueball"
+	flags_inv = 0
 
 /obj/item/clothing/head/secsoft
-	name = "Soft Cap"
+	name = "soft cap"
-	desc = "A baseball hat in tasteful red."
+	desc = "It's baseball hat in tasteful red colour."
 	icon_state = "secsoft"
 	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
 	item_state = "helmet"
@@ -108,7 +110,7 @@
 	var/flipped = 0
 
 /obj/item/clothing/head/syndicatefake
-	name = "red space helmet replica"
+	name = "red space-helmet replica"
 	desc = "A plastic replica of a red space space helmet. This is a toy, it is not made for use in space!"
 	icon_state = "syndicate"
 	item_state = "syndicate"
@@ -116,19 +118,28 @@
 	flags = FPRINT | TABLEPASS | BLOCKHAIR
 
 /obj/item/clothing/head/chaplain_hood
-	name = "Chaplain's hood"
+	name = "chaplain's hood"
-	desc = "A hood that covers the head. Keeps you warm during the space winters."
+	desc = "It's hood that covers the head. It keeps you warm during the space winters."
 	icon_state = "chaplain_hood"
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR
 
 /obj/item/clothing/head/hasturhood
-	name = "Hastur's Hood"
+	name = "hastur's hood"
-	desc = "This hood is unspeakably stylish"
+	desc = "It's unspeakably stylish"
 	icon_state = "hasturhood"
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR
 
 /obj/item/clothing/head/nursehat
-	name = "Nurse Hat"
+	name = "nurse's hat"
-	desc = "For quick identification of trained medical personnel."
+	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
 	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/helmet/cardborg
+	name = "cardborg helmet"
+	desc = "A helmet made out of a box."
+	icon_state = "cardborg_h"
+	item_state = "cardborg_h"
+	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH
+	see_face = 0.0
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES

code/modules/clothing/suits/miscellaneous.dm

@@ -131,6 +131,15 @@
 	item_state = "holidaypriest"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+// BubbleWrap - Nothing to see here
+
+/obj/item/clothing/suit/cardborg
+	name = "cardborg suit"
+	desc = "An ordinary cardboard box with holes cut in the sides."
+	icon_state = "cardborg"
+	item_state = "cardborg"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	flags_inv = HIDEJUMPSUIT
 
 /obj/item/clothing/suit/patientgown
 	name = "patient gown"

code/modules/power/lighting.dm

@@ -591,7 +591,12 @@
 	name = "replacement bulbs"
 	icon = 'storage.dmi'
 	icon_state = "light"
+	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
+	storage_slots=21
+	can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb")
+	max_combined_w_class = 21
 
 /obj/item/weapon/storage/lightbox/bulbs/New()
 	..()