Revert "12/21 modernizations from TG live"

2016-12-22 22:35:44 -06:00
parent cf59ac1c3d
commit ae40d4134e
2215 changed files with 86928 additions and 707332 deletions
@@ -14,14 +14,17 @@
 	desc = "You wear this on your back and put items into it."
 	icon_state = "backpack"
 	item_state = "backpack"
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	slot_flags = SLOT_BACK	//ERROOOOO
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3
 	max_combined_w_class = 21
 	storage_slots = 21
-	resistance_flags = 0
-	obj_integrity = 300
-	max_integrity = 300
+	burn_state = FLAMMABLE
+	burntime = 20
+
+/obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W, mob/user, params)
+	playsound(src.loc, "rustle", 50, 1, -5)
+	return ..()

 /*
 * Backpack Types
@@ -32,16 +35,14 @@
 	desc = "A backpack that opens into a localized pocket of Blue Space."
 	origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
 	icon_state = "holdingpack"
-	max_w_class = WEIGHT_CLASS_GIGANTIC
+	max_w_class = 6
 	max_combined_w_class = 35
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF
 	var/pshoom = 'sound/items/PSHOOM.ogg'
 	var/alt_sound = 'sound/items/PSHOOM_2.ogg'
-	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 60, acid = 50)
-

 /obj/item/weapon/storage/backpack/holding/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is jumping into [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
+	user.visible_message("<span class='suicide'>[user] is jumping into [src]! It looks like \he's trying to commit suicide.</span>")
 	user.drop_item()
 	user.Stun(5)
 	sleep(20)
@@ -57,7 +58,7 @@
 					playsound(src, alt_sound, 40, 1)
 				else
 					playsound(src, pshoom, 40, 1)
-				user.Beam(dest_object,icon_state="rped_upgrade",time=5)
+				user.Beam(dest_object,icon_state="rped_upgrade",icon='icons/effects/effects.dmi',time=5)
 				return 1
 		user << "The [src.name] buzzes."
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
@@ -91,12 +92,12 @@
 	desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!"
 	icon_state = "giftbag0"
 	item_state = "giftbag"
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 4
+	max_w_class = 3
 	max_combined_w_class = 60

 /obj/item/weapon/storage/backpack/santabag/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] places [src] over their head and pulls it tight! It looks like they aren't in the Christmas spirit...</span>")
+	user.visible_message("<span class='suicide'>[user] places the [src.name] over their head and pulls it tight! It looks like they aren't in the Christmas spirit...</span>")
 	return (OXYLOSS)

 /obj/item/weapon/storage/backpack/cultpack
@@ -140,14 +141,14 @@
 	desc = "It's a special backpack made exclusively for Nanotrasen officers."
 	icon_state = "captainpack"
 	item_state = "captainpack"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/industrial
 	name = "industrial backpack"
 	desc = "It's a tough backpack for the daily grind of station life."
 	icon_state = "engiepack"
 	item_state = "engiepack"
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/botany
 	name = "botany backpack"
@@ -172,7 +173,7 @@
 	desc = "A specially designed backpack. It's fire resistant and smells vaguely of plasma."
 	icon_state = "toxpack"
 	item_state = "toxpack"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/virology
 	name = "virology backpack"
@@ -186,94 +187,93 @@
 */

 /obj/item/weapon/storage/backpack/satchel
-	name = "satchel"
-	desc = "A trendy looking satchel."
-	icon_state = "satchel-norm"
-	species_exception = list(/datum/species/angel) //satchels can be equipped since they are on the side, not back
-
-/obj/item/weapon/storage/backpack/satchel/leather
 	name = "leather satchel"
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

-/obj/item/weapon/storage/backpack/satchel/leather/withwallet/New()
+/obj/item/weapon/storage/backpack/satchel/withwallet/New()
 	..()
 	new /obj/item/weapon/storage/wallet/random( src )

-/obj/item/weapon/storage/backpack/satchel/eng
+/obj/item/weapon/storage/backpack/satchel_norm
+	name = "satchel"
+	desc = "A trendy looking satchel."
+	icon_state = "satchel-norm"
+
+/obj/item/weapon/storage/backpack/satchel_eng
 	name = "industrial satchel"
 	desc = "A tough satchel with extra pockets."
 	icon_state = "satchel-eng"
 	item_state = "engiepack"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

-/obj/item/weapon/storage/backpack/satchel/med
+/obj/item/weapon/storage/backpack/satchel_med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
 	icon_state = "satchel-med"
 	item_state = "medicalpack"

-/obj/item/weapon/storage/backpack/satchel/vir
+/obj/item/weapon/storage/backpack/satchel_vir
 	name = "virologist satchel"
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
 	item_state = "satchel-vir"

-/obj/item/weapon/storage/backpack/satchel/chem
+/obj/item/weapon/storage/backpack/satchel_chem
 	name = "chemist satchel"
 	desc = "A sterile satchel with chemist colours."
 	icon_state = "satchel-chem"
 	item_state = "satchel-chem"

-/obj/item/weapon/storage/backpack/satchel/gen
+/obj/item/weapon/storage/backpack/satchel_gen
 	name = "geneticist satchel"
 	desc = "A sterile satchel with geneticist colours."
 	icon_state = "satchel-gen"
 	item_state = "satchel-gen"

-/obj/item/weapon/storage/backpack/satchel/tox
+/obj/item/weapon/storage/backpack/satchel_tox
 	name = "scientist satchel"
 	desc = "Useful for holding research materials."
 	icon_state = "satchel-tox"
 	item_state = "satchel-tox"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

-/obj/item/weapon/storage/backpack/satchel/hyd
+/obj/item/weapon/storage/backpack/satchel_hyd
 	name = "botanist satchel"
 	desc = "A satchel made of all natural fibers."
 	icon_state = "satchel-hyd"
 	item_state = "satchel-hyd"

-/obj/item/weapon/storage/backpack/satchel/sec
+/obj/item/weapon/storage/backpack/satchel_sec
 	name = "security satchel"
 	desc = "A robust satchel for security related needs."
 	icon_state = "satchel-sec"
 	item_state = "securitypack"

-/obj/item/weapon/storage/backpack/satchel/explorer
+/obj/item/weapon/storage/backpack/satchel_explorer
 	name = "explorer satchel"
 	desc = "A robust satchel for stashing your loot."
 	icon_state = "satchel-explorer"
 	item_state = "securitypack"

-/obj/item/weapon/storage/backpack/satchel/cap
+/obj/item/weapon/storage/backpack/satchel_cap
 	name = "captain's satchel"
 	desc = "An exclusive satchel for Nanotrasen officers."
 	icon_state = "satchel-cap"
 	item_state = "captainpack"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

-/obj/item/weapon/storage/backpack/satchel/flat
+/obj/item/weapon/storage/backpack/satchel_flat
 	name = "smuggler's satchel"
 	desc = "A very slim satchel that can easily fit into tight spaces."
 	icon_state = "satchel-flat"
-	w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself.
+	w_class = 3 //Can fit in backpacks itself.
 	max_combined_w_class = 15
 	level = 1
-	cant_hold = list(/obj/item/weapon/storage/backpack/satchel/flat) //muh recursive backpacks
+	cant_hold = list(/obj/item/weapon/storage/backpack/satchel_flat) //muh recursive backpacks

-/obj/item/weapon/storage/backpack/satchel/flat/hide(var/intact)
+/obj/item/weapon/storage/backpack/satchel_flat/hide(var/intact)
 	if(intact)
 		invisibility = INVISIBILITY_MAXIMUM
 		anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack.
@@ -283,36 +283,10 @@
 		anchored = 0
 		icon_state = initial(icon_state)

-/obj/item/weapon/storage/backpack/satchel/flat/New()
+/obj/item/weapon/storage/backpack/satchel_flat/New()
 	..()
-	PoolOrNew(/obj/item/stack/tile/plasteel, src)
+	new /obj/item/stack/tile/plasteel(src)
 	new /obj/item/weapon/crowbar(src)
-	SSpersistence.new_secret_satchels += src
-
-/obj/item/weapon/storage/backpack/satchel/flat/Destroy()
-	SSpersistence.new_secret_satchels -= src
-	return ..()
-
-/obj/item/weapon/storage/backpack/satchel/flat/secret
-	var/list/reward_one_of_these = list() //Intended for map editing
-	var/list/reward_all_of_these = list() //use paths!
-	var/revealed = 0
-
-/obj/item/weapon/storage/backpack/satchel/flat/secret/New()
-	..()
-
-	if(isfloorturf(loc) && !istype(loc,/turf/open/floor/plating/))
-		hide(1)
-
-/obj/item/weapon/storage/backpack/satchel/flat/secret/hide(intact)
-	..()
-	if(!intact && !revealed)
-		if(reward_one_of_these.len > 0)
-			var/reward = pick(reward_one_of_these)
-			new reward(src)
-		for(var/R in reward_all_of_these)
-			new R(src)
-		revealed = 1

 /obj/item/weapon/storage/backpack/dufflebag
 	name = "dufflebag"
@@ -327,7 +301,7 @@
 	desc = "A large dufflebag for holding extra captainly goods."
 	icon_state = "duffle-captain"
 	item_state = "duffle-captain"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/med
 	name = "medical dufflebag"
@@ -346,14 +320,14 @@
 	desc = "A large dufflebag for holding extra tools and supplies."
 	icon_state = "duffle-eng"
 	item_state = "duffle-eng"
-	resistance_flags = 0
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/drone
 	name = "drone dufflebag"
 	desc = "A large dufflebag for holding tools and hats."
 	icon_state = "duffle-drone"
 	item_state = "duffle-drone"
-	resistance_flags = FIRE_PROOF
+	burn_state = FIRE_PROOF

 /obj/item/weapon/storage/backpack/dufflebag/drone/New()
 	..()
@@ -381,7 +355,7 @@
 	name = "suspicious looking dufflebag"
 	desc = "A large dufflebag for holding extra tactical supplies."
 	icon_state = "duffle-syndie"
-	item_state = "duffle-syndie"
+	item_state = "duffle-syndiemed"
 	origin_tech = "syndicate=1"
 	silent = 1
 	slowdown = 0
@@ -450,7 +424,7 @@
 	contents = list()
 	new /obj/item/ammo_box/magazine/smgm45(src)
 	new /obj/item/ammo_box/magazine/smgm45(src)
-	new /obj/item/weapon/gun/ballistic/automatic/c20r(src)
+	new /obj/item/weapon/gun/projectile/automatic/c20r(src)
 	new /obj/item/weapon/suppressor/specialoffer(src)
 	return

@@ -461,7 +435,7 @@
 	..()
 	contents = list()
 	new /obj/item/ammo_box/magazine/m12g(src)
-	new /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog(src)
+	new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/ammo_box/magazine/m12g/buckshot(src)
 	new /obj/item/clothing/glasses/thermal/syndi(src)
 	return
@@ -474,7 +448,7 @@
 	contents = list()
 	new /obj/item/clothing/shoes/magboots/syndie(src)
 	new /obj/item/weapon/storage/firstaid/tactical(src)
-	new /obj/item/weapon/gun/ballistic/automatic/l6_saw/toy(src)
+	new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src)
 	new /obj/item/ammo_box/foambox/riot(src)
 	return

@@ -486,7 +460,7 @@
 	contents = list()
 	new /obj/item/clothing/shoes/magboots/syndie(src)
 	new /obj/item/weapon/storage/firstaid/tactical(src)
-	new /obj/item/weapon/gun/ballistic/automatic/l6_saw/toy(src)
+	new /obj/item/weapon/gun/projectile/automatic/l6_saw/toy(src)
 	new /obj/item/ammo_box/foambox/riot(src)
 	return

@@ -499,7 +473,7 @@
 	new /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror(src)
 	new /obj/item/weapon/storage/box/syndie_kit/chemical(src)
 	new /obj/item/weapon/gun/syringe/syndicate(src)
-	new /obj/item/weapon/gun/ballistic/automatic/c20r/toy(src)
+	new /obj/item/weapon/gun/projectile/automatic/c20r/toy(src)
 	new /obj/item/weapon/storage/box/syringes(src)
 	new /obj/item/ammo_box/foambox/riot(src)
 	new /obj/item/weapon/grenade/chem_grenade/bioterrorfoam(src)
@@ -526,7 +500,7 @@
 	new /obj/item/clothing/under/syndicate/soviet(src)
 	new /obj/item/weapon/watertank/operator(src)
 	new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
-	new /obj/item/weapon/gun/ballistic/automatic/pistol/APS(src)
+	new /obj/item/weapon/gun/projectile/automatic/pistol/APS(src)
 	new /obj/item/ammo_box/magazine/pistolm9mm(src)
 	new /obj/item/ammo_box/magazine/pistolm9mm(src)
 	new /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka(src)
@@ -33,15 +33,15 @@
 	icon_state = "trashbag"
 	item_state = "trashbag"

-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_SMALL
+	w_class = 4
+	max_w_class = 2
 	max_combined_w_class = 30
 	storage_slots = 30
 	can_hold = list() // any
 	cant_hold = list(/obj/item/weapon/disk/nuclear)

 /obj/item/weapon/storage/bag/trash/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] puts [src] over [user.p_their()] head and starts chomping at the insides! Disgusting!</span>")
+	user.visible_message("<span class='suicide'>[user] puts the [src.name] over their head and starts chomping at the insides! Disgusting!</span>")
 	playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
 	return (TOXLOSS)

@@ -83,10 +83,10 @@
 	icon_state = "satchel"
 	origin_tech = "engineering=2"
 	slot_flags = SLOT_BELT | SLOT_POCKET
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	storage_slots = 50
 	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3
 	can_hold = list(/obj/item/weapon/ore)

 /obj/item/weapon/storage/bag/ore/cyborg
@@ -108,12 +108,18 @@
 	name = "plant bag"
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "plantbag"
-	storage_slots = 100; //the number of plant pieces it can carry.
-	max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
-	max_w_class = WEIGHT_CLASS_NORMAL
-	w_class = WEIGHT_CLASS_TINY
-	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown,/obj/item/weapon/reagent_containers/food/snacks/ash_flora)
-	resistance_flags = FLAMMABLE
+	storage_slots = 50; //the number of plant pieces it can carry.
+	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
+	max_w_class = 3
+	w_class = 1
+	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/weapon/grown)
+	burn_state = FLAMMABLE
+
+/obj/item/weapon/storage/bag/plants/holding // Now botany can crash the server too
+	name = "plant bag of holding"
+	icon_state = "plantbag_holding"
+	storage_slots = INFINITY
+	max_combined_w_class = INFINITY

 ////////

@@ -147,7 +153,7 @@
 	icon_state = "sheetsnatcher"

 	var/capacity = 300; //the number of sheets it can carry.
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3

 	allow_quick_empty = 1 // this function is superceded

@@ -291,10 +297,10 @@
 	display_contents_with_number = 0 //This would look really stupid otherwise
 	storage_slots = 7
 	max_combined_w_class = 21
-	max_w_class = WEIGHT_CLASS_NORMAL
-	w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
+	max_w_class = 3
+	w_class = 4 //Bigger than a book because physics
 	can_hold = list(/obj/item/weapon/book, /obj/item/weapon/storage/book, /obj/item/weapon/spellbook)
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE

 /*
 * Trays - Agouri
@@ -308,7 +314,7 @@
 	throwforce = 10
 	throw_speed = 3
 	throw_range = 5
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)
 	preposition = "on"
@@ -361,10 +367,10 @@
 	desc = "A bag for storing pills, patches, and bottles."
 	storage_slots = 50
 	max_combined_w_class = 200
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	preposition = "in"
 	can_hold = list(/obj/item/weapon/reagent_containers/pill, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle)
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE

 /*
 *  Biowaste bag (mostly for xenobiologists)
@@ -377,7 +383,7 @@
 	desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
 	storage_slots = 25
 	max_combined_w_class = 200
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	preposition = "in"
-	can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse, /obj/item/weapon/reagent_containers/food/snacks/monkeycube)
-	resistance_flags = FLAMMABLE
+	can_hold = list(/obj/item/slime_extract, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/reagent_containers/glass/bottle, /obj/item/weapon/reagent_containers/blood, /obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/trash/deadmouse)
+	burn_state = FLAMMABLE
@@ -6,8 +6,6 @@
 	item_state = "utility"
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed", "disciplined")
-	obj_integrity = 300
-	max_integrity = 300

 /obj/item/weapon/storage/belt/update_icon()
 	cut_overlays()
@@ -33,7 +31,7 @@
 		/obj/item/device/analyzer,
 		/obj/item/weapon/extinguisher/mini,
 		/obj/item/device/radio,
-		/obj/item/clothing/gloves
+		/obj/item/clothing/gloves/
 		)

 /obj/item/weapon/storage/belt/utility/chief
@@ -50,10 +48,8 @@
 	new /obj/item/device/multitool(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
 	new /obj/item/weapon/extinguisher/mini(src)
-	new /obj/item/device/analyzer(src)
 	//much roomier now that we've managed to remove two tools

-
 /obj/item/weapon/storage/belt/utility/full/New()
 	..()
 	new /obj/item/weapon/screwdriver(src)
@@ -82,7 +78,7 @@
 	desc = "Can hold various medical equipment."
 	icon_state = "medicalbelt"
 	item_state = "medical"
-	max_w_class = WEIGHT_CLASS_BULKY
+	max_w_class = 4
 	can_hold = list(
 		/obj/item/device/healthanalyzer,
 		/obj/item/weapon/dnainjector,
@@ -114,7 +110,7 @@
 		/obj/item/weapon/cautery,
 		/obj/item/weapon/hemostat,
 		/obj/item/device/geiger_counter,
-		/obj/item/clothing/neck/stethoscope,
+		/obj/item/clothing/tie/stethoscope,
 		/obj/item/weapon/stamp,
 		/obj/item/clothing/glasses,
 		/obj/item/weapon/wrench/medical,
@@ -132,7 +128,7 @@
 	icon_state = "securitybelt"
 	item_state = "security"//Could likely use a better one.
 	storage_slots = 5
-	max_w_class = WEIGHT_CLASS_NORMAL //Because the baton wouldn't fit otherwise. - Neerti
+	max_w_class = 3 //Because the baton wouldn't fit otherwise. - Neerti
 	can_hold = list(
 		/obj/item/weapon/melee/baton,
 		/obj/item/weapon/melee/classic_baton,
@@ -160,7 +156,6 @@
 	new /obj/item/weapon/grenade/flashbang(src)
 	new /obj/item/device/assembly/flash/handheld(src)
 	new /obj/item/weapon/melee/baton/loaded(src)
-	update_icon()


 /obj/item/weapon/storage/belt/mining
@@ -169,8 +164,8 @@
 	icon_state = "explorer1"
 	item_state = "explorer1"
 	storage_slots = 6
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_BULKY //Pickaxes are big.
+	w_class = 4
+	max_w_class = 4 //Pickaxes are big.
 	max_combined_w_class = 20 //Not an issue with this whitelist, probably.
 	can_hold = list(
 		/obj/item/weapon/crowbar,
@@ -206,8 +201,7 @@
 		/obj/item/weapon/reagent_containers/food/drinks,
 		/obj/item/organ/hivelord_core,
 		/obj/item/device/wormhole_jaunter,
-		/obj/item/weapon/storage/bag/plants,
-
+		/obj/item/device/t_scanner/motionTracker
 		)


@@ -256,25 +250,7 @@
 	desc = "A syndicate belt designed to be used by boarding parties.  Its style is modeled after the hardsuits they wear."
 	icon_state = "militarybelt"
 	item_state = "military"
-	max_w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/weapon/storage/belt/military/abductor
-	name = "agent belt"
-	desc = "A belt used by abductor agents."
-	icon = 'icons/obj/abductor.dmi'
-	icon_state = "belt"
-	item_state = "security"
-
-/obj/item/weapon/storage/belt/military/abductor/full/New()
-	..()
-	new /obj/item/weapon/screwdriver/abductor(src)
-	new /obj/item/weapon/wrench/abductor(src)
-	new /obj/item/weapon/weldingtool/abductor(src)
-	new /obj/item/weapon/crowbar/abductor(src)
-	new /obj/item/weapon/wirecutters/abductor(src)
-	new /obj/item/device/multitool/abductor(src)
-	new /obj/item/stack/cable_coil(src,30,"white")
-
+	max_w_class = 2

 /obj/item/weapon/storage/belt/military/army
 	name = "army belt"
@@ -294,7 +270,7 @@
 	desc = "A belt for holding grenades."
 	icon_state = "grenadebeltnew"
 	item_state = "security"
-	max_w_class = WEIGHT_CLASS_BULKY
+	max_w_class = 4
 	storage_slots = 30
 	can_hold = list(
 		/obj/item/weapon/grenade,
@@ -364,7 +340,7 @@
 	icon_state = "janibelt"
 	item_state = "janibelt"
 	storage_slots = 6
-	max_w_class = WEIGHT_CLASS_BULKY // Set to this so the  light replacer can fit.
+	max_w_class = 4 // Set to this so the  light replacer can fit.
 	can_hold = list(
 		/obj/item/weapon/grenade/chem_grenade,
 		/obj/item/device/lightreplacer,
@@ -373,7 +349,7 @@
 		/obj/item/weapon/soap,
 		/obj/item/weapon/holosign_creator,
 		/obj/item/key/janitor,
-		/obj/item/clothing/gloves
+		/obj/item/clothing/gloves/
 		)

 /obj/item/weapon/storage/belt/bandolier
@@ -392,10 +368,10 @@
 	icon_state = "holster"
 	item_state = "holster"
 	storage_slots = 3
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3
 	can_hold = list(
-		/obj/item/weapon/gun/ballistic/automatic/pistol,
-		/obj/item/weapon/gun/ballistic/revolver,
+		/obj/item/weapon/gun/projectile/automatic/pistol,
+		/obj/item/weapon/gun/projectile/revolver,
 		/obj/item/ammo_box,
 		)
 	alternate_worn_layer = UNDER_SUIT_LAYER
@@ -406,7 +382,7 @@
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	storage_slots = 3
-	max_w_class = WEIGHT_CLASS_SMALL
+	max_w_class = 2

 /obj/item/weapon/storage/belt/fannypack/black
 	name = "black fannypack"
@@ -457,49 +433,3 @@
 	name = "yellow fannypack"
 	icon_state = "fannypack_yellow"
 	item_state = "fannypack_yellow"
-
-/obj/item/weapon/storage/belt/sabre
-	name = "sabre sheath"
-	desc = "An ornate sheath designed to hold an officer's blade."
-	icon_state = "sheath"
-	item_state = "sheath"
-	storage_slots = 1
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_BULKY
-	can_hold = list(
-		/obj/item/weapon/melee/sabre
-		)
-
-/obj/item/weapon/storage/belt/sabre/examine(mob/user)
-	..()
-	if(contents.len)
-		user << "<span class='notice'>Alt-click it to quickly draw the blade.</span>"
-
-/obj/item/weapon/storage/belt/sabre/AltClick(mob/user)
-	if(!ishuman(user) || !user.canUseTopic(src, be_close=TRUE))
-		return
-	if(contents.len)
-		var/obj/item/I = contents[1]
-		user.visible_message("[user] takes [I] out of [src].", "<span class='notice'>You take [I] out of [src].</span>",\
-		)
-		user.put_in_hands(I)
-		update_icon()
-	else
-		user << "[src] is empty."
-
-/obj/item/weapon/storage/belt/sabre/update_icon()
-	icon_state = "sheath"
-	item_state = "sheath"
-	if(contents.len)
-		icon_state += "-sabre"
-		item_state += "-sabre"
-	if(loc && isliving(loc))
-		var/mob/living/L = loc
-		L.regenerate_icons()
-	..()
-
-
-/obj/item/weapon/storage/belt/sabre/New()
-	..()
-	new /obj/item/weapon/melee/sabre(src)
-	update_icon()
@@ -5,8 +5,8 @@
 	icon_state ="book"
 	throw_speed = 2
 	throw_range = 5
-	w_class = WEIGHT_CLASS_NORMAL
-	resistance_flags = FLAMMABLE
+	w_class = 3
+	burn_state = FLAMMABLE
 	var/title = "book"
 /obj/item/weapon/storage/book/attack_self(mob/user)
 		user << "<span class='notice'>The pages of [title] have been cut out!</span>"
@@ -20,7 +20,7 @@
 	var/deity_name = "Christ"

 /obj/item/weapon/storage/book/bible/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is offering [user.p_them()]self to [deity_name]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] is offering \himself to [src.deity_name]! It looks like \he's trying to commit suicide.</span>")
 	return (BRUTELOSS)

 /obj/item/weapon/storage/book/bible/booze
@@ -50,7 +50,7 @@ var/global/list/bibleitemstates =	list("bible", "koran", "scrapbook", "bible", "
 /obj/item/weapon/storage/book/bible/attack_self(mob/living/carbon/human/H)
 	if(!istype(H))
 		return
-	if(!SSreligion.Bible_icon_state && H.job == "Chaplain")
+	if(ticker && !ticker.Bible_icon_state && H.job == "Chaplain")
 		//Open bible selection
 		var/dat = "<html><head><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"

@@ -95,7 +95,7 @@ var/global/list/bibleitemstates =	list("bible", "koran", "scrapbook", "bible", "
 						T.setDir(10)

 /obj/item/weapon/storage/book/bible/Topic(href, href_list)
-	if(href_list["seticon"] && ticker && !SSreligion.Bible_icon_state)
+	if(href_list["seticon"] && ticker && !ticker.Bible_icon_state)
 		var/iconi = text2num(href_list["seticon"])

 		var/biblename = biblenames[iconi]
@@ -107,39 +107,27 @@ var/global/list/bibleitemstates =	list("bible", "koran", "scrapbook", "bible", "
 		//Set biblespecific chapels
 		setupbiblespecifics(B, usr)

-
-		SSreligion.Bible_icon_state = B.icon_state
-		SSreligion.Bible_item_state = B.item_state
+		if(ticker)
+			ticker.Bible_icon_state = B.icon_state
+			ticker.Bible_item_state = B.item_state
 		feedback_set_details("religion_book","[biblename]")

 		usr << browse(null, "window=editicon") // Close window

-/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/human/H, mob/living/user)
-	for(var/X in H.bodyparts)
-		var/obj/item/bodypart/BP = X
-		if(BP.status == BODYPART_ROBOTIC)
-			user << "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>"
-			return 0
-
-	var/heal_amt = 10
-	var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1)
-
-	if(hurt_limbs.len)
-		for(var/X in hurt_limbs)
-			var/obj/item/bodypart/affecting = X
-			if(affecting.heal_damage(heal_amt, heal_amt))
-				H.update_damage_overlays()
-		H.visible_message("<span class='notice'>[user] heals [H] with the power of [deity_name]!</span>")
-		H << "<span class='boldnotice'>May the power of [deity_name] compel you to be healed!</span>"
-		playsound(src.loc, "punch", 25, 1, -1)
-	return 1
-
-
+/obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/M)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		var/heal_amt = 10
+		for(var/obj/item/bodypart/affecting in H.bodyparts)
+			if(affecting.status == ORGAN_ORGANIC) //No Bible can heal a robotic arm!
+				if(affecting.heal_damage(heal_amt, heal_amt, 0))
+					H.update_damage_overlays(0)
+	return

 /obj/item/weapon/storage/book/bible/attack(mob/living/M, mob/living/carbon/human/user)

 	var/chaplain = 0
-	if(user.mind && (user.mind.isholy))
+	if(user.mind && (user.mind.assigned_role == "Chaplain"))
 		chaplain = 1


@@ -149,50 +137,61 @@ var/global/list/bibleitemstates =	list("bible", "koran", "scrapbook", "bible", "
 		return
 	if(!chaplain)
 		user << "<span class='danger'>The book sizzles in your hands.</span>"
-		user.take_bodypart_damage(0,10)
+		user.take_organ_damage(0,10)
 		return

 	if (user.disabilities & CLUMSY && prob(50))
-		user << "<span class='danger'>[src] slips out of your hand and hits your head.</span>"
-		user.take_bodypart_damage(10)
+		user << "<span class='danger'>The [src] slips out of your hand and hits your head.</span>"
+		user.take_organ_damage(10)
 		user.Paralyse(20)
 		return

-	var/smack = 1
-
-	if (M.stat != DEAD)
-		if(chaplain && user == M)
+	if (M.stat !=2)
+		if(M.mind && (M.mind.assigned_role == "Chaplain"))
 			user << "<span class='warning'>You can't heal yourself!</span>"
 			return
+		if ((istype(M, /mob/living/carbon/human) && prob(60)))
+			bless(M)
+			if(ishuman(M))
+				var/mob/living/carbon/human/H = M
+				var/message_halt = 0
+				for(var/obj/item/bodypart/affecting in H.bodyparts)
+					if(affecting.status == ORGAN_ORGANIC)
+						if(message_halt == 0)
+							M.visible_message("<span class='notice'>[user] heals [M] with the power of [src.deity_name]!</span>")
+							M << "<span class='boldnotice'>May the power of [src.deity_name] compel you to be healed!</span>"
+							playsound(src.loc, "punch", 25, 1, -1)
+							message_halt = 1
+					else
+						user << "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>"
+						return

-		if(ishuman(M) && prob(60) && bless(M, user))
-			smack = 0
-		else if(iscarbon(M))
-			var/mob/living/carbon/C = M
-			if(!istype(C.head, /obj/item/clothing/head/helmet))
-				C.adjustBrainLoss(10)
-				C << "<span class='danger'>You feel dumber.</span>"

-		if(smack)
+
+
+		else
+			if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet))
+				M.adjustBrainLoss(10)
+				M << "<span class='danger'>You feel dumber.</span>"
 			M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", \
 					"<span class='userdanger'>[user] beats [M] over the head with [src]!</span>")
 			playsound(src.loc, "punch", 25, 1, -1)
 			add_logs(user, M, "attacked", src)

-	else
+	else if(M.stat == 2)
 		M.visible_message("<span class='danger'>[user] smacks [M]'s lifeless corpse with [src].</span>")
 		playsound(src.loc, "punch", 25, 1, -1)
-
+	return

 /obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user, proximity)
 	if(!proximity)
 		return
-	if(isfloorturf(A))
+	if (istype(A, /turf/open/floor))
 		user << "<span class='notice'>You hit the floor with the bible.</span>"
-		if(user.mind && (user.mind.isholy))
+		if(user.mind && (user.mind.assigned_role == "Chaplain"))
 			for(var/obj/effect/rune/R in orange(2,user))
 				R.invisibility = 0
-	if(user.mind && (user.mind.isholy))
+	if(user.mind && (user.mind.assigned_role == "Chaplain"))
 		if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
 			user << "<span class='notice'>You bless [A].</span>"
 			var/water2holy = A.reagents.get_reagent_amount("water")
@@ -203,3 +202,7 @@ var/global/list/bibleitemstates =	list("bible", "koran", "scrapbook", "bible", "
 			var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
 			A.reagents.del_reagent("unholywater")
 			A.reagents.add_reagent("holywater",unholy2clean)
+
+/obj/item/weapon/storage/book/bible/attackby(obj/item/weapon/W, mob/user, params)
+	playsound(src.loc, "rustle", 50, 1, -5)
+	return ..()
@@ -15,7 +15,6 @@
 *		Handcuff, mousetrap, and pillbottle boxes,
 *		Snap-pops and matchboxes,
 *		Replacement light boxes.
- *		Action Figure Boxes
 *		Various paper bags.
 *
 *		For syndicate call-ins see uplink_kits.dm
@@ -26,9 +25,102 @@
 	desc = "It's just an ordinary box."
 	icon_state = "box"
 	item_state = "syringe_kit"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	var/foldable = /obj/item/stack/sheet/cardboard
+	var/obj/item/device/boobytrap/trap = null

+/obj/item/weapon/storage/box/examine(mob/user)
+	..()
+
+	if(trap && in_range(user, src))
+		user << "<span class='warning'>Something seems to be wired to the inside of the box!</span>"
+		return
+
+
+/obj/item/weapon/storage/box/attackby(obj/item/C, mob/user, params)
+
+	if(!istype(C, /obj/item/device/boobytrap) && trap && !istype(C, /obj/item/weapon/wirecutters))
+		visible_message("<span class='warning'>[src] blows up in a spray of deadly shrapnel!</span>")
+		trap.loc = get_turf(src)
+		trap.blow()
+		trap = null
+		for(var/mob/living/carbon/human/H in orange(2,src))
+			H.Paralyse(8)
+			H.adjust_fire_stacks(1)
+			H.IgniteMob()
+		qdel(src)
+
+	if(istype(C, /obj/item/device/boobytrap))
+		if(trap)
+			user << "<span class='warning'>There's already a booby trap hooked up to this box!</span>"
+			return
+		user << "<span class='warning'>You apply [C]. Next time someone opens the box, it will explode.</span>"
+		C.loc = src
+		trap = C
+		qdel(C)
+		user.drop_item()
+
+	if(istype(C, /obj/item/weapon/wirecutters) && trap)
+		user << "<span class='notice'>You begin attempting to disarm the booby trap...</span>"
+		visible_message("<span class='warning'>[user] begins attempting to disarm the booby trap.</span>")
+		if(do_after(user, 80, target = src))
+			if(prob(75))
+				user << "<span class='notice'>You disarm the booby trap, destroying it in the process.</span>"
+				visible_message("<span class='notice'>[user] disarms the booby trap!</span>")
+				trap = null
+
+			else
+				user << "<span class='warning'>You accidentally bump the sensor and set off the booby trap!</span>"
+				visible_message("<span class='warning'>[user] fails to disarm the booby trap!</span>")
+				visible_message("<span class='warning'>[src] blows up in a spray of deadly shrapnel!</span>")
+				trap.loc = get_turf(src)
+				trap.blow()
+				trap = null
+				for(var/mob/living/carbon/human/H in orange(2,src))
+					H.Paralyse(8)
+					H.adjust_fire_stacks(1)
+					H.IgniteMob()
+					qdel(src)
+	else
+		..()
+
+/obj/item/weapon/storage/box/MouseDrop(atom/over_object)
+	if(iscarbon(usr) || isdrone(usr))
+		var/mob/M = usr
+
+		if(!over_object)
+			return
+
+		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
+			return
+
+		if(over_object == M && Adjacent(M))
+			if(trap)
+				visible_message("<span class='warning'>[src] blows up in a spray of deadly shrapnel!</span>")
+				trap.loc = get_turf(src)
+				trap.blow()
+				trap = null
+				for(var/mob/living/carbon/human/H in orange(2,src))
+					H.Paralyse(8)
+					H.adjust_fire_stacks(1)
+					H.IgniteMob()
+				qdel(src)
+			..()
+
+/obj/item/weapon/storage/box/attack_hand(mob/user)
+	..()
+
+	if(trap)
+		visible_message("<span class='warning'>[src] blows up in a spray of deadly shrapnel!</span>")
+		trap.loc = get_turf(src)
+		trap.blow()
+		trap = null
+		for(var/mob/living/carbon/human/H in orange(2,src))
+			H.Paralyse(8)
+			H.adjust_fire_stacks(1)
+			H.IgniteMob()
+		qdel(src)
+		return ..()

 /obj/item/weapon/storage/box/attack_self(mob/user)
 	..()
@@ -48,7 +140,8 @@
 	var/obj/item/I = new foldable(get_turf(src))
 	user.drop_item()
 	user.put_in_hands(I)
-	user.update_inv_hands()
+	user.update_inv_l_hand()
+	user.update_inv_r_hand()
 	qdel(src)

 /obj/item/weapon/storage/box/attackby(obj/item/W, mob/user, params)
@@ -70,7 +163,7 @@

 /obj/item/weapon/storage/box/survival_mining/New()
 	..()
-	new /obj/item/clothing/mask/gas/explorer(src)
+	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/weapon/crowbar/red(src)
 	new /obj/item/weapon/reagent_containers/hypospray/medipen(src)
@@ -127,6 +220,7 @@
 /obj/item/weapon/storage/box/syringes
 	name = "box of syringes"
 	desc = "A box full of syringes."
+	desc = "A biohazard alert warning is printed on the box"
 	icon_state = "syringe"

 /obj/item/weapon/storage/box/syringes/New()
@@ -165,7 +259,7 @@

 /obj/item/weapon/storage/box/injectors
 	name = "box of DNA injectors"
-	desc = "This box contains injectors, it seems."
+	desc = "This box contains injectors it seems."

 /obj/item/weapon/storage/box/injectors/New()
 	..()
@@ -196,7 +290,7 @@

 /obj/item/weapon/storage/box/wall_flash
 	name = "wall-mounted flash kit"
-	desc = "This box contains everything necessary to build a wall-mounted flash. <B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
+	desc = "This box contains everything neccesary to build a wall-mounted flash. <B>WARNING: Flashes can cause serious eye damage, protective eyewear is required.</B>"
 	icon_state = "flashbang"

 /obj/item/weapon/storage/box/wall_flash/New()
@@ -342,6 +436,18 @@
 	for(var/i = 1; i <= 5; i++)
 		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src)

+
+/obj/item/weapon/storage/box/permits
+	name = "box of construction permits"
+	desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station."
+	icon_state = "id"
+
+/obj/item/weapon/storage/box/permits/New() //There's only a few, so blueprints are still useful beyond setting every room's name to PRIMARY FART STORAGE
+	..()
+	for(var/i in 1 to 3)
+		new /obj/item/areaeditor/permit(src)
+
+
 /obj/item/weapon/storage/box/ids
 	name = "box of spare IDs"
 	desc = "Has so many empty IDs."
@@ -489,7 +595,7 @@
 	icon_state = "matchbox"
 	item_state = "zippo"
 	storage_slots = 10
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/weapon/match)

@@ -551,7 +657,7 @@

 /obj/item/weapon/storage/box/metalfoam
 	name = "box of metal foam grenades"
-	desc = "To be used to rapidly seal hull breaches."
+	desc = "To be used to rapidly seal hull breaches"
 	icon_state = "flashbang"

 /obj/item/weapon/storage/box/metalfoam/New()
@@ -566,7 +672,7 @@
 	foldable = null

 /obj/item/weapon/storage/box/hug/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all..</span>")
+	user.visible_message("<span class='suicide'>[user] clamps the box of hugs on \his jugular! Guess it wasn't such a hugbox after all..</span>")
 	return (BRUTELOSS)

 /obj/item/weapon/storage/box/hug/attack_self(mob/user)
@@ -623,18 +729,6 @@
 	new /obj/item/ammo_casing/shotgun/beanbag(src)
 	new /obj/item/ammo_casing/shotgun/beanbag(src)

-
-/obj/item/weapon/storage/box/actionfigure
-	name = "box of action figures"
-	desc = "The latest set of collectable action figures."
-	icon_state = "box"
-
-/obj/item/weapon/storage/box/actionfigure/New()
-	..()
-	for(var/i in 1 to 4)
-		var/randomFigure = pick(subtypesof(/obj/item/toy/figure))
-		new randomFigure(src)
-
 #define NODESIGN "None"
 #define NANOTRASEN "NanotrasenStandard"
 #define SYNDI "SyndiSnacks"
@@ -646,7 +740,7 @@
 	desc = "A sack neatly crafted out of paper."
 	icon_state = "paperbag_None"
 	item_state = "paperbag_None"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	foldable = null
 	var/design = NODESIGN

@@ -715,31 +809,38 @@

 /obj/item/weapon/storage/box/ingredients/wildcard/New()
 	..()
-	for(var/i in 1 to 7)
+	for(var/i in 1 to 6)
+		//Pick common ingredients
 		var/randomFood = pick(/obj/item/weapon/reagent_containers/food/snacks/grown/chili,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
+				 			  /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+				 			  /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
+				  			  /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
+				 			  /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
 							  /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
+						 	  /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
 							  /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
 							  /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
 							  /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
-							  /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle)
+							  /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+						 	  /obj/item/weapon/reagent_containers/food/snacks/grown/corn)
 		new randomFood(src)
+	//Pick one random rare ingredient
+	var/randomRareFood = pick(/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+						      /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold,
+			 				  /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper,
+							  /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili,
+				 			  /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
+							  /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle)
+	new randomRareFood(src)

 /obj/item/weapon/storage/box/ingredients/fiesta
 	item_state = "fiesta"

 /obj/item/weapon/storage/box/ingredients/fiesta/New()
 	..()
-	new /obj/item/weapon/reagent_containers/food/snacks/tortilla(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/reagent_containers/food/snacks/tortilla(src)
 	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/corn(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/grown/chili(src)

@@ -750,80 +851,32 @@
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/bottle/wine(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)

 /obj/item/weapon/storage/box/ingredients/vegetarian
 	item_state = "vegetarian"

 /obj/item/weapon/storage/box/ingredients/vegetarian/New()
 	..()
-	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
+	for(var/i in 1 to 3)
+		new /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/grown/potato(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/grown/apple(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/corn(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
-
-/obj/item/weapon/storage/box/ingredients/american
-	item_state = "american"
-
-/obj/item/weapon/storage/box/ingredients/american/New()
-	..()
-	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/potato(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/corn(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)
-
-/obj/item/weapon/storage/box/ingredients/fruity
-	item_state = "fruity"
-
-/obj/item/weapon/storage/box/ingredients/fruity/New()
-	..()
-	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/apple(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon(src)

 /obj/item/weapon/storage/box/ingredients/sweets
 	item_state = "sweets"

 /obj/item/weapon/storage/box/ingredients/sweets/New()
-	..()
-	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/cherries(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/apple(src)
-
-/obj/item/weapon/storage/box/ingredients/delights
-	item_state = "delights"
-
-/obj/item/weapon/storage/box/ingredients/delights/New()
-	..()
-	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
-
-/obj/item/weapon/storage/box/ingredients/grains
-	item_state = "grains"
-
-/obj/item/weapon/storage/box/ingredients/grains/New()
 	..()
 	for(var/i in 1 to 3)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/oat(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/wheat(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod(src)
-	new /obj/item/weapon/reagent_containers/honeycomb(src)
-	new /obj/item/seeds/poppy(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(src)
+	new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/grown/cherries(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/icecream(src)

 /obj/item/weapon/storage/box/ingredients/carnivore
 	item_state = "carnivore"
@@ -832,22 +885,22 @@
 	..()
 	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/spidereggs(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime(src)
 	new /obj/item/weapon/reagent_containers/food/snacks/faggot(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(src)
+	new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src)

 /obj/item/weapon/storage/box/ingredients/exotic
 	item_state = "exotic"

 /obj/item/weapon/storage/box/ingredients/exotic/New()
 	..()
+	new /obj/item/weapon/reagent_containers/food/condiment/soysauce(src)
 	for(var/i in 1 to 2)
-		new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans(src)
 		new /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/grown/chili(src)
+		new	/obj/item/weapon/reagent_containers/food/snacks/soydope(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)

 /obj/item/weapon/storage/box/ingredients/New()
 	..()
@@ -877,3 +930,14 @@
 	new /obj/item/weapon/circuitboard/machine/destructive_analyzer(src)
 	new /obj/item/weapon/circuitboard/machine/circuit_imprinter(src)
 	new /obj/item/weapon/circuitboard/computer/rdconsole(src)
+
+/obj/item/weapon/storage/box/medipens/utility1
+	name = "survival value kit"
+	desc = "A box with several survival medipens for the economical miner."
+	icon_state = "syringe"
+
+/obj/item/weapon/storage/box/medipens/utility1/New()
+	..()
+	for(var/i in 1 to 5)
+		new /obj/item/weapon/reagent_containers/hypospray/medipen/survival(src)
+
@@ -7,13 +7,12 @@
 	hitsound = "swing_hit"
 	throw_speed = 2
 	throw_range = 4
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 4
+	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	resistance_flags = FLAMMABLE
-	obj_integrity = 150
-	max_integrity = 150
+	burn_state = FLAMMABLE
+	burntime = 20
 	var/folder_path = /obj/item/weapon/folder //this is the path of the folder that gets spawned in New()

 /obj/item/weapon/storage/briefcase/New()
@@ -39,18 +38,17 @@
 	hitsound = "swing_hit"
 	throw_speed = 2
 	throw_range = 4
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 4
+	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	resistance_flags = FLAMMABLE
-	obj_integrity = 150
-	max_integrity = 150
+	burn_state = FLAMMABLE
+	burntime = 20

 /obj/item/weapon/storage/briefcase/sniperbundle/New()
 	..()
-	new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate(src)
-	new /obj/item/clothing/neck/tie/red(src)
+	new /obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate(src)
+	new /obj/item/clothing/tie/red(src)
 	new /obj/item/clothing/under/syndicate/sniper(src)
 	new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
 	new /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage(src)
@@ -17,10 +17,9 @@
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "donutbox6"
 	name = "donut box"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null
-	var/fancy_open = FALSE

 /obj/item/weapon/storage/fancy/New()
 	..()
@@ -28,37 +27,16 @@
 		new spawn_type(src)

 /obj/item/weapon/storage/fancy/update_icon(itemremoved = 0)
-	if(fancy_open)
-		var/total_contents = src.contents.len - itemremoved
-		icon_state = "[icon_type]box[total_contents]"
-	else
-		icon_state = "[icon_type]box"
+	var/total_contents = src.contents.len - itemremoved
+	src.icon_state = "[src.icon_type]box[total_contents]"
+	return

 /obj/item/weapon/storage/fancy/examine(mob/user)
 	..()
-	if(fancy_open)
-		if(contents.len == 1)
-			user << "There is one [src.icon_type] left."
-		else
-			user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."
-
-/obj/item/weapon/storage/fancy/attack_self(mob/user)
-	fancy_open = !fancy_open
-	update_icon()
-
-/obj/item/weapon/storage/fancy/content_can_dump(atom/dest_object, mob/user)
-	. = ..()
-	if(.)
-		fancy_open = TRUE
-		update_icon()
-
-/obj/item/weapon/storage/fancy/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
-	fancy_open = TRUE
-	return ..()
-
-/obj/item/weapon/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
-	fancy_open = TRUE
-	return ..()
+	if(contents.len == 1)
+		user << "There is one [src.icon_type] left."
+	else
+		user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."

 /*
 * Donut Box
@@ -72,7 +50,6 @@
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
 	spawn_type = /obj/item/weapon/reagent_containers/food/snacks/donut
-	fancy_open = TRUE

 /*
 * Egg Box
@@ -102,10 +79,6 @@
 	throwforce = 2
 	slot_flags = SLOT_BELT
 	spawn_type = /obj/item/candle
-	fancy_open = TRUE
-
-/obj/item/weapon/storage/fancy/candle_box/attack_self(mob_user)
-	return

 ////////////
 //CIG PACK//
@@ -116,7 +89,7 @@
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig"
 	item_state = "cigpacket"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	throwforce = 0
 	slot_flags = SLOT_BELT
 	storage_slots = 6
@@ -132,39 +105,21 @@
 		cig.desc = "\An [name] brand [cig.name]."
 	name = "\improper [name] packet"

-/obj/item/weapon/storage/fancy/cigarettes/AltClick(mob/user)
-	if(user.get_active_held_item())
-		return
-	for(var/obj/item/weapon/lighter/lighter in src)
-		remove_from_storage(lighter, user.loc)
-		user.put_in_active_hand(lighter)
-		break
-
 /obj/item/weapon/storage/fancy/cigarettes/update_icon()
-	if(fancy_open || !contents.len)
-		cut_overlays()
-		if(!contents.len)
-			icon_state = "[initial(icon_state)]_empty"
-		else
-			icon_state = initial(icon_state)
-			add_overlay("[icon_state]_open")
-			var/i = contents.len
-			for(var/C in contents)
-				if(istype(C, /obj/item/weapon/lighter/greyscale))
-					add_overlay(image(icon = src.icon, icon_state = "lighter_in", pixel_x = 1 * (i -1)))
-				else if(istype(C, /obj/item/weapon/lighter))
-					add_overlay(image(icon = src.icon, icon_state = "zippo_in", pixel_x = 1 * (i -1)))
-				else
-					add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (i -1)))
-				i--
+	cut_overlays()
+	icon_state = initial(icon_state)
+	if(!contents.len)
+		icon_state += "_empty"
 	else
-		cut_overlays()
+		add_overlay("[icon_state]_open")
+		for(var/c = contents.len, c >= 1, c--)
+			add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (c -1)))
+	return

 /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W, atom/new_location)
 	if(istype(W,/obj/item/clothing/mask/cigarette))
 		if(reagents)
 			reagents.trans_to(W,(reagents.total_volume/contents.len))
-	fancy_open = TRUE
 	..()

 /obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -247,7 +202,7 @@
 /obj/item/weapon/storage/fancy/rollingpapers
 	name = "rolling paper pack"
 	desc = "A pack of NanoTrasen brand rolling papers."
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
 	storage_slots = 10
@@ -259,6 +214,7 @@
 	cut_overlays()
 	if(!contents.len)
 		add_overlay("[icon_state]_empty")
+	return

 /////////////
 //CIGAR BOX//
@@ -269,21 +225,18 @@
 	desc = "A case of premium cigars. Very expensive."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cigarcase"
-	w_class = WEIGHT_CLASS_NORMAL
-	storage_slots = 5
+	w_class = 3
+	storage_slots = 7
 	can_hold = list(/obj/item/clothing/mask/cigarette/cigar)
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar

 /obj/item/weapon/storage/fancy/cigarettes/cigars/update_icon()
-	if(fancy_open)
-		cut_overlays()
-		add_overlay("[icon_state]_open")
-		for(var/c = contents.len, c >= 1, c--)
-			add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
-	else
-		cut_overlays()
-		icon_state = "cigarcase"
+	cut_overlays()
+	add_overlay("[icon_state]_open")
+	for(var/c = contents.len, c >= 1, c--)
+		add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
+	return

 /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba
 	name = "\improper cohiba robusto cigar case"
@@ -103,7 +103,7 @@
 	name = "combat medical kit"
 	desc = "I hope you've got insurance."
 	icon_state = "bezerk"
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3

 /obj/item/weapon/storage/firstaid/tactical/New()
 	..()
@@ -127,7 +127,7 @@
 	icon_state = "pill_canister"
 	icon = 'icons/obj/chemical.dmi'
 	item_state = "contsolid"
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 2
 	can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice)
 	allow_quick_gather = 1
 	use_to_pickup = 1
@@ -142,7 +142,11 @@
 			var/obj/screen/inventory/hand/H = over_object
 			if(!M.unEquip(src))
 				return
-			M.put_in_hand(src,H.held_index)
+			switch(H.slot_id)
+				if(slot_r_hand)
+					M.put_in_r_hand(src)
+				if(slot_l_hand)
+					M.put_in_l_hand(src)
 			src.add_fingerprint(usr)
 			return
 		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
@@ -1,75 +1,42 @@
 /obj/item/weapon/storage/internal
 	storage_slots = 2
-	max_w_class = WEIGHT_CLASS_SMALL
-	max_combined_w_class = 50 // Limited by slots, not combined weight class
-	w_class = WEIGHT_CLASS_BULKY
-	rustle_jimmies = FALSE
+	max_w_class = 2
+	max_combined_w_class = 4
+	w_class = 4
+	var/priority = 1

-/obj/item/weapon/storage/internal/ClickAccessible(mob/user, depth=1)
-	if(loc)
-		return loc.ClickAccessible(user, depth)
-
-/obj/item/weapon/storage/internal/Adjacent(A)
-	if(loc)
-		return loc.Adjacent(A)
-
-/obj/item/weapon/storage/internal/pocket
-	var/priority = TRUE
-	// TRUE if opens when clicked, like a backpack.
-	// FALSE if opens only when dragged on mob's icon (hidden pocket)
-	var/quickdraw = FALSE
-	// TRUE if you can quickdraw items from it with alt-click.
-
-/obj/item/weapon/storage/internal/pocket/New()
+/*obj/item/weapon/storage/internal/pocket/New()
 	..()
-	if(loc)
-		name = loc.name
-
-/obj/item/weapon/storage/internal/pocket/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
-	. = ..()
-	if(. && silent && !prevent_warning)
-		if(quickdraw)
-			user << "<span class='notice'>You discreetly slip [W] into [src]. Alt-click [src] to remove it.</span>"
-		else
-			user << "<span class='notice'>You discreetly slip [W] into [src]."
+	if(loc) name = loc.name

 /obj/item/weapon/storage/internal/pocket/big
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3
+	max_combined_w_class = 6

 /obj/item/weapon/storage/internal/pocket/small
 	storage_slots = 1
-	priority = FALSE
+	max_combined_w_class = 2
+	priority = 0

 /obj/item/weapon/storage/internal/pocket/tiny
 	storage_slots = 1
-	max_w_class = WEIGHT_CLASS_TINY
-	priority = FALSE
+	max_w_class = 1
+	max_combined_w_class = 1
+	priority = 0

-/obj/item/weapon/storage/internal/pocket/shoes
-	can_hold = list(
-		/obj/item/weapon/kitchen/knife, /obj/item/weapon/switchblade, /obj/item/weapon/pen,
-		/obj/item/weapon/scalpel, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/dnainjector,
-		/obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/weapon/reagent_containers/dropper,
-		/obj/item/weapon/implanter, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool/mini,
-		/obj/item/device/firing_pin
-		)
-	//can hold both regular pens and energy daggers. made for your every-day tactical librarians/murderers.
-	priority = FALSE
-	quickdraw = TRUE
-	silent = TRUE
-
-
-/obj/item/weapon/storage/internal/pocket/shoes/clown
-	can_hold = list(
-		/obj/item/weapon/kitchen/knife, /obj/item/weapon/switchblade, /obj/item/weapon/pen,
-		/obj/item/weapon/scalpel, /obj/item/weapon/reagent_containers/syringe, /obj/item/weapon/dnainjector,
-		/obj/item/weapon/reagent_containers/hypospray/medipen, /obj/item/weapon/reagent_containers/dropper,
-		/obj/item/weapon/implanter, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool/mini,
-		/obj/item/device/firing_pin, /obj/item/weapon/bikehorn)

 /obj/item/weapon/storage/internal/pocket/small/detective
-	priority = TRUE // so the detectives would discover pockets in their hats
+	priority = 1

 /obj/item/weapon/storage/internal/pocket/small/detective/New()
 	..()
 	new /obj/item/weapon/reagent_containers/food/drinks/flask/det(src)
+
+
+proc/isstorage(var/atom/A)
+	if(istype(A, /obj/item/weapon/storage))
+		return 1
+
+	if(istype(A, /obj/item/clothing))
+		var/obj/item/clothing/C = A
+		if(C.pockets) return 1*/
@@ -1,12 +1,12 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32

 /obj/item/weapon/storage/lockbox
 	name = "lockbox"
 	desc = "A locked box."
 	icon_state = "lockbox+l"
 	item_state = "syringe_kit"
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 4
+	max_w_class = 3
 	max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
 	storage_slots = 4
 	req_access = list(access_armory)
@@ -101,9 +101,9 @@
 	desc = "A locked box used to store medals of honor."
 	icon_state = "medalbox+l"
 	item_state = "syringe_kit"
-	w_class = WEIGHT_CLASS_NORMAL
-	max_w_class = WEIGHT_CLASS_SMALL
-	storage_slots = 10
+	w_class = 3
+	max_w_class = 2
+	storage_slots = 6
 	req_access = list(access_captain)
 	icon_locked = "medalbox+l"
 	icon_closed = "medalbox"
@@ -116,6 +116,3 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/tie/medal/conduct(src)
 	new /obj/item/clothing/tie/medal/gold/captain(src)
-	new /obj/item/clothing/tie/medal/silver/security(src)
-	new /obj/item/clothing/tie/medal/nobel_science(src)
-	new /obj/item/clothing/tie/medal/gold/heroism(src)
@@ -21,9 +21,10 @@
 	var/l_set = 0
 	var/l_setshort = 0
 	var/l_hacking = 0
+	var/emagged = 0
 	var/open = 0
-	w_class = WEIGHT_CLASS_NORMAL
-	max_w_class = WEIGHT_CLASS_SMALL
+	w_class = 3
+	max_w_class = 2
 	max_combined_w_class = 14

 /obj/item/weapon/storage/secure/examine(mob/user)
@@ -33,15 +34,15 @@
 /obj/item/weapon/storage/secure/attackby(obj/item/weapon/W, mob/user, params)
 	if(locked)
 		if (istype(W, /obj/item/weapon/screwdriver))
-			if (do_after(user, 20*W.toolspeed, target = src))
+			if (do_after(user, 20/W.toolspeed, target = src))
 				src.open =! src.open
 				user.show_message("<span class='notice'>You [open ? "open" : "close"] the service panel.</span>", 1)
 			return
 		if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
 			user.show_message("<span class='danger'>Now attempting to reset internal memory, please hold.</span>", 1)
 			src.l_hacking = 1
-			if (do_after(usr, 100*W.toolspeed, target = src))
-				if (prob(33))
+			if (do_after(usr, 100/W.toolspeed, target = src))
+				if (prob(40))
 					src.l_setshort = 1
 					src.l_set = 0
 					user.show_message("<span class='danger'>Internal memory reset.  Please give it a few seconds to reinitialize.</span>", 1)
@@ -61,6 +62,17 @@
 	// -> storage/attackby() what with handle insertion, etc
 	return ..()

+/obj/item/weapon/storage/secure/emag_act(mob/user)
+	if(locked)
+		if(!emagged)
+			emagged = 1
+			src.add_overlay(image('icons/obj/storage.dmi', icon_sparking))
+			sleep(6)
+			src.overlays = null
+			add_overlay(image('icons/obj/storage.dmi', icon_locking))
+			locked = 0
+			user << "<span class='notice'>You short out the lock on [src].</span>"
+
 /obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)
 	if (locked)
 		src.add_fingerprint(usr)
@@ -72,8 +84,10 @@
 	user.set_machine(src)
 	var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
 	var/message = "Code"
-	if ((src.l_set == 0) && (!src.l_setshort))
+	if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
 		dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
+	if (src.emagged)
+		dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
 	if (src.l_setshort)
 		dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
 	message = text("[]", src.code)
@@ -91,7 +105,7 @@
 			if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
 				src.l_code = src.code
 				src.l_set = 1
-			else if ((src.code == src.l_code) && (src.l_set == 1))
+			else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
 				src.locked = 0
 				src.overlays = null
 				add_overlay(image('icons/obj/storage.dmi', icon_opened))
@@ -99,13 +113,13 @@
 			else
 				src.code = "ERROR"
 		else
-			if ((href_list["type"] == "R") && (!src.l_setshort))
+			if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
 				src.locked = 1
 				src.overlays = null
 				src.code = null
 				src.close(usr)
 			else
-				src.code += text("[]", sanitize_text(href_list["type"]))
+				src.code += text("[]", href_list["type"])
 				if (length(src.code) > 5)
 					src.code = "ERROR"
 		src.add_fingerprint(usr)
@@ -140,8 +154,8 @@
 	hitsound = "swing_hit"
 	throw_speed = 2
 	throw_range = 4
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 4
+	max_w_class = 3
 	max_combined_w_class = 21
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")

@@ -153,9 +167,19 @@
 /obj/item/weapon/storage/secure/briefcase/attack_hand(mob/user)
 	if ((src.loc == user) && (src.locked == 1))
 		usr << "<span class='warning'>[src] is locked and cannot be opened!</span>"
-		add_fingerprint(user)
+	else if ((src.loc == user) && (!src.locked))
+		playsound(src.loc, "rustle", 50, 1, -5)
+		if (user.s_active)
+			user.s_active.close(user) //Close and re-open
+		src.show_to(user)
 	else
 		..()
+		for(var/mob/M in range(1))
+			if (M.s_active == src)
+				src.close(M)
+		src.orient2hud(user)
+	src.add_fingerprint(user)
+	return

 //Syndie variant of Secure Briefcase. Contains space cash, slightly more robust.
 /obj/item/weapon/storage/secure/briefcase/syndie
@@ -179,7 +203,7 @@
 	icon_locking = "safeb"
 	icon_sparking = "safespark"
 	force = 8
-	w_class = WEIGHT_CLASS_GIGANTIC
+	w_class = 8
 	max_w_class = 8
 	anchored = 1
 	density = 0
@@ -195,4 +219,4 @@

 /obj/item/weapon/storage/secure/safe/HoS/New()
 	..()
-	//new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)
+	//new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)
@@ -8,12 +8,12 @@
 /obj/item/weapon/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	var/silent = 0 // No message on putting items in
 	var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
 	var/list/is_seeing = new/list() //List of mobs which are currently seeing the contents of this item's storage
-	var/max_w_class = WEIGHT_CLASS_SMALL //Max size of objects that this object can store (in effect only if can_hold isn't set)
+	var/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
 	var/max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
 	var/storage_slots = 7 //The number of storage slots in this container.
 	var/obj/screen/storage/boxes = null
@@ -24,11 +24,10 @@
 	var/allow_quick_gather	//Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile.
 	var/collection_mode = 1;  //0 = pick one at a time, 1 = pick all on tile, 2 = pick all of a type
 	var/preposition = "in" // You put things 'in' a bag, but trays need 'on'.
-	var/rustle_jimmies = TRUE	//Play the rustle sound on insertion


 /obj/item/weapon/storage/MouseDrop(atom/over_object)
-	if(ismob(usr)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked
+	if(iscarbon(usr) || isdrone(usr)) //all the check for item manipulation are in other places, you can safely open any storages as anything and its not buggy, i checked
 		var/mob/M = usr

 		if(!over_object)
@@ -37,9 +36,8 @@
 		if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
 			return

-		// this must come before the screen objects only block, dunno why it wasn't before
-		if(over_object == M && (src.ClickAccessible(M, depth=STORAGE_VIEW_DEPTH) || Adjacent(M)))
-			orient2hud(M)
+		if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
+			orient2hud(M)					// dunno why it wasn't before
 			if(M.s_active)
 				M.s_active.close(M)
 			show_to(M)
@@ -59,21 +57,14 @@
 				var/obj/screen/inventory/hand/H = over_object
 				if(!M.unEquip(src))
 					return
-				M.put_in_hand(src,H.held_index)
+				switch(H.slot_id)
+					if(slot_r_hand)
+						M.put_in_r_hand(src)
+					if(slot_l_hand)
+						M.put_in_l_hand(src)

 			add_fingerprint(usr)

-
-/obj/item/weapon/storage/MouseDrop_T(atom/movable/O, mob/user)
-	if(istype(O, /obj/item))
-		var/obj/item/I = O
-		if(iscarbon(user) || isdrone(user))
-			var/mob/living/L = user
-			if(!L.incapacitated() && I == L.get_active_held_item())
-				if(can_be_inserted(I, 0))
-					handle_item_insertion(I, 0 , L)
-
-
 //Check if this storage can dump the items
 /obj/item/weapon/storage/proc/content_can_dump(atom/dest_object, mob/user)
 	if(Adjacent(user) && dest_object.Adjacent(user))
@@ -89,7 +80,7 @@
 			if(I.on_found(user))
 				return
 		if(can_be_inserted(I,0,user))
-			handle_item_insertion(I, TRUE, user)
+			src_object.remove_from_storage(I, src)
 	orient2hud(user)
 	src_object.orient2hud(user)
 	if(user.s_active) //refresh the HUD to show the transfered contents
@@ -122,7 +113,7 @@
 	is_seeing |= user


-/obj/item/weapon/storage/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0)
+/obj/item/weapon/storage/throw_at(atom/target, range, speed, mob/thrower, spin)
 	close_all()
 	return ..()

@@ -167,7 +158,6 @@
 	for(var/obj/O in contents)
 		O.screen_loc = "[cx],[cy]"
 		O.layer = ABOVE_HUD_LAYER
-		O.plane = ABOVE_HUD_PLANE
 		cx++
 		if(cx > mx)
 			cx = tx
@@ -187,7 +177,6 @@
 			ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
 			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
 			ND.sample_object.layer = ABOVE_HUD_LAYER
-			ND.sample_object.plane = ABOVE_HUD_PLANE
 			cx++
 			if(cx > (4+cols))
 				cx = 4
@@ -198,7 +187,6 @@
 			O.screen_loc = "[cx]:16,[cy]:16"
 			O.maptext = ""
 			O.layer = ABOVE_HUD_LAYER
-			O.plane = ABOVE_HUD_PLANE
 			cx++
 			if(cx > (4+cols))
 				cx = 4
@@ -217,7 +205,7 @@
 	number = 1


-//This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
+//This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing.
 /obj/item/weapon/storage/proc/orient2hud(mob/user)
 	var/adjusted_contents = contents.len

@@ -320,15 +308,8 @@
 	if(usr)
 		if(usr.client && usr.s_active != src)
 			usr.client.screen -= W
-		if(usr.observers && usr.observers.len)
-			for(var/M in usr.observers)
-				var/mob/dead/observe = M
-				if(observe.client && observe.s_active != src)
-					observe.client.screen -= W

 		add_fingerprint(usr)
-		if(rustle_jimmies)
-			playsound(src.loc, "rustle", 50, 1, -5)

 		if(!prevent_warning)
 			for(var/mob/M in viewers(usr, null))
@@ -348,7 +329,7 @@


 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
-/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W, atom/new_location)
+/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
 	if(!istype(W))
 		return 0

@@ -364,43 +345,37 @@
 		var/mob/M = loc
 		W.dropped(M)
 	W.layer = initial(W.layer)
-	W.plane = initial(W.plane)
 	W.loc = new_location

-	for(var/mob/M in can_see_contents())
-		orient2hud(M)
-		show_to(M)
-
+	if(usr)
+		orient2hud(usr)
+		if(usr.s_active)
+			usr.s_active.show_to(usr)
 	if(W.maptext)
 		W.maptext = ""
 	W.on_exit_storage(src)
 	update_icon()
 	W.mouse_opacity = initial(W.mouse_opacity)
+	if(burn)
+		W.fire_act()
 	return 1

-/obj/item/weapon/storage/deconstruct(disassembled = TRUE)
-	var/drop_loc = loc
-	if(ismob(loc))
-		drop_loc = get_turf(src)
-	for(var/obj/item/I in contents)
-		remove_from_storage(I, drop_loc)
-	qdel(src)
+
+/obj/item/weapon/storage/empty_object_contents(burn, src.loc)
+	for(var/obj/item/Item in contents)
+		remove_from_storage(Item, src.loc, burn)

 //This proc is called when you want to place an item into the storage item.
 /obj/item/weapon/storage/attackby(obj/item/W, mob/user, params)
 	..()
-	if(istype(W, /obj/item/weapon/hand_labeler))
-		var/obj/item/weapon/hand_labeler/labeler = W
-		if(labeler.mode)
-			return 0
 	. = 1 //no afterattack
-	if(iscyborg(user))
+	if(isrobot(user))
 		return	//Robots can't interact with storage items.

 	if(!can_be_inserted(W, 0 , user))
 		return
-
-	handle_item_insertion(W, 0 , user)
+	if(!istype(W, /obj/item/device/boobytrap))
+		handle_item_insertion(W, 0 , user)


 /obj/item/weapon/storage/attack_hand(mob/user)
@@ -413,11 +388,11 @@

 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if(H.l_store == src && !H.get_active_held_item())	//Prevents opening if it's in a pocket.
+		if(H.l_store == src && !H.get_active_hand())	//Prevents opening if it's in a pocket.
 			H.put_in_hands(src)
 			H.l_store = null
 			return
-		if(H.r_store == src && !H.get_active_held_item())
+		if(H.r_store == src && !H.get_active_hand())
 			H.put_in_hands(src)
 			H.r_store = null
 			return
@@ -490,12 +465,10 @@
 	boxes.icon_state = "block"
 	boxes.screen_loc = "7,7 to 10,8"
 	boxes.layer = HUD_LAYER
-	boxes.plane = HUD_PLANE
 	closer = new /obj/screen/close()
 	closer.master = src
 	closer.icon_state = "backpack_close"
 	closer.layer = ABOVE_HUD_LAYER
-	closer.plane = ABOVE_HUD_PLANE
 	orient2hud()


@@ -510,7 +483,7 @@


 /obj/item/weapon/storage/emp_act(severity)
-	if(!isliving(loc))
+	if(!istype(loc, /mob/living))
 		for(var/obj/O in contents)
 			O.emp_act(severity)
 	..()
@@ -518,7 +491,7 @@

 /obj/item/weapon/storage/attack_self(mob/user)
 	//Clicking on itself will empty it, if it has the verb to do that.
-	if(user.get_active_held_item() == src)
+	if(user.get_active_hand() == src)
 		if(verbs.Find(/obj/item/weapon/storage/verb/quick_empty))
 			quick_empty()

@@ -526,8 +499,3 @@
 	if(A in contents)
 		usr = null
 		remove_from_storage(A, loc)
-
-/obj/item/weapon/storage/contents_explosion(severity, target)
-	for(var/atom/A in contents)
-		A.ex_act(severity, target)
-		CHECK_TICK
@@ -4,18 +4,18 @@
 	icon_state = "red"
 	item_state = "toolbox_red"
 	flags = CONDUCT
-	force = 12
-	throwforce = 12
+	force = 10
+	throwforce = 10
 	throw_speed = 2
 	throw_range = 7
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	materials = list(MAT_METAL = 500)
 	origin_tech = "combat=1;engineering=1"
 	attack_verb = list("robusted")
 	hitsound = 'sound/weapons/smash.ogg'

 /obj/item/weapon/storage/toolbox/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] robusts [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] robusts \himself with [src]! It looks like \he's trying to commit suicide..</span>")
 	return (BRUTELOSS)

 /obj/item/weapon/storage/toolbox/emergency
@@ -55,17 +55,17 @@

 /obj/item/weapon/storage/toolbox/electrical/New()
 	..()
-	var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
+	var/color = pick("red","yellow","green","blue","pink","orange","cyan","white")
 	new /obj/item/weapon/screwdriver(src)
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/device/t_scanner(src)
 	new /obj/item/weapon/crowbar(src)
-	new /obj/item/stack/cable_coil(src,30,pickedcolor)
-	new /obj/item/stack/cable_coil(src,30,pickedcolor)
+	new /obj/item/stack/cable_coil(src,30,color)
+	new /obj/item/stack/cable_coil(src,30,color)
 	if(prob(5))
 		new /obj/item/clothing/gloves/color/yellow(src)
 	else
-		new /obj/item/stack/cable_coil(src,30,pickedcolor)
+		new /obj/item/stack/cable_coil(src,30,color)

 /obj/item/weapon/storage/toolbox/syndicate
 	name = "suspicious looking toolbox"
@@ -93,12 +93,12 @@

 /obj/item/weapon/storage/toolbox/drone/New()
 	..()
-	var/pickedcolor = pick("red","yellow","green","blue","pink","orange","cyan","white")
+	var/color = pick("red","yellow","green","blue","pink","orange","cyan","white")
 	new /obj/item/weapon/screwdriver(src)
 	new /obj/item/weapon/wrench(src)
 	new /obj/item/weapon/weldingtool(src)
 	new /obj/item/weapon/crowbar(src)
-	new /obj/item/stack/cable_coil(src,30,pickedcolor)
+	new /obj/item/stack/cable_coil(src,30,color)
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/device/multitool(src)

@@ -106,8 +106,8 @@
 	name = "brass box"
 	desc = "A huge brass box with several indentations in its surface."
 	icon_state = "brassbox"
-	w_class = WEIGHT_CLASS_HUGE
-	max_w_class = WEIGHT_CLASS_NORMAL
+	w_class = 5
+	max_w_class = 3
 	max_combined_w_class = 28
 	storage_slots = 28
 	slowdown = 1
@@ -1,24 +1,21 @@
-/obj/item/weapon/storage/box/syndicate
+/obj/item/weapon/storage/box/syndicate/

 /obj/item/weapon/storage/box/syndicate/New()
 	..()
-	switch (pickweight(list("bloodyspai" = 3, "stealth" = 2, "bond" = 2, "screwed" = 2, "sabotage" = 3, "guns" = 2, "murder" = 2, "implant" = 1, "hacker" = 3, "lordsingulo" = 1, "darklord" = 1, "sniper" = 1, "metaops" = 1, "ninja" = 1)))
-		if("bloodyspai") // 27 tc now this is more right
-			new /obj/item/clothing/under/chameleon(src) // 2 tc since it's not the full set
-			new /obj/item/clothing/mask/chameleon(src) // Goes with above
-			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
-			new /obj/item/clothing/shoes/chameleon(src) // 2 tc
-			new /obj/item/device/camera_bug(src) // 1 tc
-			new /obj/item/device/multitool/ai_detect(src) // 1 tc
-			new /obj/item/device/encryptionkey/syndicate(src) // 2 tc
-			new /obj/item/weapon/reagent_containers/syringe/mulligan(src) // 4 tc
-			new /obj/item/weapon/switchblade(src) //I'll count this as 2 tc
-			new /obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate (src) // 2 tc this shit heals
-			new /obj/item/device/flashlight/emp(src) // 2 tc
-			new /obj/item/device/chameleon(src) // 7 tc
+	switch (pickweight(list("bloodyspai" = 3, "stealth" = 3, "bond" = 1, "screwed" = 3, "sabotage" = 3, "guns" = 1, "murder" = 2, "implant" = 2, "hacker" = 2, "lordsingulo" = 2, "darklord" = 1)))
+		if("bloodyspai")
+			new /obj/item/clothing/under/chameleon(src)
+			new /obj/item/clothing/mask/chameleon(src)
+			new /obj/item/weapon/card/id/syndicate(src)
+			new /obj/item/clothing/shoes/chameleon(src)
+			new /obj/item/device/camera_bug(src)
+			new /obj/item/device/multitool/ai_detect(src)
+			new /obj/item/device/encryptionkey/syndicate(src)
+			new /obj/item/weapon/reagent_containers/syringe/mulligan(src)
+			new /obj/item/weapon/switchblade(src)
 			return

-		if("stealth") // 31 tc
+		if("stealth")
 			new /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow(src)
 			new /obj/item/weapon/pen/sleepy(src)
 			new /obj/item/device/healthanalyzer/rad_laser(src)
@@ -27,8 +24,8 @@
 			new /obj/item/clothing/glasses/thermal/syndi(src)
 			return

-		if("bond") // 29 tc
-			new /obj/item/weapon/gun/ballistic/automatic/pistol(src)
+		if("bond")
+			new /obj/item/weapon/gun/projectile/automatic/pistol(src)
 			new /obj/item/weapon/suppressor(src)
 			new /obj/item/ammo_box/magazine/m10mm(src)
 			new /obj/item/ammo_box/magazine/m10mm(src)
@@ -38,7 +35,7 @@

 			return

-		if("screwed") // 29 tc
+		if("screwed")
 			new /obj/item/device/sbeacondrop/bomb(src)
 			new /obj/item/weapon/grenade/syndieminibomb(src)
 			new /obj/item/device/sbeacondrop/powersink(src)
@@ -47,9 +44,8 @@
 			new /obj/item/device/encryptionkey/syndicate(src)
 			return

-		if("guns") // 28 tc now
-			new /obj/item/weapon/gun/ballistic/revolver(src)
-			new /obj/item/ammo_box/a357(src)
+		if("guns")
+			new /obj/item/weapon/gun/projectile/revolver(src)
 			new /obj/item/ammo_box/a357(src)
 			new /obj/item/weapon/card/emag(src)
 			new /obj/item/weapon/grenade/plastic/c4(src)
@@ -58,16 +54,14 @@
 			new /obj/item/clothing/under/suit_jacket/really_black(src)
 			return

-		if("murder") // 28 tc now
+		if("murder")
 			new /obj/item/weapon/melee/energy/sword/saber(src)
 			new /obj/item/clothing/glasses/thermal/syndi(src)
 			new /obj/item/weapon/card/emag(src)
 			new /obj/item/clothing/shoes/chameleon(src)
-			new /obj/item/device/encryptionkey/syndicate(src)
-			new /obj/item/weapon/grenade/syndieminibomb(src)
 			return

-		if("implant") // 55+ tc holy shit what the fuck this is a lottery disguised as fun boxes isn't it?
+		if("implant")
 			new /obj/item/weapon/implanter/freedom(src)
 			new /obj/item/weapon/implanter/uplink(src)
 			new /obj/item/weapon/implanter/emp(src)
@@ -76,7 +70,7 @@
 			new /obj/item/weapon/implanter/storage(src)
 			return

-		if("hacker") // 26 tc
+		if("hacker")
 			new /obj/item/weapon/aiModule/syndicate(src)
 			new /obj/item/weapon/card/emag(src)
 			new /obj/item/device/encryptionkey/binary(src)
@@ -84,14 +78,14 @@
 			new /obj/item/device/multitool/ai_detect(src)
 			return

-		if("lordsingulo") // 24 tc
+		if("lordsingulo")
 			new /obj/item/device/sbeacondrop(src)
 			new /obj/item/clothing/suit/space/syndicate/black/red(src)
 			new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
 			new /obj/item/weapon/card/emag(src)
 			return

-		if("sabotage") // 26 tc now
+		if("sabotage")
 			new /obj/item/weapon/grenade/plastic/c4 (src)
 			new /obj/item/weapon/grenade/plastic/c4 (src)
 			new /obj/item/device/doorCharge(src)
@@ -99,52 +93,15 @@
 			new /obj/item/device/camera_bug(src)
 			new /obj/item/device/sbeacondrop/powersink(src)
 			new /obj/item/weapon/cartridge/syndicate(src)
-			new /obj/item/weapon/storage/toolbox/syndicate(src) //To actually get to those places
-			new /obj/item/pizzabox/bomb

-		if("darklord") //20 tc + tk + summon item close enough for now
+		if("darklord")
 			new /obj/item/weapon/melee/energy/sword/saber(src)
 			new /obj/item/weapon/melee/energy/sword/saber(src)
 			new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
 			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 			new /obj/item/weapon/card/id/syndicate(src)
-			new /obj/item/clothing/shoes/chameleon(src) //because slipping while being a dark lord sucks
-			new /obj/item/weapon/spellbook/oneuse/summonitem(src)
 			return

-		if("sniper") //This shit is unique so can't really balance it around tc, also no silencer because getting killed without ANY indicator on what killed you sucks
-			new /obj/item/weapon/gun/ballistic/automatic/sniper_rifle(src) // 12 tc
-			new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
-			new /obj/item/clothing/glasses/thermal/syndi(src)
-			new /obj/item/clothing/gloves/color/latex/nitrile(src)
-			new /obj/item/clothing/mask/gas/clown_hat(src)
-			new /obj/item/clothing/under/suit_jacket/really_black(src)
-			return
-
-		if("metaops") // 30 tc
-			new /obj/item/clothing/suit/space/hardsuit/syndi(src) // 8 tc
-			new /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted(src) // 8 tc
-			new /obj/item/weapon/implanter/explosive(src) // 2 tc
-			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
-			new /obj/item/ammo_box/magazine/m12g/buckshot(src) // 2 tc
-			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
-			new /obj/item/weapon/grenade/plastic/c4 (src) // 1 tc
-			new /obj/item/weapon/card/emag(src) // 6 tc
-			return
-
-		if("ninja") // 33 tc worth
-			new /obj/item/weapon/katana(src) // Unique , hard to tell how much tc this is worth. 8 tc?
-			new /obj/item/weapon/implanter/adrenalin(src) // 8 tc
-			new /obj/item/weapon/throwing_star(src) // ~5 tc for all 6
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/throwing_star(src)
-			new /obj/item/weapon/storage/belt/military/assault(src) // 3 tc
-			new /obj/item/weapon/card/id/syndicate(src) // 2 tc
-			new /obj/item/device/chameleon(src) // 7 tc
-
 /obj/item/weapon/storage/box/syndie_kit
 	name = "box"
 	desc = "A sleek, sturdy box."
@@ -162,6 +119,7 @@

 /*/obj/item/weapon/storage/box/syndie_kit/imp_compress
 	name = "Compressed Matter Implant (with injector)"
+
 /obj/item/weapon/storage/box/syndie_kit/imp_compress/New()
 	new /obj/item/weapon/implanter/compressed(src)
 	..()
@@ -228,7 +186,7 @@
 /obj/item/weapon/storage/box/syndie_kit/space
 	name = "boxed space suit and helmet"
 	can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
-	max_w_class = WEIGHT_CLASS_NORMAL
+	max_w_class = 3

 /obj/item/weapon/storage/box/syndie_kit/space/New()
 	..()
@@ -325,3 +283,8 @@
 	for(var/i in 1 to 3)
 		new/obj/item/cardboard_cutout/adaptive(src)
 	new/obj/item/toy/crayon/rainbow(src)
+
+/obj/item/weapon/storage/box/syndie_kit/thermite/New()
+	..()
+	new /obj/item/weapon/reagent_containers/spray/thermite(src)
+	new /obj/item/weapon/lighter(src)
@@ -3,8 +3,8 @@
 	desc = "It can hold a few small and personal things."
 	storage_slots = 4
 	icon_state = "wallet"
-	w_class = WEIGHT_CLASS_SMALL
-	resistance_flags = FLAMMABLE
+	w_class = 2
+	burn_state = FLAMMABLE
 	can_hold = list(
 		/obj/item/stack/spacecash,
 		/obj/item/weapon/card,