Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

Conflicts: baystation12.dme code/ATMOSPHERICS/components/unary/vent_pump.dm code/ATMOSPHERICS/components/unary/vent_scrubber.dm code/__HELPERS/game.dm code/controllers/shuttle_controller.dm code/datums/datumvars.dm code/datums/supplypacks.dm code/defines/obj/storage.dm code/defines/obj/vending.dm code/defines/obj/weapon.dm code/defines/procs/command_alert.dm code/game/area/Space Station 13 areas.dm code/game/atoms.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/gamemodes/events/dust.dm code/game/gamemodes/events/miniblob.dm code/game/gamemodes/events/ninja_equipment.dm code/game/gamemodes/factions.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/jobs/access.dm code/game/jobs/job/assistant.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/engineering.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job_controller.dm code/game/machinery/alarm.dm code/game/machinery/atmo_control.dm code/game/machinery/atmoalter/area_atmos_computer.dm code/game/machinery/bots/medbot.dm code/game/machinery/computer/HolodeckControl.dm code/game/machinery/computer/ai_core.dm code/game/machinery/computer/atmos_alert.dm code/game/machinery/computer/card.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/computer.dm code/game/machinery/computer/message.dm code/game/machinery/computer/pod.dm code/game/machinery/computer/prisoner.dm code/game/machinery/computer/syndicate_shuttle.dm code/game/machinery/constructable_frame.dm code/game/machinery/doors/door.dm code/game/machinery/doors/firedoor.dm code/game/machinery/newscaster.dm code/game/machinery/recharger.dm code/game/machinery/spaceheater.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/logbrowser.dm code/game/machinery/telecomms/machine_interactions.dm code/game/machinery/teleporter.dm code/game/machinery/wishgranter.dm code/game/mecha/mech_fabricator.dm code/game/mecha/working/ripley.dm code/game/objects/items.dm code/game/objects/items/blueprints.dm code/game/objects/items/devices/flashlight.dm code/game/objects/items/devices/radio/encryptionkey.dm code/game/objects/items/devices/uplinks.dm code/game/objects/items/stacks/medical.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/gift_wrappaper.dm code/game/objects/items/weapons/hydroponics.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/secstorage/secstorage.dm code/game/objects/items/weapons/storage/backpack.dm code/game/objects/items/weapons/storage/firstaid.dm code/game/objects/items/weapons/storage/kit.dm code/game/objects/items/weapons/storage/storage.dm code/game/objects/items/weapons/storage/toolbox.dm code/game/objects/items/weapons/storage/uplink_kits.dm code/game/objects/items/weapons/stunbaton.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/tools.dm code/game/objects/structures/crates_lockers/closets/secure/cargo.dm code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm code/game/objects/structures/crates_lockers/closets/secure/scientist.dm code/game/objects/structures/crates_lockers/closets/secure/security.dm code/game/objects/structures/electricchair.dm code/game/objects/structures/extinguisher.dm code/game/objects/structures/watercloset.dm code/game/objects/weapons.dm code/game/turfs/turf.dm code/game/vehicles/airtight/airtight.dm code/game/vehicles/vehicle.dm code/global.dm code/modules/DetectiveWork/evidence.dm code/modules/admin/IsBanned.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/diagnostics.dm code/modules/admin/verbs/getlogs.dm code/modules/client/preferences.dm code/modules/clothing/masks/miscellaneous.dm code/modules/clothing/spacesuits/rig.dm code/modules/clothing/suits/miscellaneous.dm code/modules/critters/critter_defenses.dm code/modules/detectivework/scanner.dm code/modules/flufftext/Hallucination.dm code/modules/food/recipes_microwave.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm code/modules/mob/living/carbon/alien/special/facehugger.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/carbon_defines.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/update_icons.dm code/modules/mob/living/carbon/metroid/metroid.dm code/modules/mob/living/living.dm code/modules/mob/living/silicon/ai/life.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_transformation_simple.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/folders.dm code/modules/paperwork/paper.dm code/modules/paperwork/paperbin.dm code/modules/paperwork/pen.dm code/modules/power/cable.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/projectile/revolver.dm code/modules/projectiles/projectile/change.dm code/modules/projectiles/projectile/special.dm code/modules/reagents/Chemistry-Reagents.dm code/modules/reagents/reagent_containers/glass.dm code/modules/reagents/reagent_containers/hypospray.dm code/modules/recycling/sortingmachinery.dm code/modules/research/designs.dm config/config.txt html/changelog.html icons/mob/head.dmi icons/mob/hud.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/mask.dmi icons/mob/suit.dmi icons/mob/ties.dmi icons/mob/uniform.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/ties.dmi icons/obj/grenade.dmi icons/obj/projectiles.dmi Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-08-27 05:57:24 +01:00 · 2013-01-11 22:12:31 +10:00
parent 891ae8e063 2855cd6237
commit bdeb96b7e5
637 changed files with 28812 additions and 21593 deletions
@@ -184,3 +184,16 @@ RCD
 	..()
 	desc = "A device used to rapidly build walls/floor."
 	canRwall = 1
+
+/obj/item/weapon/rcd_ammo
+	name = "compressed matter cartridge"
+	desc = "Highly compressed matter for the RCD."
+	icon = 'icons/obj/ammo.dmi'
+	icon_state = "rcd"
+	item_state = "rcdammo"
+	opacity = 0
+	density = 0
+	anchored = 0.0
+	origin_tech = "materials=2"
+	m_amt = 30000
+	g_amt = 15000
@@ -3,6 +3,19 @@ CONTAINS:
 RSF

 */
+/obj/item/weapon/rsf
+	name = "\improper Rapid-Service-Fabricator"
+	desc = "A device used to rapidly deploy service items."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "rcd"
+	opacity = 0
+	density = 0
+	anchored = 0.0
+	var/matter = 0
+	var/mode = 1
+	flags = TABLEPASS
+	w_class = 3.0
+
 /obj/item/weapon/rsf/New()
 	desc = "A RSF. It currently holds [matter]/30 fabrication-units."
 	return
@@ -168,7 +181,7 @@ RSF
 		if (istype(A, /obj/structure/table) && matter >= 1)
 			user << "Dispensing Dice Pack..."
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/storage/dice( A.loc )
+			new /obj/item/weapon/storage/pill_bottle/dice( A.loc )
 			if (isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200
@@ -182,7 +195,7 @@ RSF
 		if (istype(A, /turf/simulated/floor) && matter >= 1)
 			user << "Dispensing Dice Pack..."
 			playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
-			new /obj/item/weapon/storage/dice( A )
+			new /obj/item/weapon/storage/pill_bottle/dice( A )
 			if (isrobot(user))
 				var/mob/living/silicon/robot/engy = user
 				engy.cell.charge -= 200
@@ -11,6 +11,23 @@
 /*
 * DATA CARDS - Used for the teleporter
 */
+/obj/item/weapon/card
+	name = "card"
+	desc = "Does card things."
+	icon = 'icons/obj/card.dmi'
+	w_class = 1.0
+
+	var/list/files = list(  )
+
+/obj/item/weapon/card/data
+	name = "data disk"
+	desc = "A disk of data."
+	icon_state = "data"
+	var/function = "storage"
+	var/data = "null"
+	var/special = null
+	item_state = "card-id"
+
 /obj/item/weapon/card/data/verb/label(t as text)
 	set name = "Label Disk"
 	set category = "Object"
@@ -23,22 +40,37 @@
 	src.add_fingerprint(usr)
 	return

+/obj/item/weapon/card/data/clown
+	name = "coordinates to clown planet"
+	icon_state = "data"
+	item_state = "card-id"
+	layer = 3
+	level = 2
+	desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
+	function = "teleporter"
+	data = "Clown Land"

 /*
 * ID CARDS
 */
-/obj/item/weapon/card/id/examine()
-	..()
-	read()
+/obj/item/weapon/card/emag
+	desc = "It's a card with a magnetic strip attached to some circuitry."
+	name = "cryptographic sequencer"
+	icon_state = "emag"
+	item_state = "card-id"
+	origin_tech = "magnets=2;syndicate=2"

-/obj/item/weapon/card/id/New()
-	..()
-	spawn(30)
-	if(istype(loc, /mob/living/carbon/human))
-		blood_type = loc:dna:b_type
-		dna_hash = loc:dna:unique_enzymes
-		fingerprint_hash = md5(loc:dna:uni_identity)
+/obj/item/weapon/card/id
+	name = "identification card"
+	desc = "A card used to provide ID and determine access across the station."
+	icon_state = "id"
+	item_state = "card-id"
+	var/access = list()
+	var/registered_name = null // The name registered_name on the card
+	slot_flags = SLOT_ID

+	var/assignment = null
+	var/dorm = 0		// determines if this ID has claimed a dorm already
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
 		O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)
@@ -46,13 +78,11 @@
 	src.add_fingerprint(user)
 	return

-/obj/item/weapon/card/id/attack_hand(mob/user as mob)
-	var/obj/item/weapon/storage/wallet/WL
-	if( istype(loc, /obj/item/weapon/storage/wallet) )
-		WL = loc
-	..()
-	if(WL)
-		WL.update_icon()
+/obj/item/weapon/card/id/GetAccess()
+	return access
+
+/obj/item/weapon/card/id/GetID()
+	return src

 /obj/item/weapon/card/id/verb/read()
 	set name = "Read ID Card"
@@ -65,6 +95,33 @@
 	usr << "The fingerprint hash on the card is [fingerprint_hash]."
 	return

+
+/obj/item/weapon/card/id/silver
+	name = "identification card"
+	desc = "A silver card which shows honour and dedication."
+	icon_state = "silver"
+	item_state = "silver_id"
+
+/obj/item/weapon/card/id/gold
+	name = "identification card"
+	desc = "A golden card which shows power and might."
+	icon_state = "gold"
+	item_state = "gold_id"
+
+/obj/item/weapon/card/id/syndicate
+	name = "agent card"
+	access = list(access_maint_tunnels, access_syndicate)
+	origin_tech = "syndicate=3"
+
+/obj/item/weapon/card/id/syndicate/afterattack(var/obj/item/weapon/O as obj, mob/user as mob)
+	if(istype(O, /obj/item/weapon/card/id))
+		var/obj/item/weapon/card/id/I = O
+		src.access |= I.access
+		if(istype(user, /mob/living) && user.mind)
+			if(user.mind.special_role)
+				usr << "\blue The card's microscanners activate as you pass it over the ID, copying its access."
+
+
 /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
 	if(!src.registered_name)
 		//Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak
@@ -84,3 +141,32 @@
 		user << "\blue You successfully forge the ID card."
 	else
 		..()
+
+/obj/item/weapon/card/id/syndicate_command
+	name = "syndicate ID card"
+	desc = "An ID straight from the Syndicate."
+	registered_name = "Syndicate"
+	assignment = "Syndicate Overlord"
+	access = list(access_syndicate)
+
+/obj/item/weapon/card/id/captains_spare
+	name = "captain's spare ID"
+	desc = "The spare ID of the High Lord himself."
+	icon_state = "gold"
+	item_state = "gold_id"
+	registered_name = "Captain"
+	assignment = "Captain"
+	New()
+		var/datum/job/captain/J = new/datum/job/captain
+		access = J.get_access()
+		..()
+
+/obj/item/weapon/card/id/centcom
+	name = "\improper CentCom. ID"
+	desc = "An ID straight from Cent. Com."
+	icon_state = "centcom"
+	registered_name = "Central Command"
+	assignment = "General"
+	New()
+		access = get_all_centcom_access()
+		..()
@@ -6,9 +6,10 @@ MATCHES
 CIGARETTES
 CIGARS
 SMOKING PIPES
-CIG PACKET
 CHEAP LIGHTERS
 ZIPPO
+
+CIGARETTE PACKETS ARE IN FANCY.DM
 */

 ///////////
@@ -308,56 +309,7 @@ ZIPPO
 	icon_off = "cobpipeoff"
 	smoketime = 400

-////////////
-//CIG PACK//
-////////////
-/obj/item/weapon/cigpacket
-	name = "cigarette packet"
-	desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "cigpacket"
-	item_state = "cigpacket"
-	w_class = 1
-	throwforce = 2
-	flags = TABLEPASS
-	slot_flags = SLOT_BELT
-	var/cigcount = 6

-/obj/item/weapon/cigpacket/New()
-	..()
-	flags |= NOREACT
-	create_reagents(15*cigcount)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
-
-/obj/item/weapon/cigpacket/Del()
-	..()
-	del(reagents)
-
-/obj/item/weapon/cigpacket/update_icon()
-	icon_state = "[initial(icon_state)][cigcount]"
-	desc = "There are [cigcount] cig\s left!"
-	return
-
-/obj/item/weapon/cigpacket/attack_hand(mob/user as mob)
-	if(user.r_hand == src || user.l_hand == src)
-		if(cigcount == 0)
-			user << "<span class='notice'>You're out of cigs, shit! How you gonna get through the rest of the day...</span>"
-			return
-		else
-			var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
-			reagents.trans_to(W, (reagents.total_volume/cigcount))
-			user.put_in_active_hand(W)
-			reagents.maximum_volume = 15*cigcount
-			cigcount--
-	else
-		return ..()
-	update_icon()
-	return
-
-/obj/item/weapon/cigpacket/dromedaryco
-	name = "DromedaryCo packet"
-	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
-	icon_state = "Dpacket"
-	item_state = "Dpacket"

 /////////
 //ZIPPO//
@@ -55,7 +55,8 @@
 				trigger_side_effect(M)

 	spawn(0)//this prevents the collapse of space-time continuum
-		user.drop_from_inventory(src)
+		if (user)
+			user.drop_from_inventory(src)
 		del(src)
 	return uses

@@ -1,6 +1,6 @@
 /obj/item/weapon/plastique/attack_self(mob/user as mob)
 	var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
-	if(newtime < 1)
+	if(newtime < 10)
 		newtime = 10
 	timer = newtime
 	user << "Timer set for [timer] seconds."
@@ -48,7 +48,7 @@


 /obj/item/weapon/flamethrower/update_icon()
-	overlays = null
+	overlays.Cut()
 	if(igniter)
 		overlays += "+igniter[status]"
 	if(ptank)
@@ -7,6 +7,24 @@
 /*
 * Gifts
 */
+/obj/item/weapon/a_gift
+	name = "gift"
+	desc = "PRESENTS!!!! eek!"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "gift1"
+	item_state = "gift1"
+	pressure_resistance = 70
+
+/obj/item/weapon/a_gift/New()
+	..()
+	pixel_x = rand(-10,10)
+	pixel_y = rand(-10,10)
+	if(w_class > 0 && w_class < 4)
+		icon_state = "gift[w_class]"
+	else
+		icon_state = "gift[pick(1, 2, 3)]"
+	return
+
 /obj/item/weapon/gift/attack_self(mob/user as mob)
 	user.drop_item()
 	if(src.gift)
@@ -21,7 +39,6 @@
 	del(src)
 	return

-
 /obj/effect/spresent/relaymove(mob/user as mob)
 	if (user.stat)
 		return
@@ -44,45 +61,71 @@

 	del(src)

-
 /obj/item/weapon/a_gift/attack_self(mob/M as mob)
-	switch(pick("flash", "t_gun", "l_gun", "shield", "sword", "axe"))
-		if("flash")
-			var/obj/item/device/flash/W = new /obj/item/device/flash( M )
-			M.put_in_active_hand(W)
-			W.add_fingerprint(M)
-			del(src)
-			return
-		if("l_gun")
-			var/obj/item/weapon/gun/energy/laser/W = new /obj/item/weapon/gun/energy/laser( M )
-			M.put_in_active_hand(W)
-			W.add_fingerprint(M)
-			del(src)
-			return
-		if("t_gun")
-			var/obj/item/weapon/gun/energy/taser/W = new /obj/item/weapon/gun/energy/taser( M )
-			M.put_in_active_hand(W)
-			W.add_fingerprint(M)
-			del(src)
-			return
-		if("sword")
-			var/obj/item/weapon/melee/energy/sword/W = new /obj/item/weapon/melee/energy/sword( M )
-			M.put_in_active_hand(W)
-			W.add_fingerprint(M)
-			del(src)
-			return
-		if("axe")
-			var/obj/item/weapon/melee/energy/axe/W = new /obj/item/weapon/melee/energy/axe( M )
-			M.put_in_active_hand(W)
-			W.add_fingerprint(M)
-			del(src)
-			return
-		else
+	var/gift_type = pick(/obj/item/weapon/sord,
+		/obj/item/weapon/storage/wallet,
+		/obj/item/weapon/storage/photo_album,
+		/obj/item/weapon/storage/box/snappops,
+		/obj/item/weapon/storage/fancy/crayons,
+		/obj/item/weapon/storage/backpack/holding,
+		/obj/item/weapon/storage/belt/champion,
+		/obj/item/weapon/soap/deluxe,
+		/obj/item/weapon/pickaxe/silver,
+		/obj/item/weapon/pen/invisible,
+		/obj/item/weapon/lipstick/random,
+		/obj/item/weapon/grenade/smokebomb,
+		/obj/item/weapon/corncob,
+		/obj/item/weapon/contraband/poster,
+		/obj/item/weapon/book/manual/barman_recipes,
+		/obj/item/weapon/book/manual/chef_recipes,
+		/obj/item/weapon/bikehorn,
+		/obj/item/weapon/beach_ball,
+		/obj/item/weapon/beach_ball/holoball,
+		/obj/item/weapon/banhammer,
+		/obj/item/toy/balloon,
+		/obj/item/toy/blink,
+		/obj/item/toy/crossbow,
+		/obj/item/toy/gun,
+		/obj/item/toy/katana,
+		/obj/item/toy/prize/deathripley,
+		/obj/item/toy/prize/durand,
+		/obj/item/toy/prize/fireripley,
+		/obj/item/toy/prize/gygax,
+		/obj/item/toy/prize/honk,
+		/obj/item/toy/prize/marauder,
+		/obj/item/toy/prize/mauler,
+		/obj/item/toy/prize/odysseus,
+		/obj/item/toy/prize/phazon,
+		/obj/item/toy/prize/ripley,
+		/obj/item/toy/prize/seraph,
+		/obj/item/toy/spinningtoy,
+		/obj/item/toy/sword,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/device/paicard,
+		/obj/item/device/violin,
+		/obj/item/weapon/storage/belt/utility/full,
+		/obj/item/clothing/tie/horrible)
+
+	if(!ispath(gift_type,/obj/item))	return
+
+	var/obj/item/I = new gift_type(M)
+	M.u_equip(src)
+	M.put_in_hands(I)
+	I.add_fingerprint(M)
+	del(src)
 	return

 /*
 * Wrapping Paper
 */
+/obj/item/weapon/wrapping_paper
+	name = "wrapping paper"
+	desc = "You can use this to wrap items in."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "wrap_paper"
+	var/amount = 20.0
+
 /obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if (!( locate(/obj/structure/table, src.loc) ))
@@ -148,4 +191,4 @@
 		else
 			user << "\blue You need more paper."
 	else
-		user << "Theyre moving around too much. a Straitjacket would help."
+		user << "They are moving around too much. A straightjacket would help."
@@ -226,6 +226,26 @@
 		beakers += B2
 		icon_state = initial(icon_state) +"_locked"

+/obj/item/weapon/grenade/chem_grenade/antiweed
+	name = "weedkiller grenade"
+	desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
+	path = 1
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+
+		B1.reagents.add_reagent("plantbgone", 25)
+		B1.reagents.add_reagent("potassium", 25)
+		B2.reagents.add_reagent("phosphorus", 25)
+		B2.reagents.add_reagent("sugar", 25)
+
+		beakers += B1
+		beakers += B2
+		icon_state = "grenade"
+
 /obj/item/weapon/grenade/chem_grenade/cleaner
 	name = "Cleaner Grenade"
 	desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
@@ -6,7 +6,7 @@

 	prime()
 		..()
-		if(empulse(src, 10, 20))
+		if(empulse(src, 4, 10))
 			del(src)
 		return

@@ -1,3 +1,20 @@
+/obj/item/weapon/handcuffs
+	name = "handcuffs"
+	desc = "Use this to keep prisoners in line."
+	gender = PLURAL
+	icon = 'icons/obj/items.dmi'
+	icon_state = "handcuff"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	throwforce = 5
+	w_class = 2.0
+	throw_speed = 2
+	throw_range = 5
+	m_amt = 500
+	origin_tech = "materials=1"
+	var/dispenser = 0
+	var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
+
 /obj/item/weapon/handcuffs/attack(mob/living/carbon/C as mob, mob/user as mob)
 	if(istype(src, /obj/item/weapon/handcuffs/cyborg) && isrobot(user))
 		if(!C.handcuffed)
@@ -73,4 +90,37 @@
 						playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
 					O.process()
 			return
-	return
+	return
+
+/obj/item/weapon/handcuffs/cable
+	name = "cable restraints"
+	desc = "Looks like some cables tied together. Could be used to tie something up."
+	icon_state = "cuff_red"
+	breakouttime = 300 //Deciseconds = 30s
+
+/obj/item/weapon/handcuffs/cable/red
+	icon_state = "cuff_red"
+
+/obj/item/weapon/handcuffs/cable/yellow
+	icon_state = "cuff_yellow"
+
+/obj/item/weapon/handcuffs/cable/blue
+	icon_state = "cuff_blue"
+
+/obj/item/weapon/handcuffs/cable/green
+	icon_state = "cuff_green"
+
+/obj/item/weapon/handcuffs/cable/pink
+	icon_state = "cuff_pink"
+
+/obj/item/weapon/handcuffs/cable/orange
+	icon_state = "cuff_orange"
+
+/obj/item/weapon/handcuffs/cable/cyan
+	icon_state = "cuff_cyan"
+
+/obj/item/weapon/handcuffs/cable/white
+	icon_state = "cuff_white"
+
+/obj/item/weapon/handcuffs/cyborg
+	dispenser = 1
@@ -1,47 +1,18 @@
 /* Hydroponic stuff
 * Contains:
- *		Plant Bags
 *		Sunflowers
 *		Nettle
 *		Deathnettle
 *		Corbcob
 */

-/*
- * Plant Bags
- */
-/obj/item/weapon/plantbag
-	icon = 'icons/obj/hydroponics.dmi'
-	icon_state = "plantbag"
-	name = "Plant Bag"
-	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 50; //the number of plant pieces it can carry.
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 1

-/obj/item/weapon/plantbag/attack_self(mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/snacks/grown/O in contents)
-		contents -= O
-		O.loc = user.loc
-	user << "\blue You empty the plant bag."
-	return
-
-/obj/item/weapon/plantbag/verb/toggle_mode()
-	set name = "Switch Bagging Method"
-	set category = "Object"
-
-	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The bag now picks up all plants in a tile at once."
-		if(0)
-			usr << "The bag now picks up one plant at a time."

 /*
 * SeedBag
 */
-
+//uncomment when this is updated to match storage update
+/*
 /obj/item/weapon/seedbag
 	icon = 'icons/obj/hydroponics.dmi'
 	icon_state = "seedbag"
@@ -150,7 +121,7 @@
 	for(var/mob/M in nearby)
 		if ((M.client && M.machine == src))
 			src.attack_self(M)
-
+*/
 /*
 * Sunflower
 */
@@ -78,9 +78,9 @@
 		if(istype(G, /obj/item/weapon/grab))
 			if(!ismob(G:affecting))
 				return
-			for(var/mob/living/carbon/metroid/M in range(1,G:affecting))
+			for(var/mob/living/carbon/slime/M in range(1,G:affecting))
 				if(M.Victim == G:affecting)
-					usr << "[G:affecting:name] will not fit into the [src.name] because they have a Metroid latched onto their head."
+					usr << "[G:affecting:name] will not fit into the [src.name] because they have a slime latched onto their head."
 					return
 			var/mob/M = G:affecting
 			if(put_mob(M))
@@ -1,23 +1,52 @@
 /* Kitchen tools
 * Contains:
+ *		Utensils
+ *		Spoons
 *		Forks
 *		Knives
+ *		Kitchen knives
+ *		Butcher's cleaver
 *		Rolling Pins
 *		Trays
 */

+/obj/item/weapon/kitchen
+	icon = 'icons/obj/kitchen.dmi'
+
+/*
+ * Utensils
+ */
+/obj/item/weapon/kitchen/utensil
+	force = 5.0
+	w_class = 1.0
+	throwforce = 5.0
+	throw_speed = 3
+	throw_range = 5
+	flags = FPRINT | TABLEPASS | CONDUCT
+	origin_tech = "materials=1"
+	attack_verb = list("attacked", "stabbed", "poked")

 /obj/item/weapon/kitchen/utensil/New()
 	if (prob(60))
 		src.pixel_y = rand(0, 4)
 	return

-
-
+/*
+ * Spoons
+ */
+ /obj/item/weapon/kitchen/utensil/spoon
+	name = "spoon"
+	desc = "SPOON!"
+	icon_state = "spoon"
+	attack_verb = list("attacked", "poked")

 /*
 * Forks
 */
+/obj/item/weapon/kitchen/utensil/fork
+	name = "fork"
+	desc = "Pointy."
+	icon_state = "fork"

 /obj/item/weapon/kitchen/utensil/fork/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	if(!istype(M))
@@ -45,6 +74,19 @@
 /*
 * Knives
 */
+/obj/item/weapon/kitchen/utensil/knife
+	name = "knife"
+	desc = "Can cut through any food."
+	icon_state = "knife"
+	force = 10.0
+	throwforce = 10.0
+
+	suicide_act(mob/user)
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		return (BRUTELOSS)
+
 /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << "\red You accidentally cut yourself with the [src]."
@@ -53,10 +95,73 @@
 	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 	return ..()

+/*
+ * Kitchen knives
+ */
+/obj/item/weapon/kitchenknife
+	name = "kitchen knife"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "knife"
+	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 10.0
+	w_class = 3.0
+	throwforce = 6.0
+	throw_speed = 3
+	throw_range = 6
+	m_amt = 12000
+	origin_tech = "materials=1"
+	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+	suicide_act(mob/user)
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		return (BRUTELOSS)
+
+/obj/item/weapon/kitchenknife/ritual
+	name = "ritual knife"
+	desc = "The unearthly energies that once powered this blade are now dormant."
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "render"
+
+/*
+ * Bucher's cleaver
+ */
+/obj/item/weapon/butch
+	name = "butcher's Cleaver"
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "butch"
+	desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 15.0
+	w_class = 2.0
+	throwforce = 8.0
+	throw_speed = 3
+	throw_range = 6
+	m_amt = 12000
+	origin_tech = "materials=1"
+	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/weapon/butch/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()
+
 /*
 * Rolling Pins
 */

+/obj/item/weapon/kitchen/rollingpin
+	name = "rolling pin"
+	desc = "Used to knock out the Bartender."
+	icon_state = "rolling_pin"
+	force = 8.0
+	throwforce = 10.0
+	throw_speed = 2
+	throw_range = 7
+	w_class = 3.0
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway.
+
 /obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << "\red The [src] slips out of your hand and hits your head."
@@ -93,10 +198,42 @@
 /*
 * Trays - Agouri
 */
+/obj/item/weapon/tray
+	name = "tray"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "tray"
+	desc = "A metal tray to lay food on."
+	throwforce = 12.0
+	throwforce = 10.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 3.0
+	flags = FPRINT | TABLEPASS | CONDUCT
+	m_amt = 3000
+	/* // NOPE
+	var/food_total= 0
+	var/burger_amt = 0
+	var/cheese_amt = 0
+	var/fries_amt = 0
+	var/classyalcdrink_amt = 0
+	var/alcdrink_amt = 0
+	var/bottle_amt = 0
+	var/soda_amt = 0
+	var/carton_amt = 0
+	var/pie_amt = 0
+	var/meatbreadslice_amt = 0
+	var/salad_amt = 0
+	var/miscfood_amt = 0
+	*/
+	var/list/carrying = list() // List of things on the tray. - Doohl
+	var/max_carry = 10 // w_class = 1 -- takes up 1
+					   // w_class = 2 -- takes up 3
+					   // w_class = 3 -- takes up 5
+
 /obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)

 	// Drop all the things. All of them.
-	overlays = null
+	overlays.Cut()
 	for(var/obj/item/I in carrying)
 		I.loc = M.loc
 		carrying.Remove(I)
@@ -264,7 +401,7 @@
 		foundtable = 1
 		break

-	overlays = null
+	overlays.Cut()

 	for(var/obj/item/I in carrying)
 		I.loc = loc
@@ -18,7 +18,7 @@
 		</head>

 		<body>
-		<iframe width='100%' height='97%' src="http://nanotrasen.com/wiki/index.php?title=Guide_to_construction&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<iframe width='100%' height='97%' src="http://wiki.nanotrasen.com/index.php?title=Guide_to_construction&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
 		</body>

 		</html>
@@ -81,7 +81,7 @@
 		</head>

 		<body>
-		<iframe width='100%' height='97%' src="http://nanotrasen.com/wiki/index.php?title=Hacking&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<iframe width='100%' height='97%' src="http://wiki.nanotrasen.com/index.php?title=Hacking&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
 		</body>

 		</html>
@@ -589,8 +589,7 @@
 		</head>

 		<body>
-		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Space_law&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
-		</body>
+		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Space_law&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>		</body>

 		</html>

@@ -607,8 +606,7 @@
 		</head>

 		<body>
-		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Guide_to_engineering&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
-		</body>
+		<iframe width='100%' height='97%' src="http://wiki.nanotrasen.com/index.php?title=Guide_to_engineering&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>		</body>

 		</html>

@@ -0,0 +1,56 @@
+/obj/item/weapon/melee/energy
+	var/active = 0
+
+	suicide_act(mob/user)
+		viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>", \
+							"\red <b>[user] is falling on the [src]! It looks like \he's trying to commit suicide.</b>")
+		return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/melee/energy/axe
+	name = "energy axe"
+	desc = "An energised battle axe."
+	icon_state = "axe0"
+	force = 40.0
+	throwforce = 25.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 3.0
+	flags = FPRINT | CONDUCT | NOSHIELD | TABLEPASS
+	origin_tech = "combat=3"
+	attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] swings the [src] towards /his head! It looks like \he's trying to commit suicide.</b>"
+		return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/melee/energy/sword
+	color
+	name = "energy sword"
+	desc = "May the force be within you."
+	icon_state = "sword0"
+	force = 3.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 2.0
+	flags = FPRINT | TABLEPASS | NOSHIELD
+	origin_tech = "magnets=3;syndicate=4"
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/weapon/melee/energy/sword/pirate
+	name = "energy cutlass"
+	desc = "Arrrr matey."
+	icon_state = "cutlass0"
+
+/obj/item/weapon/melee/energy/blade
+	name = "energy blade"
+	desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
+	icon_state = "blade"
+	force = 70.0//Normal attacks deal very high damage.
+	throwforce = 1//Throwing or dropping the item deletes it.
+	throw_speed = 1
+	throw_range = 1
+	w_class = 4.0//So you can't hide it in your pocket or some such.
+	flags = FPRINT | TABLEPASS | NOSHIELD
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+	var/datum/effect/effect/system/spark_spread/spark_system
@@ -0,0 +1,16 @@
+/obj/item/weapon/melee/chainofcommand
+	name = "chain of command"
+	desc = "A tool used by great men to placate the frothing masses."
+	icon_state = "chain"
+	item_state = "chain"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	force = 10
+	throwforce = 7
+	w_class = 3
+	origin_tech = "combat=4"
+	attack_verb = list("flogged", "whipped", "lashed", "disciplined")
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (OXYLOSS)
@@ -0,0 +1,115 @@
+/obj/item/weapon/cell
+	name = "power cell"
+	desc = "A rechargable electrochemical power cell."
+	icon = 'icons/obj/power.dmi'
+	icon_state = "cell"
+	item_state = "cell"
+	origin_tech = "powerstorage=1"
+	flags = FPRINT|TABLEPASS
+	force = 5.0
+	throwforce = 5.0
+	throw_speed = 3
+	throw_range = 5
+	w_class = 3.0
+	pressure_resistance = 80
+	var/charge = 0	// note %age conveted to actual charge in New
+	var/maxcharge = 1000
+	m_amt = 700
+	g_amt = 50
+	var/rigged = 0		// true if rigged to explode
+	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
+	var/construction_cost = list("metal"=750,"glass"=75)
+	var/construction_time=100
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is licking the electrodes of the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (FIRELOSS)
+
+/obj/item/weapon/cell/crap
+	name = "\improper Nanotrasen brand rechargable AA battery"
+	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
+	origin_tech = "powerstorage=0"
+	maxcharge = 500
+	g_amt = 40
+
+/obj/item/weapon/cell/crap/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/cell/secborg
+	name = "\improper Security borg rechargable D battery"
+	origin_tech = "powerstorage=0"
+	maxcharge = 600	//600 max charge / 100 charge per shot = six shots
+	g_amt = 40
+
+/obj/item/weapon/cell/secborg/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/cell/high
+	name = "high-capacity power cell"
+	origin_tech = "powerstorage=2"
+	icon_state = "hcell"
+	maxcharge = 10000
+	g_amt = 60
+
+/obj/item/weapon/cell/high/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/cell/super
+	name = "super-capacity power cell"
+	origin_tech = "powerstorage=5"
+	icon_state = "scell"
+	maxcharge = 20000
+	g_amt = 70
+	construction_cost = list("metal"=750,"glass"=100)
+
+/obj/item/weapon/cell/super/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/cell/hyper
+	name = "hyper-capacity power cell"
+	origin_tech = "powerstorage=6"
+	icon_state = "hpcell"
+	maxcharge = 30000
+	g_amt = 80
+	construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
+
+/obj/item/weapon/cell/hyper/empty/New()
+	..()
+	charge = 0
+
+/obj/item/weapon/cell/infinite
+	name = "infinite-capacity power cell!"
+	icon_state = "icell"
+	origin_tech =  null
+	maxcharge = 30000
+	g_amt = 80
+	use()
+		return 1
+
+/obj/item/weapon/cell/potato
+	name = "potato battery"
+	desc = "A rechargable starch based power cell."
+	origin_tech = "powerstorage=1"
+	icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
+	icon_state = "potato_cell" //"potato_battery"
+	charge = 100
+	maxcharge = 300
+	m_amt = 0
+	g_amt = 0
+	minor_fault = 1
+
+
+/obj/item/weapon/cell/slime
+	name = "charged slime core"
+	desc = "A yellow slime core infused with plasma, it crackles with power."
+	origin_tech = "powerstorage=2;biotech=4"
+	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
+	icon_state = "yellow slime extract" //"potato_battery"
+	maxcharge = 10000
+	maxcharge = 10000
+	m_amt = 0
+	g_amt = 0
@@ -1,53 +0,0 @@
-/obj/item/weapon/secstorage/sbriefcase
-	name = "secure briefcase"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "secure"
-	item_state = "sec-case"
-	desc = "A large briefcase with a digital locking system."
-	flags = FPRINT | TABLEPASS
-	force = 8.0
-	throw_speed = 1
-	throw_range = 4
-	w_class = 4.0
-
-/obj/item/weapon/secstorage/sbriefcase/New()
-	..()
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/pen(src)
-
-/obj/item/weapon/secstorage/sbriefcase/attack(mob/M as mob, mob/living/user as mob)
-	if ((CLUMSY in user.mutations) && prob(50))
-		user << "\red The [src] slips out of your hand and hits your head."
-		user.take_organ_damage(10)
-		user.Paralyse(2)
-		return
-
-
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
-
-	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
-	var/t = user:zone_sel.selecting
-	if (t == "head")
-
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if (H.stat < 2 && H.health < 50 && prob(90))
-			// ******* Check
-				if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
-					H << "\red The helmet protects you from being hit hard in the head!"
-					return
-				var/time = rand(2, 6)
-				if (prob(75))
-					H.Paralyse(time)
-				else
-					H.Stun(time)
-				if(H.stat != 2)	H.stat = 1
-				for(var/mob/O in viewers(H, null))
-					O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
-			else
-				H << text("\red [] tried to knock you unconcious!",user)
-				H.eye_blurry += 3
-
-	return
@@ -1,271 +0,0 @@
-/obj/item/weapon/secstorage
-	name = "secstorage"
-	var/obj/screen/storage/boxes = null
-	var/obj/screen/close/closer = null
-	var/icon_locking = "secureb"
-	var/icon_sparking = "securespark"
-	var/icon_opened = "secure0"
-	var/locked = 1
-	var/code = ""
-	var/l_code = null
-	var/l_set = 0
-	var/l_setshort = 0
-	var/l_hacking = 0
-	var/emagged = 0
-	var/open = 0
-	var/internalstorage = 3
-	w_class = 3.0
-
-/obj/item/weapon/secstorage/examine()
-	set src in oview(1)
-
-	..()
-	usr << text("The service panel is [src.open ? "open" : "closed"].")
-	return
-
-/obj/item/weapon/secstorage/proc/return_inv()
-
-	var/list/L = list(  )
-
-	L += src.contents
-
-	for(var/obj/item/weapon/secstorage/S in src)
-		L += S.return_inv()
-	for(var/obj/item/weapon/gift/G in src)
-		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/secstorage))
-			L += G.gift:return_inv()
-	return L
-
-/obj/item/weapon/secstorage/proc/show_to(mob/user as mob)
-
-	user.client.screen -= src.boxes
-	user.client.screen -= src.closer
-	user.client.screen -= src.contents
-	user.client.screen += src.boxes
-	user.client.screen += src.closer
-	user.client.screen += src.contents
-	user.s_active = src
-	return
-
-/obj/item/weapon/secstorage/proc/hide_from(mob/user as mob)
-
-	if(!user.client)
-		return
-	user.client.screen -= src.boxes
-	user.client.screen -= src.closer
-	user.client.screen -= src.contents
-	return
-
-/obj/item/weapon/secstorage/proc/close(mob/user as mob)
-
-	src.hide_from(user)
-	user.s_active = null
-	return
-
-/obj/item/weapon/secstorage/proc/orient_objs(tx, ty, mx, my)
-
-	var/cx = tx
-	var/cy = ty
-	src.boxes.screen_loc = "[tx],[ty] to [mx],[my]"
-	for(var/obj/O in src.contents)
-		O.screen_loc = "[cx],[cy]"
-		O.layer = 20
-		cx++
-		if (cx > mx)
-			cx = tx
-			cy--
-		//Foreach goto(56)
-	src.closer.screen_loc = "[mx],[my]"
-	return
-
-//This proc draws out the inventory and places the items on it. It uses the standard position.
-/obj/item/weapon/secstorage/proc/standard_orient_objs()
-	var/rows = 0
-	var/cols = 6
-	var/cx = 4
-	var/cy = 2+rows
-	src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16"
-	for(var/obj/O in src.contents)
-		O.screen_loc = "[cx]:16,[cy]:16"
-		O.layer = 20
-		cx++
-		if (cx > (4+cols))
-			cx = 4
-			cy--
-	src.closer.screen_loc = "11:16,2:16"
-	return
-
-/obj/item/weapon/secstorage/proc/orient2hud(mob/user as mob)
-	standard_orient_objs()
-	return
-
-/obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
-		if(istype(W, /obj/item/weapon/card/emag))
-			var/obj/item/weapon/card/emag/E = W
-			if(E.uses)
-				E.uses--
-			else
-				return
-		emagged = 1
-		src.overlays += image('icons/obj/storage.dmi', icon_sparking)
-		sleep(6)
-		src.overlays = null
-		overlays += image('icons/obj/storage.dmi', icon_locking)
-		locked = 0
-		if(istype(W, /obj/item/weapon/melee/energy/blade))
-			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
-			spark_system.set_up(5, 0, src.loc)
-			spark_system.start()
-			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
-			playsound(src.loc, "sparks", 50, 1)
-			user << "You slice through the lock on [src]."
-		else
-			user << "You short out the lock on [src]."
-		return
-	if ((W.w_class > internalstorage || istype(W, /obj/item/weapon/secstorage)))
-		return
-	if ((istype(W, /obj/item/weapon/screwdriver)) && (src.locked == 1))
-		sleep(6)
-		src.open =! src.open
-		user.show_message(text("\blue You [] the service panel.", (src.open ? "open" : "close")))
-		return
-	if ((istype(W, /obj/item/device/multitool)) && (src.open == 1) && (src.locked ==1) && (!src.l_hacking))
-		user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1)
-		src.l_hacking = 1
-		if (do_after(usr, 100))
-			if (prob(40))
-				src.l_setshort = 1
-				src.l_set = 0
-				user.show_message(text("\red Internal memory reset.  Please give it a few seconds to reinitialize."), 1)
-				sleep(80)
-				src.l_setshort = 0
-				src.l_hacking = 0
-			else
-				user.show_message(text("\red Unable to reset internal memory."), 1)
-				src.l_hacking = 0
-		else	src.l_hacking = 0
-		return
-	if (src.contents.len >= 7)
-		return
-	if (src.locked == 1)
-		return
-	user.u_equip(W)
-	W.loc = src
-	if ((user.client && user.s_active != src))
-		user.client.screen -= W
-	src.orient2hud(user)
-	W.dropped(user)
-	add_fingerprint(user)
-	//if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
-	for(var/mob/O in viewers(user, null))
-		O.show_message(text("\blue [] has added [] to []!", user, W, src), 1)
-		//Foreach goto(139)
-	return
-
-/obj/item/weapon/secstorage/dropped(mob/user as mob)
-
-	standard_orient_objs()
-	return
-
-/obj/item/weapon/secstorage/MouseDrop(over_object, src_location, over_location)
-	..()
-	if (src.locked == 1)
-		return
-
-	orient2hud(usr)
-	if ((over_object == usr && ((get_dist(src, usr) <= 1 ||src.locked == 0) || usr.contents.Find(src))))  //|| usr.telekinesis == 1
-		if (usr.s_active)
-			usr.s_active.close(usr)
-		src.show_to(usr)
-	return
-
-/obj/item/weapon/secstorage/attack_paw(mob/user as mob)
-	playsound(src.loc, "rustle", 50, 1, -5)
-	return src.attack_hand(user)
-	return
-
-/obj/item/weapon/secstorage/attack_hand(mob/user as mob)
-	if ((src.loc == user) && (src.locked == 1))
-		usr << "\red [src] is locked and cannot be opened!"
-	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
-
-/obj/item/weapon/secstorage/attack_self(mob/user as mob)
-	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.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)
-	if (!src.locked)
-		message = "*****"
-	dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
-	user << browse(dat, "window=caselock;size=300x280")
-
-/obj/item/weapon/secstorage/Topic(href, href_list)
-	..()
-	if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
-		return
-	if (href_list["type"])
-		if (href_list["type"] == "E")
-			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.emagged == 0) && (src.l_set == 1))
-				src.locked = 0
-				src.overlays = null
-				overlays += image('icons/obj/storage.dmi', icon_opened)
-				src.code = null
-			else
-				src.code = "ERROR"
-		else
-			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("[]", href_list["type"])
-				if (length(src.code) > 5)
-					src.code = "ERROR"
-		src.add_fingerprint(usr)
-		for(var/mob/M in viewers(1, src.loc))
-			if ((M.client && M.machine == src))
-				src.attack_self(M)
-			return
-	return
-
-/obj/item/weapon/secstorage/New()
-
-	src.boxes = new /obj/screen/storage(  )
-	src.boxes.name = "storage"
-	src.boxes.master = src
-	src.boxes.icon_state = "block"
-	src.boxes.screen_loc = "7,7 to 10,8"
-	src.boxes.layer = 19
-	src.closer = new /obj/screen/close(  )
-	src.closer.master = src
-	src.closer.icon_state = "x"
-	src.closer.layer = 20
-	spawn( 5 )
-		standard_orient_objs()
-		return
- 	return
@@ -1,25 +0,0 @@
-/obj/item/weapon/secstorage/ssafe
-	name = "secure safe"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "safe"
-	icon_opened = "safe0"
-	icon_locking = "safeb"
-	icon_sparking = "safespark"
-	flags = FPRINT | TABLEPASS
-	force = 8.0
-	w_class = 8.0
-	internalstorage = 8
-	anchored = 1.0
-	density = 0
-
-/obj/item/weapon/secstorage/ssafe/New()
-	..()
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/pen(src)
-
-/obj/item/weapon/secstorage/ssafe/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)
-
-/obj/item/weapon/secstorage/ssafe/attack_hand(mob/user as mob)
-	return attack_self(user)
@@ -0,0 +1,80 @@
+/obj/item/weapon/shield
+	name = "shield"
+
+/obj/item/weapon/shield/riot
+	name = "riot shield"
+	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "riot"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BACK
+	force = 5.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 4
+	w_class = 4.0
+	g_amt = 7500
+	m_amt = 1000
+	origin_tech = "materials=2"
+	attack_verb = list("shoved", "bashed")
+	var/cooldown = 0 //shield bash cooldown. based on world.time
+
+	IsShield()
+		return 1
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/melee/baton))
+			if(cooldown < world.time - 25)
+				user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
+				playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+				cooldown = world.time
+		else
+			..()
+
+/obj/item/weapon/shield/energy
+	name = "energy combat shield"
+	desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "eshield0" // eshield1 for expanded
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 3.0
+	throwforce = 5.0
+	throw_speed = 1
+	throw_range = 4
+	w_class = 1
+	origin_tech = "materials=4;magnets=3;syndicate=4"
+	attack_verb = list("shoved", "bashed")
+	var/active = 0
+
+/obj/item/weapon/cloaking_device
+	name = "cloaking device"
+	desc = "Use this to become invisible to the human eyesocket."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield0"
+	var/active = 0.0
+	flags = FPRINT | TABLEPASS| CONDUCT
+	item_state = "electronic"
+	throwforce = 10.0
+	throw_speed = 2
+	throw_range = 10
+	w_class = 2.0
+	origin_tech = "magnets=3;syndicate=4"
+
+
+/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
+	src.active = !( src.active )
+	if (src.active)
+		user << "\blue The cloaking device is now active."
+		src.icon_state = "shield1"
+	else
+		user << "\blue The cloaking device is now inactive."
+		src.icon_state = "shield0"
+	src.add_fingerprint(user)
+	return
+
+/obj/item/weapon/cloaking_device/emp_act(severity)
+	active = 0
+	icon_state = "shield0"
+	if(ismob(loc))
+		loc:update_icons()
+	..()
@@ -1,34 +1,26 @@
-/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
-	if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
-		var/mob/M = usr
-		if (!( istype(over_object, /obj/screen) ))
-			return ..()
-		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
-			return
-		playsound(src.loc, "rustle", 50, 1, -5)
-		if (!( M.restrained() ) && !( M.stat ))
-			switch(over_object.name)
-				if("r_hand")
-					M.u_equip(src)
-					M.put_in_r_hand(src)
-				if("l_hand")
-					M.u_equip(src)
-					M.put_in_l_hand(src)
-			M.update_inv_l_hand()
-			M.update_inv_r_hand()
-			src.add_fingerprint(usr)
-			return
-		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
-				usr.s_active.close(usr)
-			src.show_to(usr)
-			return
-	return
+
+/*
+ * Backpack
+ */
+
+/obj/item/weapon/storage/backpack
+	name = "backpack"
+	desc = "You wear this on your back and put items into it."
+	icon_state = "backpack"
+	item_state = "backpack"
+	w_class = 4.0
+	flags = FPRINT|TABLEPASS
+	slot_flags = SLOT_BACK	//ERROOOOO
+	max_w_class = 3
+	max_combined_w_class = 21

 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	playsound(src.loc, "rustle", 50, 1, -5)
 	..()

+/*
+ * Backpack Types
+ */

 /obj/item/weapon/storage/backpack/holding
 	name = "Bag of Holding"
@@ -86,7 +78,105 @@
 	max_w_class = 3
 	max_combined_w_class = 400 // can store a ton of shit!

+/obj/item/weapon/storage/backpack/cultpack
+	name = "trophy rack"
+	desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
+	icon_state = "cultpack"
+
+/obj/item/weapon/storage/backpack/clown
+	name = "Giggles Von Honkerton"
+	desc = "It's a backpack made by Honk! Co."
+	icon_state = "clownpack"
+	item_state = "clownpack"
+
+/obj/item/weapon/storage/backpack/medic
+	name = "medical backpack"
+	desc = "It's a backpack especially designed for use in a sterile environment."
+	icon_state = "medicalpack"
+	item_state = "medicalpack"
+
+/obj/item/weapon/storage/backpack/security
+	name = "security backpack"
+	desc = "It's a very robust backpack."
+	icon_state = "securitypack"
+	item_state = "securitypack"
+
+/obj/item/weapon/storage/backpack/captain
+	name = "captain's backpack"
+	desc = "It's a special backpack made exclusively for Nanotrasen officers."
+	icon_state = "captainpack"
+	item_state = "captainpack"
+
+/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"
+
+/*
+ * Satchel Types
+ */
+
+/obj/item/weapon/storage/backpack/satchel
+	name = "leather satchel"
+	desc = "It's a very fancy satchel made with fine leather."
+	icon_state = "satchel"
+
+/obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
 		..()
-		return
+		new /obj/item/weapon/storage/wallet/random( src )

+/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"
+
+/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
+	name = "virologist satchel"
+	desc = "A sterile satchel with virologist colours."
+	icon_state = "satchel-vir"
+
+/obj/item/weapon/storage/backpack/satchel_chem
+	name = "chemist satchel"
+	desc = "A sterile satchel with chemist colours."
+	icon_state = "satchel-chem"
+
+/obj/item/weapon/storage/backpack/satchel_gen
+	name = "geneticist satchel"
+	desc = "A sterile satchel with geneticist colours."
+	icon_state = "satchel-gen"
+
+/obj/item/weapon/storage/backpack/satchel_tox
+	name = "scientist satchel"
+	desc = "Useful for holding research materials."
+	icon_state = "satchel-tox"
+
+/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_hyd
+	name = "hydroponics satchel"
+	desc = "A green satchel for plant related work."
+	icon_state = "satchel_hyd"
+
+/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"
@@ -0,0 +1,223 @@
+/*
+ *	These absorb the functionality of the plant bag, ore satchel, etc.
+ *	They use the use_to_pickup, quick_gather, and quick_empty functions
+ *	that were already defined in weapon/storage, but which had been
+ *	re-implemented in other classes.
+ *
+ *	Contains:
+ *		Trash Bag
+ *		Mining Satchel
+ *		Plant Bag
+ *		Sheet Snatcher
+ *
+ *	-Sayu
+ */
+
+//  Generic non-item
+/obj/item/weapon/storage/bag
+	allow_quick_gather = 1
+	allow_quick_empty = 1
+	display_contents_with_number = 0 // UNStABLE AS FuCK, turn on when it stops crashing clients
+	use_to_pickup = 1
+	slot_flags = SLOT_BELT
+	flags = FPRINT | TABLEPASS
+
+// -----------------------------
+//          Trash bag
+// -----------------------------
+/obj/item/weapon/storage/bag/trash
+	name = "trash bag"
+	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
+	icon = 'icons/obj/trash.dmi'
+	icon_state = "trashbag0"
+	item_state = "trashbag"
+
+	w_class = 4
+	max_w_class = 2
+	storage_slots = 21
+	can_hold = list() // any
+	cant_hold = list("/obj/item/weapon/disk/nuclear")
+
+
+/obj/item/weapon/storage/bag/trash/update_icon()
+	if(contents.len == 0)
+		icon_state = "trashbag0"
+	else if(contents.len < 12)
+		icon_state = "trashbag1"
+	else if(contents.len < 21)
+		icon_state = "trashbag2"
+	else icon_state = "trashbag3"
+
+// -----------------------------
+//        Mining Satchel
+// -----------------------------
+
+/obj/item/weapon/storage/bag/ore
+	name = "Mining Satchel"
+	desc = "This little bugger can be used to store and transport ores."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "satchel"
+	slot_flags = SLOT_BELT | SLOT_POCKET
+	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 = 3
+	can_hold = list("/obj/item/weapon/ore")
+
+
+// -----------------------------
+//          Plant bag
+// -----------------------------
+
+/obj/item/weapon/storage/bag/plants
+	icon = 'icons/obj/hydroponics.dmi'
+	icon_state = "plantbag"
+	name = "Plant Bag"
+	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")
+
+
+// -----------------------------
+//        Sheet Snatcher
+// -----------------------------
+// Because it stacks stacks, this doesn't operate normally.
+// However, making it a storage/bag allows us to reuse existing code in some places. -Sayu
+
+/obj/item/weapon/storage/bag/sheetsnatcher
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "sheetsnatcher"
+	name = "Sheet Snatcher"
+	desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
+
+	var/capacity = 300; //the number of sheets it can carry.
+	w_class = 3
+
+	allow_quick_empty = 1 // this function is superceded
+	New()
+		..()
+		//verbs -= /obj/item/weapon/storage/verb/quick_empty
+		//verbs += /obj/item/weapon/storage/bag/sheetsnatcher/quick_empty
+
+	can_be_inserted(obj/item/W as obj, stop_messages = 0)
+		if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood))
+			if(!stop_messages)
+				usr << "The snatcher does not accept [W]."
+			return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu
+		var/current = 0
+		for(var/obj/item/stack/sheet/S in contents)
+			current += S.amount
+		if(capacity == current)//If it's full, you're done
+			if(!stop_messages)
+				usr << "\red The snatcher is full."
+			return 0
+		return 1
+
+
+// Modified handle_item_insertion.  Would prefer not to, but...
+	handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
+		var/obj/item/stack/sheet/S = W
+		if(!istype(S)) return 0
+
+		var/amount
+		var/inserted = 0
+		var/current = 0
+		for(var/obj/item/stack/sheet/S2 in contents)
+			current += S2.amount
+		if(capacity < current + S.amount)//If the stack will fill it up
+			amount = capacity - current
+		else
+			amount = S.amount
+
+		for(var/obj/item/stack/sheet/sheet in contents)
+			if(S.type == sheet.type) // we are violating the amount limitation because these are not sane objects
+				sheet.amount += amount	// they should only be removed through procs in this file, which split them up.
+				S.amount -= amount
+				inserted = 1
+				break
+
+		if(!inserted || !S.amount)
+			usr.u_equip(S)
+			usr.update_icons()	//update our overlays
+			if (usr.client && usr.s_active != src)
+				usr.client.screen -= S
+			S.dropped(usr)
+			if(!S.amount)
+				del S
+			else
+				S.loc = src
+
+		orient2hud(usr)
+		if(usr.s_active)
+			usr.s_active.show_to(usr)
+		update_icon()
+		return 1
+
+
+// Sets up numbered display to show the stack size of each stored mineral
+// NOTE: numbered display is turned off currently because it's broken
+	orient2hud(mob/user as mob)
+		var/adjusted_contents = contents.len
+
+		//Numbered contents display
+		var/list/datum/numbered_display/numbered_contents
+		if(display_contents_with_number)
+			numbered_contents = list()
+			adjusted_contents = 0
+			for(var/obj/item/stack/sheet/I in contents)
+				adjusted_contents++
+				var/datum/numbered_display/D = new/datum/numbered_display(I)
+				D.number = I.amount
+				numbered_contents.Add( D )
+
+		var/row_num = 0
+		var/col_count = min(7,storage_slots) -1
+		if (adjusted_contents > 7)
+			row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
+		src.standard_orient_objs(row_num, col_count, numbered_contents)
+		return
+
+
+// Modified quick_empty verb drops appropriate sized stacks
+	quick_empty()
+		var/location = get_turf(src)
+		for(var/obj/item/stack/sheet/S in contents)
+			while(S.amount)
+				var/obj/item/stack/sheet/N = new S.type(location)
+				var/stacksize = min(S.amount,N.max_amount)
+				N.amount = stacksize
+				S.amount -= stacksize
+			if(!S.amount)
+				del S // todo: there's probably something missing here
+		orient2hud(usr)
+		if(usr.s_active)
+			usr.s_active.show_to(usr)
+		update_icon()
+
+// Instead of removing
+	remove_from_storage(obj/item/W as obj, atom/new_location)
+		var/obj/item/stack/sheet/S = W
+		if(!istype(S)) return 0
+
+		//I would prefer to drop a new stack, but the item/attack_hand code
+		// that calls this can't recieve a different object than you clicked on.
+		//Therefore, make a new stack internally that has the remainder.
+		// -Sayu
+
+		if(S.amount > S.max_amount)
+			var/obj/item/stack/sheet/temp = new S.type(src)
+			temp.amount = S.amount - S.max_amount
+			S.amount = S.max_amount
+
+		return ..(S,new_location)
+
+// -----------------------------
+//    Sheet Snatcher (Cyborg)
+// -----------------------------
+
+/obj/item/weapon/storage/bag/sheetsnatcher/borg
+	name = "Sheet Snatcher 9000"
+	desc = ""
+	capacity = 500//Borgs get more because >specialization
@@ -90,7 +90,7 @@
 		"/obj/item/weapon/reagent_containers/syringe",
 		"/obj/item/weapon/reagent_containers/glass/dispenser",
 		"/obj/item/weapon/lighter/zippo",
-		"/obj/item/weapon/cigpacket",
+		"/obj/item/weapon/storage/fancy/cigarettes",
 		"/obj/item/weapon/storage/pill_bottle",
 		"/obj/item/stack/medical",
 		"/obj/item/device/flashlight/pen",
@@ -1,3 +1,19 @@
+/obj/item/weapon/storage/bible
+	name = "bible"
+	desc = "Apply to head repeatedly."
+	icon_state ="bible"
+	throw_speed = 1
+	throw_range = 5
+	w_class = 3.0
+	flags = FPRINT | TABLEPASS
+	var/mob/affecting = null
+	var/deity_name = "Christ"
+
+/obj/item/weapon/storage/bible/booze
+	name = "bible"
+	desc = "To be applied to the head repeatedly."
+	icon_state ="bible"
+
 /obj/item/weapon/storage/bible/booze/New()
 	..()
 	new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
@@ -0,0 +1,429 @@
+/*
+ *	Everything derived from the common cardboard box.
+ *	Basically everything except the original is a kit (starts full).
+ *
+ *	Contains:
+ *		Empty box, starter boxes (survival/engineer),
+ *		Latex glove and sterile mask boxes,
+ *		Syringe, beaker, dna injector boxes,
+ *		Blanks, flashbangs, and EMP grenade boxes,
+ *		Tracking and chemical implant boxes,
+ *		Prescription glasses and drinking glass boxes,
+ *		Condiment bottle and silly cup boxes,
+ *		Donkpocket and monkeycube boxes,
+ *		ID and security PDA cart boxes,
+ *		Handcuff, mousetrap, and pillbottle boxes,
+ *		Snap-pops and matchboxes,
+ *		Replacement light boxes.
+ *
+ *		For syndicate call-ins see uplink_kits.dm
+ */
+
+/obj/item/weapon/storage/box
+	name = "box"
+	desc = "It's just an ordinary box."
+	icon_state = "box"
+	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
+
+/obj/item/weapon/storage/box/survival/
+	New()
+		..()
+		contents = list()
+		sleep(1)
+		new /obj/item/clothing/mask/breath( src )
+		new /obj/item/weapon/tank/emergency_oxygen( src )
+		return
+
+/obj/item/weapon/storage/box/engineer/
+	New()
+		..()
+		contents = list()
+		sleep(1)
+		new /obj/item/clothing/mask/breath( src )
+		new /obj/item/weapon/tank/emergency_oxygen/engi( src )
+		return
+
+
+/obj/item/weapon/storage/box/gloves
+	name = "box of latex gloves"
+	desc = "Contains white gloves."
+	New()
+		..()
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+		new /obj/item/clothing/gloves/latex(src)
+
+/obj/item/weapon/storage/box/masks
+	name = "sterile masks"
+	desc = "This box contains masks of sterility."
+	icon_state = "sterile"
+
+	New()
+		..()
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+		new /obj/item/clothing/mask/surgical(src)
+
+
+/obj/item/weapon/storage/box/syringes
+	name = "syringes"
+	desc = "A box full of syringes."
+	desc = "A biohazard alert warning is printed on the box"
+	icon_state = "syringe"
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+		new /obj/item/weapon/reagent_containers/syringe( src )
+
+/obj/item/weapon/storage/box/beakers
+	name = "beaker box"
+	icon_state = "beaker"
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+
+/obj/item/weapon/storage/box/injectors
+	name = "\improper DNA injectors"
+	desc = "This box contains injectors it seems."
+
+	New()
+		..()
+		new /obj/item/weapon/dnainjector/h2m(src)
+		new /obj/item/weapon/dnainjector/h2m(src)
+		new /obj/item/weapon/dnainjector/h2m(src)
+		new /obj/item/weapon/dnainjector/m2h(src)
+		new /obj/item/weapon/dnainjector/m2h(src)
+		new /obj/item/weapon/dnainjector/m2h(src)
+
+
+/obj/item/weapon/storage/box/blanks
+	name = "box of blank shells"
+	desc = "It has a picture of a gun and several warning symbols on the front."
+
+	New()
+		..()
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+		new /obj/item/ammo_casing/shotgun/blank(src)
+
+
+
+/obj/item/weapon/storage/box/flashbangs
+	name = "box of flashbangs (WARNING)"
+	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
+	icon_state = "flashbang"
+
+	New()
+		..()
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+		new /obj/item/weapon/grenade/flashbang(src)
+
+/obj/item/weapon/storage/box/emps
+	name = "emp grenades"
+	desc = "A box with 5 emp grenades."
+	icon_state = "flashbang"
+
+	New()
+		..()
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/grenade/empgrenade(src)
+		new /obj/item/weapon/grenade/empgrenade(src)
+
+
+/obj/item/weapon/storage/box/trackimp
+	name = "tracking implant kit"
+	desc = "Box full of scum-bag tracking utensils."
+	icon_state = "implant"
+
+	New()
+		..()
+		new /obj/item/weapon/implantcase/tracking(src)
+		new /obj/item/weapon/implantcase/tracking(src)
+		new /obj/item/weapon/implantcase/tracking(src)
+		new /obj/item/weapon/implantcase/tracking(src)
+		new /obj/item/weapon/implanter(src)
+		new /obj/item/weapon/implantpad(src)
+		new /obj/item/weapon/locator(src)
+
+/obj/item/weapon/storage/box/chemimp
+	name = "chemical implant kit"
+	desc = "Box of stuff used to implant chemicals."
+	icon_state = "implant"
+
+	New()
+		..()
+		new /obj/item/weapon/implantcase/chem(src)
+		new /obj/item/weapon/implantcase/chem(src)
+		new /obj/item/weapon/implantcase/chem(src)
+		new /obj/item/weapon/implantcase/chem(src)
+		new /obj/item/weapon/implantcase/chem(src)
+		new /obj/item/weapon/implanter(src)
+		new /obj/item/weapon/implantpad(src)
+
+
+/obj/item/weapon/storage/box/rxglasses
+	name = "prescription glasses"
+	desc = "This box contains nerd glasses."
+	icon_state = "glasses"
+
+	New()
+		..()
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+		new /obj/item/clothing/glasses/regular(src)
+
+/obj/item/weapon/storage/box/drinkingglasses
+	name = "box of drinking glasses"
+	desc = "It has a picture of drinking glasses on it."
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+
+
+/obj/item/weapon/storage/box/condimentbottles
+	name = "box of condiment bottles"
+	desc = "It has a large ketchup smear on it."
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+		new /obj/item/weapon/reagent_containers/food/condiment(src)
+
+
+
+/obj/item/weapon/storage/box/cups
+	name = "box of paper cups"
+	desc = "It has pictures of paper cups on the front."
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
+
+
+/obj/item/weapon/storage/box/donkpockets
+	name = "box of donk-pockets"
+	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
+	icon_state = "donk_kit"
+
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+
+/obj/item/weapon/storage/box/monkeycubes
+	name = "monkey cube box"
+	desc = "Drymate brand monkey cubes. Just add water!"
+	icon = 'icons/obj/food.dmi'
+	icon_state = "monkeycubebox"
+	storage_slots = 7
+	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube")
+	New()
+		..()
+		for(var/i = 1; i <= 5; i++)
+			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+
+
+/obj/item/weapon/storage/box/ids
+	name = "spare IDs"
+	desc = "Has so many empty IDs."
+	icon_state = "id"
+
+	New()
+		..()
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+		new /obj/item/weapon/card/id(src)
+
+/obj/item/weapon/storage/box/seccarts
+	name = "Spare R.O.B.U.S.T. Cartridges"
+	desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
+	icon_state = "pda"
+
+	New()
+		..()
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+		new /obj/item/weapon/cartridge/security(src)
+
+
+/obj/item/weapon/storage/box/handcuffs
+	name = "spare handcuffs"
+	desc = "A box full of handcuffs."
+	icon_state = "handcuff"
+
+	New()
+		..()
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+		new /obj/item/weapon/handcuffs(src)
+
+/obj/item/weapon/storage/box/mousetraps
+	name = "box of Pest-B-Gon Mousetraps"
+	desc = "<B><FONT=red>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
+	icon_state = "mousetraps"
+
+	New()
+		..()
+		new /obj/item/device/assembly/mousetrap( src )
+		new /obj/item/device/assembly/mousetrap( src )
+		new /obj/item/device/assembly/mousetrap( src )
+		new /obj/item/device/assembly/mousetrap( src )
+		new /obj/item/device/assembly/mousetrap( src )
+		new /obj/item/device/assembly/mousetrap( src )
+
+/obj/item/weapon/storage/box/pillbottles
+	name = "box of pill bottles"
+	desc = "It has pictures of pill bottles on its front."
+
+	New()
+		..()
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+		new /obj/item/weapon/storage/pill_bottle( src )
+
+
+/obj/item/weapon/storage/box/snappops
+	name = "snap pop box"
+	desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "spbox"
+	storage_slots = 8
+	can_hold = list("/obj/item/toy/snappop")
+	New()
+		..()
+		for(var/i=1; i <= storage_slots; i++)
+			new /obj/item/toy/snappop(src)
+
+/obj/item/weapon/storage/box/matches
+	name = "matchbox"
+	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_state = "matchbox"
+	item_state = "zippo"
+	storage_slots = 10
+	w_class = 1
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT
+
+	New()
+		..()
+		for(var/i=1; i <= storage_slots; i++)
+			new /obj/item/weapon/match(src)
+
+	attackby(obj/item/weapon/match/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/match) && W.lit == 0)
+			W.lit = 1
+			W.icon_state = "match_lit"
+			processing_objects.Add(W)
+		W.update_icon()
+		return
+
+
+/obj/item/weapon/storage/box/lights
+	name = "replacement bulbs"
+	icon = 'icons/obj/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
+	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
+
+/obj/item/weapon/storage/box/lights/bulbs/New()
+	..()
+	for(var/i = 0; i < 21; i++)
+		new /obj/item/weapon/light/bulb(src)
+
+/obj/item/weapon/storage/box/lights/tubes
+	name = "replacement tubes"
+	icon_state = "lighttube"
+
+/obj/item/weapon/storage/box/lights/tubes/New()
+	..()
+	for(var/i = 0; i < 21; i++)
+		new /obj/item/weapon/light/tube(src)
+
+/obj/item/weapon/storage/box/lights/mixed
+	name = "replacement lights"
+	icon_state = "lightmixed"
+
+/obj/item/weapon/storage/box/lights/mixed/New()
+	..()
+	for(var/i = 0; i < 14; i++)
+		new /obj/item/weapon/light/tube(src)
+	for(var/i = 0; i < 7; i++)
+		new /obj/item/weapon/light/bulb(src)
@@ -1,3 +1,15 @@
+/obj/item/weapon/storage/briefcase
+	name = "briefcase"
+	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+	icon_state = "briefcase"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 8.0
+	throw_speed = 1
+	throw_range = 4
+	w_class = 4.0
+	max_w_class = 3
+	max_combined_w_class = 16
+
 /obj/item/weapon/storage/briefcase/New()
 	..()

@@ -3,11 +3,14 @@
 * .. Sorry for the shitty path name, I couldnt think of a better one.
 *
 * WARNING: var/icon_type is used for both examine text and sprite name. Please look at the procs below and adjust your sprite names accordingly
+ *		TODO: Cigarette boxes should be ported to this standard
 *
 * Contains:
 *		Donut Box
 *		Egg Box
 *		Candle Box
+ *		Crayon Box
+ *		Cigarette Box
 */

 /obj/item/weapon/storage/fancy/
@@ -94,3 +97,107 @@
 	for(var/i=1; i <= storage_slots; i++)
 		new /obj/item/candle(src)
 	return
+
+/*
+ * Crayon Box
+ */
+
+/obj/item/weapon/storage/fancy/crayons
+	name = "box of crayons"
+	desc = "A box of crayons for all your rune drawing needs."
+	icon = 'icons/obj/crayons.dmi'
+	icon_state = "crayonbox"
+	w_class = 2.0
+	storage_slots = 6
+	icon_type = "crayon"
+	can_hold = list(
+		"/obj/item/toy/crayon"
+	)
+
+/obj/item/weapon/storage/fancy/crayons/New()
+	..()
+	new /obj/item/toy/crayon/red(src)
+	new /obj/item/toy/crayon/orange(src)
+	new /obj/item/toy/crayon/yellow(src)
+	new /obj/item/toy/crayon/green(src)
+	new /obj/item/toy/crayon/blue(src)
+	new /obj/item/toy/crayon/purple(src)
+	update_icon()
+
+/obj/item/weapon/storage/fancy/crayons/update_icon()
+	overlays = list() //resets list
+	overlays += image('icons/obj/crayons.dmi',"crayonbox")
+	for(var/obj/item/toy/crayon/crayon in contents)
+		overlays += image('icons/obj/crayons.dmi',crayon.colourName)
+
+/obj/item/weapon/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob)
+	if(istype(W,/obj/item/toy/crayon))
+		switch(W:colourName)
+			if("mime")
+				usr << "This crayon is too sad to be contained in this box."
+				return
+			if("rainbow")
+				usr << "This crayon is too powerful to be contained in this box."
+				return
+	..()
+
+////////////
+//CIG PACK//
+////////////
+/obj/item/weapon/storage/fancy/cigarettes
+	name = "cigarette packet"
+	desc = "The most popular brand of Space Cigarettes, sponsors of the Space Olympics."
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_state = "cigpacket"
+	item_state = "cigpacket"
+	w_class = 1
+	throwforce = 2
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT
+	storage_slots = 6
+	can_hold = list("/obj/item/clothing/mask/cigarette")
+	icon_type = "cigarette"
+
+/obj/item/weapon/storage/fancy/cigarettes/New()
+	..()
+	flags |= NOREACT
+	for(var/i = 1 to storage_slots)
+		new /obj/item/clothing/mask/cigarette(src)
+	create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
+
+/obj/item/weapon/storage/fancy/cigarettes/Del()
+	del(reagents)
+	..()
+
+
+/obj/item/weapon/storage/fancy/cigarettes/update_icon()
+	icon_state = "[initial(icon_state)][contents.len]"
+	desc = "There are [contents.len] cig\s left!"
+	return
+
+/obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location)
+		var/obj/item/clothing/mask/cigarette/C = W
+		if(!istype(C)) return // what
+		reagents.trans_to(C, (reagents.total_volume/contents.len))
+		..()
+
+/obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M, /mob))
+		return
+
+	if(M == user && user.zone_sel.selecting == "mouth" && contents.len > 0 && !user.wear_mask)
+		var/obj/item/clothing/mask/cigarette/W = new /obj/item/clothing/mask/cigarette(user)
+		reagents.trans_to(W, (reagents.total_volume/contents.len))
+		user.equip_to_slot_if_possible(W, slot_wear_mask)
+		reagents.maximum_volume = 15 * contents.len
+		contents.len--
+		user << "<span class='notice'>You take a cigarette out of the pack.</span>"
+		update_icon()
+	else
+		..()
+
+/obj/item/weapon/storage/fancy/cigarettes/dromedaryco
+	name = "\improper DromedaryCo packet"
+	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
+	icon_state = "Dpacket"
+	item_state = "Dpacket"
@@ -1,133 +1,184 @@
+/* First aid storage
+ * Contains:
+ *		First Aid Kits
+ * 		Pill Bottles
+ *		Dice Pack (in a pill bottle)
+ */

-/obj/item/weapon/storage/firstaid/fire/New()
-	..()
-	if (empty) return
+/*
+ * First Aid Kits
+ */
+/obj/item/weapon/storage/firstaid
+	name = "first-aid kit"
+	desc = "It's an emergency medical kit for those serious boo-boos."
+	icon_state = "firstaid"
+	throw_speed = 2
+	throw_range = 8
+	var/empty = 0

-	icon_state = pick("ointment","firefirstaid")

-	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/stack/medical/ointment( src )
-	new /obj/item/stack/medical/ointment( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage
-	return
+/obj/item/weapon/storage/firstaid/fire
+	name = "fire first-aid kit"
+	desc = "It's an emergency medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
+	icon_state = "ointment"
+	item_state = "firstaid-ointment"

-/obj/item/weapon/storage/syringes/New()
-	..()
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	new /obj/item/weapon/reagent_containers/syringe( src )
-	return
+	New()
+		..()
+		if (empty) return

-/obj/item/weapon/storage/firstaid/regular/New()
-	..()
-	if (empty) return
-	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/ointment(src)
-	new /obj/item/stack/medical/ointment(src)
-	return
+		icon_state = pick("ointment","firefirstaid")

-/obj/item/weapon/storage/firstaid/toxin/New()
-	..()
-	if (empty) return
+		new /obj/item/device/healthanalyzer( src )
+		new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+		new /obj/item/stack/medical/ointment( src )
+		new /obj/item/stack/medical/ointment( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage
+		return

-	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")

-	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	return
+/obj/item/weapon/storage/firstaid/regular
+	icon_state = "firstaid"

-/obj/item/weapon/storage/firstaid/o2/New()
-	..()
-	if (empty) return
-	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	return
+	New()
+		..()
+		if (empty) return
+		new /obj/item/stack/medical/bruise_pack(src)
+		new /obj/item/stack/medical/bruise_pack(src)
+		new /obj/item/stack/medical/bruise_pack(src)
+		new /obj/item/stack/medical/ointment(src)
+		new /obj/item/stack/medical/ointment(src)
+		new /obj/item/device/healthanalyzer(src)
+		new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+		return

-/obj/item/weapon/storage/firstaid/adv/New()
-	..()
-	if (empty) return
-	new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
-	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/stack/medical/advanced/ointment(src)
-	new /obj/item/stack/medical/advanced/ointment(src)
-	new /obj/item/stack/medical/splint(src)
+/obj/item/weapon/storage/firstaid/toxin
+	name = "toxin first aid"
+	desc = "Used to treat when you have a high amoutn of toxins in your body."
+	icon_state = "antitoxin"
+	item_state = "firstaid-toxin"
+
+	New()
+		..()
+		if (empty) return
+
+		icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
+
+		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
+		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
+		new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/device/healthanalyzer( src )
+		return
+
+/obj/item/weapon/storage/firstaid/o2
+	name = "oxygen deprivation first aid"
+	desc = "A box full of oxygen goodies."
+	icon_state = "o2"
+	item_state = "firstaid-o2"
+
+	New()
+		..()
+		if (empty) return
+		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+		new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+		new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+		new /obj/item/device/healthanalyzer( src )
+		return
+
+/*
+ * Pill Bottles
+ */
+/obj/item/weapon/storage/pill_bottle
+	name = "pill bottle"
+	desc = "It's an airtight container for storing medication."
+	icon_state = "pill_canister"
+	icon = 'icons/obj/chemical.dmi'
+	item_state = "contsolid"
+	w_class = 2.0
+	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
+	allow_quick_gather = 1
+	use_to_pickup = 1
+
+/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
+
+	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
+		var/mob/M = usr
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
+			switch(over_object.name)
+				if("r_hand")
+					M.u_equip(src)
+					M.put_in_r_hand(src)
+				if("l_hand")
+					M.u_equip(src)
+					M.put_in_l_hand(src)
+			src.add_fingerprint(usr)
+			return
+		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
+			if (usr.s_active)
+				usr.s_active.close(usr)
+			src.show_to(usr)
+			return
 	return

 /obj/item/weapon/storage/pill_bottle/kelotane
 	name = "Pill bottle (kelotane)"
 	desc = "Contains pills used to treat burns."

-/obj/item/weapon/storage/pill_bottle/kelotane/New()
-	..()
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
-
-/obj/item/weapon/storage/pill_bottle/tramadol
-	name = "Pill bottle (tramadol)"
-	desc = "Contains painkiller pills."
-
-/obj/item/weapon/storage/pill_bottle/tramadol/New()
-	..()
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
-	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+		new /obj/item/weapon/reagent_containers/pill/kelotane( src )

 /obj/item/weapon/storage/pill_bottle/antitox
 	name = "Pill bottle (Anti-toxin)"
 	desc = "Contains pills used to counter toxins."

-/obj/item/weapon/storage/pill_bottle/antitox/New()
-	..()
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )
+		new /obj/item/weapon/reagent_containers/pill/antitox( src )

 /obj/item/weapon/storage/pill_bottle/inaprovaline
 	name = "Pill bottle (inaprovaline)"
 	desc = "Contains pills used to stabilize patients."

-/obj/item/weapon/storage/pill_bottle/inaprovaline/New()
-	..()
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+		new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
+
+
+/obj/item/weapon/storage/pill_bottle/dice
+	name = "pack of dice"
+	desc = "It's a small container with dice inside."
+
+	New()
+		..()
+		new /obj/item/weapon/dice( src )
+		new /obj/item/weapon/dice/d20( src )
+
@@ -1,197 +0,0 @@
-/obj/item/weapon/storage/lglo_kit/New()
-
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	new /obj/item/clothing/gloves/latex(src)
-	..()
-	return
-
-/obj/item/weapon/storage/blankbox/New()
-
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	new /obj/item/ammo_casing/shotgun/blank(src)
-	..()
-	return
-
-/obj/item/weapon/storage/flashbang_kit/New()
-
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	new /obj/item/weapon/grenade/flashbang(src)
-	..()
-	return
-
-/obj/item/weapon/storage/emp_kit/New()
-
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	new /obj/item/weapon/grenade/empgrenade(src)
-	..()
-	return
-
-/obj/item/weapon/storage/stma_kit/New()
-
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	new /obj/item/clothing/mask/surgical(src)
-	..()
-	return
-
-/obj/item/weapon/storage/gl_kit/New()
-
-	new /obj/item/clothing/glasses/regular(src)
-	new /obj/item/clothing/glasses/regular(src)
-	new /obj/item/clothing/glasses/regular(src)
-	new /obj/item/clothing/glasses/regular(src)
-	new /obj/item/clothing/glasses/sunglasses/prescription(src)
-	new /obj/item/clothing/glasses/sunglasses/prescription(src)
-	new /obj/item/clothing/glasses/meson/prescription(src)
-	..()
-	return
-
-/obj/item/weapon/storage/trackimp_kit/New()
-
-	new /obj/item/weapon/implantcase/tracking(src)
-	new /obj/item/weapon/implantcase/tracking(src)
-	new /obj/item/weapon/implantcase/tracking(src)
-	new /obj/item/weapon/implantcase/tracking(src)
-	new /obj/item/weapon/implanter(src)
-	new /obj/item/weapon/implantpad(src)
-	new /obj/item/weapon/locator(src)
-	..()
-	return
-
-/obj/item/weapon/storage/chemimp_kit/New()
-
-	new /obj/item/weapon/implantcase/chem(src)
-	new /obj/item/weapon/implantcase/chem(src)
-	new /obj/item/weapon/implantcase/chem(src)
-	new /obj/item/weapon/implantcase/chem(src)
-	new /obj/item/weapon/implantcase/chem(src)
-	new /obj/item/weapon/implanter(src)
-	new /obj/item/weapon/implantpad(src)
-	..()
-	return
-
-/obj/item/weapon/storage/injectbox/New()
-
-	new /obj/item/weapon/dnainjector/h2m(src)
-	new /obj/item/weapon/dnainjector/h2m(src)
-	new /obj/item/weapon/dnainjector/h2m(src)
-	new /obj/item/weapon/dnainjector/m2h(src)
-	new /obj/item/weapon/dnainjector/m2h(src)
-	new /obj/item/weapon/dnainjector/m2h(src)
-
-	..()
-	return
-
-/obj/item/weapon/storage/id_kit/New()
-
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	new /obj/item/weapon/card/id(src)
-	..()
-	return
-
-/obj/item/weapon/storage/handcuff_kit/New()
-
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	new /obj/item/weapon/handcuffs(src)
-	..()
-	return
-
-/obj/item/weapon/storage/seccart_kit/New()
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	new /obj/item/weapon/cartridge/security(src)
-	..()
-	return
-
-/obj/item/weapon/storage/donkpocket_kit/New()
-
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-	..()
-	return
-
-/obj/item/weapon/storage/condimentbottles/New()
-
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	new /obj/item/weapon/reagent_containers/food/condiment(src)
-	..()
-	return
-
-/obj/item/weapon/storage/drinkingglasses/New()
-
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-	..()
-	return
-
-/*
-/obj/item/weapon/storage/disk_kit/disks/New()
-
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	new /obj/item/weapon/card/data(src)
-	..()
-	return
-
-/obj/item/weapon/storage/disk_kit/disks2/New()
-
-	spawn( 2 )
-		for(var/obj/item/weapon/card/data/D in src.loc)
-			D.loc = src
-			//Foreach goto(23)
-		return
-	..()
-	return
-*/
@@ -1,124 +0,0 @@
-/*
- * Contains:
- *		Monkey Cube Box
- *		Candle Packs
- *		Snap Pop Box
- *		Crayon Box
- *		Beaker Box
- */
-
-/*
- * Monkey Cube Box
- */
-
-/obj/item/weapon/storage/monkeycube_box
-	name = "monkey cube box"
-	desc = "Drymate brand monkey cubes. Just add water!"
-	icon = 'icons/obj/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube")
-
-
-/obj/item/weapon/storage/monkeycube_box/New()
-	..()
-	for(var/i = 1; i <= 5; i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
-	return
-
-/*
- * Snap Pop Box
- */
-
-/obj/item/weapon/storage/snappopbox
-	name = "snap pop box"
-	desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "spbox"
-	storage_slots = 8
-	can_hold = list("/obj/item/toy/snappop")
-
-/obj/item/weapon/storage/snappopbox/New()
-	..()
-	for(var/i=1; i <= storage_slots; i++)
-		new /obj/item/toy/snappop(src)
-
-/*
- * Match Box
- */
-
-/obj/item/weapon/storage/matchbox
-	name = "Matchbox"
-	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "matchbox"
-	item_state = "zippo"
-	storage_slots = 10
-	w_class = 1
-	flags = TABLEPASS
-	slot_flags = SLOT_BELT
-
-
-/obj/item/weapon/storage/matchbox/New()
-	..()
-	for(var/i=1; i <= storage_slots; i++)
-		new /obj/item/weapon/match(src)
-	return
-
-/obj/item/weapon/storage/matchbox/attackby(obj/item/weapon/match/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/match) && W.lit == 0)
-		W.lit = 1
-		W.icon_state = "match_lit"
-		processing_objects.Add(W)
-	W.update_icon()
-	return
-
-/*
- * Crayon Box
- */
-
-/obj/item/weapon/storage/crayonbox/New()
-	..()
-	new /obj/item/toy/crayon/red(src)
-	new /obj/item/toy/crayon/orange(src)
-	new /obj/item/toy/crayon/yellow(src)
-	new /obj/item/toy/crayon/green(src)
-	new /obj/item/toy/crayon/blue(src)
-	new /obj/item/toy/crayon/purple(src)
-	update_icon()
-
-/obj/item/weapon/storage/crayonbox/update_icon()
-	overlays = list() //resets list
-	overlays += image('icons/obj/crayons.dmi',"crayonbox")
-	for(var/obj/item/toy/crayon/crayon in contents)
-		overlays += image('icons/obj/crayons.dmi',crayon.colourName)
-
-/obj/item/weapon/storage/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/toy/crayon))
-		switch(W:colourName)
-			if("mime")
-				usr << "This crayon is too sad to be contained in this box."
-				return
-			if("rainbow")
-				usr << "This crayon is too powerful to be contained in this box."
-				return
-	..()
-
-/*
- * Beaker Box
- */
-/obj/item/weapon/storage/beakerbox
-	name = "Beaker Box"
-	icon_state = "beaker"
-	item_state = "syringe_kit"
-	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
-
-/obj/item/weapon/storage/beakerbox/New()
-	..()
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
-	new /obj/item/weapon/reagent_containers/glass/beaker( src )
@@ -0,0 +1,242 @@
+/*
+ *	Absorbs /obj/item/weapon/secstorage.
+ *	Reimplements it only slightly to use existing storage functionality.
+ *
+ *	Contains:
+ *		Secure Briefcase
+ *		Wall Safe
+ */
+
+// -----------------------------
+//         Generic Item
+// -----------------------------
+/obj/item/weapon/storage/secure
+	name = "secstorage"
+	var/icon_locking = "secureb"
+	var/icon_sparking = "securespark"
+	var/icon_opened = "secure0"
+	var/locked = 1
+	var/code = ""
+	var/l_code = null
+	var/l_set = 0
+	var/l_setshort = 0
+	var/l_hacking = 0
+	var/emagged = 0
+	var/open = 0
+	w_class = 3.0
+	max_w_class = 2
+	max_combined_w_class = 14
+
+	examine()
+		set src in oview(1)
+		..()
+		usr << text("The service panel is [src.open ? "open" : "closed"].")
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(locked)
+			if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged))
+				emagged = 1
+				src.overlays += image('icons/obj/storage.dmi', icon_sparking)
+				sleep(6)
+				src.overlays = null
+				overlays += image('icons/obj/storage.dmi', icon_locking)
+				locked = 0
+				if(istype(W, /obj/item/weapon/melee/energy/blade))
+					var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+					spark_system.set_up(5, 0, src.loc)
+					spark_system.start()
+					playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+					playsound(src.loc, "sparks", 50, 1)
+					user << "You slice through the lock on [src]."
+				else
+					user << "You short out the lock on [src]."
+				return
+
+			if (istype(W, /obj/item/weapon/screwdriver))
+				if (do_after(user, 20))
+					src.open =! src.open
+					user.show_message(text("\blue You [] the service panel.", (src.open ? "open" : "close")))
+				return
+			if ((istype(W, /obj/item/device/multitool)) && (src.open == 1)&& (!src.l_hacking))
+				user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1)
+				src.l_hacking = 1
+				if (do_after(usr, 100))
+					if (prob(40))
+						src.l_setshort = 1
+						src.l_set = 0
+						user.show_message(text("\red Internal memory reset.  Please give it a few seconds to reinitialize."), 1)
+						sleep(80)
+						src.l_setshort = 0
+						src.l_hacking = 0
+					else
+						user.show_message(text("\red Unable to reset internal memory."), 1)
+						src.l_hacking = 0
+				else	src.l_hacking = 0
+				return
+			//At this point you have exhausted all the special things to do when locked
+			// ... but it's still locked.
+			return
+
+		// -> storage/attackby() what with handle insertion, etc
+		..()
+
+
+	MouseDrop(over_object, src_location, over_location)
+		if (locked)
+			src.add_fingerprint(usr)
+			return
+		..()
+
+
+	attack_self(mob/user as mob)
+		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.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)
+		if (!src.locked)
+			message = "*****"
+		dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
+		user << browse(dat, "window=caselock;size=300x280")
+
+	Topic(href, href_list)
+		..()
+		if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
+			return
+		if (href_list["type"])
+			if (href_list["type"] == "E")
+				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.emagged == 0) && (src.l_set == 1))
+					src.locked = 0
+					src.overlays = null
+					overlays += image('icons/obj/storage.dmi', icon_opened)
+					src.code = null
+				else
+					src.code = "ERROR"
+			else
+				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("[]", href_list["type"])
+					if (length(src.code) > 5)
+						src.code = "ERROR"
+			src.add_fingerprint(usr)
+			for(var/mob/M in viewers(1, src.loc))
+				if ((M.client && M.machine == src))
+					src.attack_self(M)
+				return
+		return
+
+// -----------------------------
+//        Secure Briefcase
+// -----------------------------
+/obj/item/weapon/storage/secure/briefcase
+	name = "secure briefcase"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "secure"
+	item_state = "sec-case"
+	desc = "A large briefcase with a digital locking system."
+	flags = FPRINT | TABLEPASS
+	force = 8.0
+	throw_speed = 1
+	throw_range = 4
+	w_class = 4.0
+
+	New()
+		..()
+		new /obj/item/weapon/paper(src)
+		new /obj/item/weapon/pen(src)
+
+	attack_hand(mob/user as mob)
+		if ((src.loc == user) && (src.locked == 1))
+			usr << "\red [src] is locked and cannot be opened!"
+		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
+
+	//I consider this worthless but it isn't my code so whatever.  Remove or uncomment.
+	/*attack(mob/M as mob, mob/living/user as mob)
+		if ((CLUMSY in user.mutations) && prob(50))
+			user << "\red The [src] slips out of your hand and hits your head."
+			user.take_organ_damage(10)
+			user.Paralyse(2)
+			return
+
+		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
+		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
+
+		log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
+
+		var/t = user:zone_sel.selecting
+		if (t == "head")
+			if(ishuman(M))
+				var/mob/living/carbon/human/H = M
+				if (H.stat < 2 && H.health < 50 && prob(90))
+				// ******* Check
+					if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
+						H << "\red The helmet protects you from being hit hard in the head!"
+						return
+					var/time = rand(2, 6)
+					if (prob(75))
+						H.Paralyse(time)
+					else
+						H.Stun(time)
+					if(H.stat != 2)	H.stat = 1
+					for(var/mob/O in viewers(H, null))
+						O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
+				else
+					H << text("\red [] tried to knock you unconcious!",user)
+					H.eye_blurry += 3
+
+		return*/
+
+// -----------------------------
+//        Secure Safe
+// -----------------------------
+
+/obj/item/weapon/storage/secure/safe
+	name = "secure safe"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "safe"
+	icon_opened = "safe0"
+	icon_locking = "safeb"
+	icon_sparking = "safespark"
+	flags = FPRINT | TABLEPASS
+	force = 8.0
+	w_class = 8.0
+	max_w_class = 8
+	anchored = 1.0
+	density = 0
+	cant_hold = list("/obj/item/weapon/storage/secure/briefcase")
+
+	New()
+		..()
+		new /obj/item/weapon/paper(src)
+		new /obj/item/weapon/pen(src)
+
+	attack_hand(mob/user as mob)
+		return attack_self(user)
+
+/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)
@@ -1,6 +1,14 @@
+// To clarify:
+// For use_to_pickup and allow_quick_gather functionality,
+// see item/attackby() (/game/objects/items.dm)
+// Do not remove this functionality without good reason, cough reagent_containers cough.
+// -Sayu
+
+
 /obj/item/weapon/storage
-	icon = 'icons/obj/storage.dmi'
 	name = "storage"
+	icon = 'icons/obj/storage.dmi'
+	w_class = 3.0
 	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/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
@@ -13,9 +21,34 @@
 	var/allow_quick_empty	//Set this variable to allow the object to have the 'empty' verb, which dumps all the contents on the floor.
 	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
-	w_class = 3.0
 	var/foldable = null	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard

+/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
+	if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
+		var/mob/M = usr
+		if (!( istype(over_object, /obj/screen) ))
+			return ..()
+		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
+			return
+		playsound(src.loc, "rustle", 50, 1, -5)
+		if (!( M.restrained() ) && !( M.stat ))
+			switch(over_object.name)
+				if("r_hand")
+					M.u_equip(src)
+					M.put_in_r_hand(src)
+				if("l_hand")
+					M.u_equip(src)
+					M.put_in_l_hand(src)
+			src.add_fingerprint(usr)
+			return
+		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
+			if (usr.s_active)
+				usr.s_active.close(usr)
+			src.show_to(usr)
+			return
+	return
+
+
 /obj/item/weapon/storage/proc/return_inv()

 	var/list/L = list(  )
@@ -146,7 +179,7 @@
 	return

 //This proc return 1 if the item can be picked up and 0 if it can't.
-//Set the stop_messages to stop it from printing emssages
+//Set the stop_messages to stop it from printing messages
 /obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0)
 	if(!istype(W)) return //Not an item

@@ -154,7 +187,7 @@
 		return 0 //Means the item is already in the storage item
 	if(contents.len >= storage_slots)
 		if(!stop_messages)
-			usr << "\red The [src] is full, make some space."
+			usr << "<span class='notice'>[src] is full, make some space.</span>"
 		return 0 //Storage item is full

 	if(can_hold.len)
@@ -165,18 +198,18 @@
 				break
 		if(!ok)
 			if(!stop_messages)
-				usr << "\red This [src] cannot hold [W]."
+				usr << "<span class='notice'>[src] cannot hold [W].</span>"
 			return 0

 	for(var/A in cant_hold) //Check for specific items which this container can't hold.
 		if(istype(W, text2path(A) ))
 			if(!stop_messages)
-				usr << "\red This [src] cannot hold [W]."
+				usr << "<span class='notice'>[src] cannot hold [W].</span>"
 			return 0

 	if (W.w_class > max_w_class)
 		if(!stop_messages)
-			usr << "\red This [W] is too big for this [src]"
+			usr << "<span class='notice'>[W] is too big for this [src].</span>"
 		return 0

 	var/sum_w_class = W.w_class
@@ -185,13 +218,13 @@

 	if(sum_w_class > max_combined_w_class)
 		if(!stop_messages)
-			usr << "\red The [src] is full, make some space."
+			usr << "<span class='notice'>[src] is full, make some space.</span>"
 		return 0

 	if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage)))
 		if(!istype(src, /obj/item/weapon/storage/backpack/holding))	//bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm.
 			if(!stop_messages)
-				usr << "\red The [src] cannot hold [W] as it's a storage item of the same size."
+				usr << "<span class='notice'>[src] cannot hold [W] as it's a storage item of the same size.</span>"
 			return 0 //To prevent the stacking of same sized storage items.

 	return 1
@@ -200,7 +233,7 @@
 //The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once,
 //such as when picking up all the items on a tile with one click.
 /obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
-	if(!istype(W)) return
+	if(!istype(W)) return 0
 	if(usr)
 		usr.u_equip(W)
 		usr.update_icons()	//update our overlays
@@ -215,29 +248,30 @@
 		if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/crossbow))
 			for(var/mob/M in viewers(usr, null))
 				if (M == usr)
-					usr << "\blue You put the [W] into [src]."
+					usr << "<span class='notice'>You put the [W] into [src].</span>"
 				else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
-					M.show_message("\blue [usr] puts [W] into [src].")
+					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")
 				else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
-					M.show_message("\blue [usr] puts [W] into [src].")
+					M.show_message("<span class='notice'>[usr] puts [W] into [src].</span>")

 		src.orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)
 	update_icon()
+	return 1

 //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 as obj, atom/new_location)
-	if(!istype(W)) return
+	if(!istype(W)) return 0

 	if(istype(src, /obj/item/weapon/storage/fancy))
 		var/obj/item/weapon/storage/fancy/F = src
 		F.update_icon(1)

 	for(var/mob/M in range(1, src.loc))
-		if (M.s_active == src.loc)
+		if (M.s_active == src)
 			if (M.client)
-				M.client.screen -= src
+				M.client.screen -= W

 	if(new_location)
 		if(ismob(loc))
@@ -258,6 +292,7 @@
 		W.maptext = ""
 	W.on_exit_storage(src)
 	update_icon()
+	return 1

 //This proc is called when you want to place an item into the storage item.
 /obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob)
@@ -283,9 +318,6 @@
 				W.dropped(user)
 				user << "\red God damnit!"

-	if(istype(W, /obj/item/weapon/packageWrap) && !(src in user)) //prevents package wrap being put inside the backpack when the backpack is not being worn/held (hence being wrappable)
-		return
-
 	handle_item_insertion(W)
 	return

@@ -335,9 +367,9 @@
 	collection_mode = !collection_mode
 	switch (collection_mode)
 		if(1)
-			usr << "The [src] now picks up all ore in a tile at once."
+			usr << "[src] now picks up all items in a tile at once."
 		if(0)
-			usr << "The [src] now picks up one ore at a time."
+			usr << "[src] now picks up one item at a time."


 /obj/item/weapon/storage/verb/quick_empty()
@@ -408,152 +440,11 @@
 	if ( !found )	// User is too far away
 		return
 	// Now make the cardboard
-	user << "\blue You fold [src] flat."
+	user << "<span class='notice'>You fold [src] flat.</span>"
 	new src.foldable(get_turf(src))
 	del(src)
 //BubbleWrap END

-/obj/item/weapon/storage/box/
-	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap
-
-/obj/item/weapon/storage/box/survival/New()
-	..()
-	contents = list()
-	sleep(1)
-	new /obj/item/clothing/mask/breath( src )
-	new /obj/item/weapon/tank/emergency_oxygen( src )
-	return
-
-/obj/item/weapon/storage/box/engineer/New()
-	..()
-	contents = list()
-	sleep(1)
-	new /obj/item/clothing/mask/breath( src )
-	new /obj/item/weapon/tank/emergency_oxygen/engi( src )
-	return
-
-/obj/item/weapon/storage/box/syndicate/New()
-	..()
-	switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))
-		if ("bloodyspai")
-			new /obj/item/clothing/under/chameleon(src)
-			new /obj/item/clothing/mask/gas/voice(src)
-			new /obj/item/weapon/card/id/syndicate(src)
-			new /obj/item/clothing/shoes/syndigaloshes(src)
-			return
-
-		if ("stealth")
-			new /obj/item/weapon/gun/energy/crossbow(src)
-			new /obj/item/weapon/pen/paralysis(src)
-			new /obj/item/device/chameleon(src)
-			return
-
-		if ("screwed")
-			new /obj/effect/spawner/newbomb/timer/syndicate(src)
-			new /obj/effect/spawner/newbomb/timer/syndicate(src)
-			new /obj/item/device/powersink(src)
-			new /obj/item/clothing/suit/space/syndicate(src)
-			new /obj/item/clothing/head/helmet/space/syndicate(src)
-			return
-
-		if ("guns")
-			new /obj/item/weapon/gun/projectile(src)
-			new /obj/item/ammo_magazine/a357(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/weapon/plastique(src)
-			return
-
-		if ("murder")
-			new /obj/item/weapon/melee/energy/sword(src)
-			new /obj/item/clothing/glasses/thermal/syndi(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/clothing/shoes/syndigaloshes(src)
-			return
-
-		if("freedom")
-			var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
-			O.imp = new /obj/item/weapon/implant/freedom(O)
-			var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
-			U.imp = new /obj/item/weapon/implant/uplink(U)
-			return
-
-		if ("hacker")
-			new /obj/item/weapon/aiModule/syndicate(src)
-			new /obj/item/weapon/card/emag(src)
-			new /obj/item/device/encryptionkey/binary(src)
-			return
-
-		if ("lordsingulo")
-			new /obj/item/device/radio/beacon/syndicate(src)
-			new /obj/item/clothing/suit/space/syndicate(src)
-			new /obj/item/clothing/head/helmet/space/syndicate(src)
-			new /obj/item/weapon/card/emag(src)
-			return
-
-/obj/item/weapon/storage/dice/New()
-	new /obj/item/weapon/dice( src )
-	new /obj/item/weapon/dice/d20( src )
-	..()
-	return
-
-/obj/item/weapon/storage/mousetraps/New()
-	new /obj/item/device/assembly/mousetrap( src )
-	new /obj/item/device/assembly/mousetrap( src )
-	new /obj/item/device/assembly/mousetrap( src )
-	new /obj/item/device/assembly/mousetrap( src )
-	new /obj/item/device/assembly/mousetrap( src )
-	new /obj/item/device/assembly/mousetrap( src )
-	..()
-	return
-
-/obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
-
-	if (ishuman(usr) || ismonkey(usr)) //Can monkeys even place items in the pocket slots? Leaving this in just in case~
-		var/mob/M = usr
-		if (!( istype(over_object, /obj/screen) ))
-			return ..()
-		if ((!( M.restrained() ) && !( M.stat ) /*&& M.pocket == src*/))
-			switch(over_object.name)
-				if("r_hand")
-					M.u_equip(src)
-					M.put_in_r_hand(src)
-				if("l_hand")
-					M.u_equip(src)
-					M.put_in_l_hand(src)
-			src.add_fingerprint(usr)
-			return
-		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
-				usr.s_active.close(usr)
-			src.show_to(usr)
-			return
-	return   ///////////////////////////////////////////////////////Alright, that should do it. *MARKER* for any possible runtimes


-/obj/item/weapon/storage/pill_bottle/verb/toggle_mode()
-	set name = "Switch Pill Bottle Method"
-	set category = "Object"

-	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The pill bottle now picks up all pills in a tile at once."
-		if(0)
-			usr << "The pill bottle now picks up one pill at a time."
-
-/obj/item/weapon/storage/pillbottlebox/New()
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	new /obj/item/weapon/storage/pill_bottle( src )
-	..()
-	return
-
-/obj/item/weapon/storage/pill_bottle/New()
-	pixel_x = rand (-7,7)
-	pixel_y = rand (-7,7)
-	..()
-////////////////////////////////////////////////////////////////////////////////
@@ -1,43 +1,86 @@
-/obj/item/weapon/storage/toolbox/emergency/New()
-	..()
-	new /obj/item/weapon/crowbar/red(src)
-	new /obj/item/weapon/extinguisher/mini(src)
-	if(prob(50))
-		new /obj/item/device/flashlight(src)
-	else
-		new /obj/item/device/flashlight/flare(src)
-	new /obj/item/device/radio(src)
+/obj/item/weapon/storage/toolbox
+	name = "toolbox"
+	desc = "Danger. Very robust."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "red"
+	item_state = "toolbox_red"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 5.0
+	throwforce = 10.0
+	throw_speed = 1
+	throw_range = 7
+	w_class = 4.0
+	origin_tech = "combat=1"
+	attack_verb = list("robusted")

-/obj/item/weapon/storage/toolbox/mechanical/New()
-	..()
-	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/device/analyzer(src)
-	new /obj/item/weapon/wirecutters(src)
+	New()
+		..()
+		if (src.type == /obj/item/weapon/storage/toolbox)
+			world << "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]"
+			del(src)

-/obj/item/weapon/storage/toolbox/electrical/New()
-	..()
-	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/weapon/cable_coil(src,30,color)
-	new /obj/item/weapon/cable_coil(src,30,color)
-	if(prob(5))
-		new /obj/item/clothing/gloves/yellow(src)
-	else
+/obj/item/weapon/storage/toolbox/emergency
+	name = "emergency toolbox"
+	icon_state = "red"
+	item_state = "toolbox_red"
+
+	New()
+		..()
+		new /obj/item/weapon/crowbar/red(src)
+		new /obj/item/weapon/extinguisher/mini(src)
+		if(prob(50))
+			new /obj/item/device/flashlight(src)
+		else
+			new /obj/item/device/flashlight/flare(src)
+		new /obj/item/device/radio(src)
+
+/obj/item/weapon/storage/toolbox/mechanical
+	name = "mechanical toolbox"
+	icon_state = "blue"
+	item_state = "toolbox_blue"
+
+	New()
+		..()
+		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/device/analyzer(src)
+		new /obj/item/weapon/wirecutters(src)
+
+/obj/item/weapon/storage/toolbox/electrical
+	name = "electrical toolbox"
+	icon_state = "yellow"
+	item_state = "toolbox_yellow"
+
+	New()
+		..()
+		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/weapon/cable_coil(src,30,color)
+		new /obj/item/weapon/cable_coil(src,30,color)
+		if(prob(5))
+			new /obj/item/clothing/gloves/yellow(src)
+		else
+			new /obj/item/weapon/cable_coil(src,30,color)

-/obj/item/weapon/storage/toolbox/syndicate/New()
-	..()
-	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/weapon/cable_coil(src,30,color)
-	new /obj/item/weapon/wirecutters(src)
-	new /obj/item/device/multitool(src)
+/obj/item/weapon/storage/toolbox/syndicate
+	name = "suspicious looking toolbox"
+	icon_state = "syndicate"
+	item_state = "toolbox_syndi"
+	origin_tech = "combat=1;syndicate=1"
+	force = 7.0
+
+	New()
+		..()
+		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/weapon/cable_coil(src,30,color)
+		new /obj/item/weapon/wirecutters(src)
+		new /obj/item/device/multitool(src)
@@ -1,20 +1,78 @@
-/obj/item/weapon/storage/syndie_kit
+/obj/item/weapon/storage/box/syndicate/
+	New()
+		..()
+		switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1, "hacker" = 1, "lordsingulo" = 1)))
+			if ("bloodyspai")
+				new /obj/item/clothing/under/chameleon(src)
+				new /obj/item/clothing/mask/gas/voice(src)
+				new /obj/item/weapon/card/id/syndicate(src)
+				new /obj/item/clothing/shoes/syndigaloshes(src)
+				return
+
+			if ("stealth")
+				new /obj/item/weapon/gun/energy/crossbow(src)
+				new /obj/item/weapon/pen/paralysis(src)
+				new /obj/item/device/chameleon(src)
+				return
+
+			if ("screwed")
+				new /obj/effect/spawner/newbomb/timer/syndicate(src)
+				new /obj/effect/spawner/newbomb/timer/syndicate(src)
+				new /obj/item/device/powersink(src)
+				new /obj/item/clothing/suit/space/syndicate(src)
+				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				return
+
+			if ("guns")
+				new /obj/item/weapon/gun/projectile(src)
+				new /obj/item/ammo_magazine/a357(src)
+				new /obj/item/weapon/card/emag(src)
+				new /obj/item/weapon/plastique(src)
+				return
+
+			if ("murder")
+				new /obj/item/weapon/melee/energy/sword(src)
+				new /obj/item/clothing/glasses/thermal/syndi(src)
+				new /obj/item/weapon/card/emag(src)
+				new /obj/item/clothing/shoes/syndigaloshes(src)
+				return
+
+			if("freedom")
+				var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
+				O.imp = new /obj/item/weapon/implant/freedom(O)
+				var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
+				U.imp = new /obj/item/weapon/implant/uplink(U)
+				return
+
+			if ("hacker")
+				new /obj/item/weapon/aiModule/syndicate(src)
+				new /obj/item/weapon/card/emag(src)
+				new /obj/item/device/encryptionkey/binary(src)
+				return
+
+			if ("lordsingulo")
+				new /obj/item/device/radio/beacon/syndicate(src)
+				new /obj/item/clothing/suit/space/syndicate(src)
+				new /obj/item/clothing/head/helmet/space/syndicate(src)
+				new /obj/item/weapon/card/emag(src)
+				return
+
+/obj/item/weapon/storage/box/syndie_kit
 	name = "Box"
 	desc = "A sleek, sturdy box"
 	icon_state = "box_of_doom"
-	item_state = "syringe_kit"

-/obj/item/weapon/storage/syndie_kit/imp_freedom
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom
 	name = "Freedom Implant (with injector)"

-/obj/item/weapon/storage/syndie_kit/imp_freedom/New()
-	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
+/obj/item/weapon/storage/box/syndie_kit/imp_freedom/New()
+	..()
+	var/obj/item/weapon/implanter/O = new(src)
 	O.imp = new /obj/item/weapon/implant/freedom(O)
 	O.update()
-	..()
 	return

-/*/obj/item/weapon/storage/syndie_kit/imp_compress
+/*/obj/item/weapon/storage/box/syndie_kit/imp_compress
 	name = "Compressed Matter Implant (with injector)"

 /obj/item/weapon/storage/syndie_kit/imp_compress/New()
@@ -33,21 +91,21 @@
 	..()
 	return*/

-/obj/item/weapon/storage/syndie_kit/imp_uplink
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink
 	name = "Uplink Implant (with injector)"

-/obj/item/weapon/storage/syndie_kit/imp_uplink/New()
-	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
+/obj/item/weapon/storage/box/syndie_kit/imp_uplink/New()
+	..()
+	var/obj/item/weapon/implanter/O = new(src)
 	O.imp = new /obj/item/weapon/implant/uplink(O)
 	O.update()
-	..()
 	return

-/obj/item/weapon/storage/syndie_kit/space
+/obj/item/weapon/storage/box/syndie_kit/space
 	name = "Space Suit and Helmet"

-/obj/item/weapon/storage/syndie_kit/space/New()
+/obj/item/weapon/storage/box/syndie_kit/space/New()
+	..()
 	new /obj/item/clothing/suit/space/syndicate(src)
 	new /obj/item/clothing/head/helmet/space/syndicate(src)
-	..()
 	return
@@ -0,0 +1,89 @@
+/obj/item/weapon/storage/wallet
+	name = "wallet"
+	desc = "It can hold a few small and personal things."
+	storage_slots = 4
+	icon_state = "wallet"
+	w_class = 2
+	can_hold = list(
+		"/obj/item/weapon/spacecash",
+		"/obj/item/weapon/card",
+		"/obj/item/clothing/mask/cigarette",
+		"/obj/item/device/flashlight/pen",
+		"/obj/item/seeds",
+		"/obj/item/stack/medical",
+		"/obj/item/toy/crayon",
+		"/obj/item/weapon/coin",
+		"/obj/item/weapon/dice",
+		"/obj/item/weapon/disk",
+		"/obj/item/weapon/implanter",
+		"/obj/item/weapon/lighter",
+		"/obj/item/weapon/match",
+		"/obj/item/weapon/paper",
+		"/obj/item/weapon/pen",
+		"/obj/item/weapon/photo",
+		"/obj/item/weapon/reagent_containers/dropper",
+		"/obj/item/weapon/screwdriver",
+		"/obj/item/weapon/stamp")
+	slot_flags = SLOT_ID
+
+	var/obj/item/weapon/card/id/front_id = null
+
+
+/obj/item/weapon/storage/wallet/remove_from_storage(obj/item/W as obj, atom/new_location)
+	. = ..(W, new_location)
+	if(.)
+		if(W == front_id)
+			front_id = null
+			update_icon()
+
+/obj/item/weapon/storage/wallet/handle_item_insertion(obj/item/W as obj, prevent_warning = 0)
+	. = ..(W, prevent_warning)
+	if(.)
+		if(!front_id && istype(W, /obj/item/weapon/card/id))
+			front_id = W
+			update_icon()
+
+/obj/item/weapon/storage/wallet/update_icon()
+
+	if(front_id)
+		switch(front_id.icon_state)
+			if("id")
+				icon_state = "walletid"
+				return
+			if("silver")
+				icon_state = "walletid_silver"
+				return
+			if("gold")
+				icon_state = "walletid_gold"
+				return
+			if("centcom")
+				icon_state = "walletid_centcom"
+				return
+	icon_state = "wallet"
+
+
+/obj/item/weapon/storage/wallet/GetID()
+	return front_id
+
+/obj/item/weapon/storage/wallet/GetAccess()
+	var/obj/item/I = GetID()
+	if(I)
+		return I.GetAccess()
+	else
+		return ..()
+
+/obj/item/weapon/storage/wallet/random/New()
+	..()
+	var/item1_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500)
+	var/item2_type
+	if(prob(50))
+		item2_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500)
+	var/item3_type = pick( /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron )
+
+	spawn(2)
+		if(item1_type)
+			new item1_type(src)
+		if(item2_type)
+			new item2_type(src)
+		if(item3_type)
+			new item3_type(src)
@@ -14,6 +14,9 @@

 	origin_tech = "combat=2"

+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is putting the live [src] in \his mouth! It looks like \he's trying to commit suicide.</b>"
+		return (FIRELOSS)

 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
@@ -118,4 +121,4 @@
 			charges = max(0, charges - 5)
 	if(charges < 1)
 		status = 0
-		update_icon()
+		update_icon()
@@ -3,17 +3,807 @@
 *		Retractor
 *		Hemostat
 *		Cautery
- *		Surgical Drill - MIA!
+ *		Surgical Drill
 *		Scalpel
 *		Circular Saw
 */

 /*
+ * Retractor
+ */
+/obj/item/weapon/retractor
+	name = "retractor"
+	desc = "Retracts stuff."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "retractor"
+	m_amt = 10000
+	g_amt = 5000
+	flags = FPRINT | TABLEPASS | CONDUCT
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"

-HAHA, SUCK IT, 2000 LINES OF SPAGHETTI CODE!
+/obj/item/weapon/retractor/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return
+
+/*HAHA, SUCK IT, 2000 LINES OF SPAGHETTI CODE!

 NOW YOUR JOB IOS DONE BY ONLY 500 LINES OF SPAGHETTI CODE!

-LOOK FOR SURGERY.DM
+LOOK FOR SURGERY.DM*/

+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N
+			user << "\red You cannot locate any eyes on this creature!"
+			return
+
+		switch(M.eye_op_stage)
+			if(1.0)
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is having his eyes retracted by [user].", 1)
+					M << "\red [user] begins to seperate your eyes with [src]!"
+					user << "\red You seperate [M]'s eyes with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begins to have his eyes retracted.", \
+						"\red You begin to pry open your eyes with [src]!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(15))
+							M:UpdateDamageIcon()
+						M.updatehealth()
+					else
+						M.take_organ_damage(15)
+
+				M:eye_op_stage = 2.0
+
+	else if(user.zone_sel.selecting == "chest")
+		switch(M:alien_op_stage)
+			if(3.0)
+				var/mob/living/carbon/human/H = M
+				if(!istype(H))
+					return ..()
+
+				if(H.wear_suit || H.w_uniform)
+					user << "\red You're going to need to remove that suit/jumpsuit first."
+					return
+
+				var/obj/item/alien_embryo/A = locate() in M.contents
+				if(!A)
+					return ..()
+				user.visible_message("\red [user] begins to pull something out of [M]'s chest.", "\red You begin to pull the alien organism out of [M]'s chest.")
+
+				spawn(20 + rand(0,50))
+					if(!A || A.loc != M)
+						return
+
+					if(M == user && prob(25))
+						user << "\red You mess up!"
+						if(istype(M, /mob/living/carbon/human))
+							var/datum/organ/external/affecting = M:get_organ("chest")
+							if(affecting.take_damage(30))
+								M:UpdateDamageIcon()
+						else
+							M.take_organ_damage(30)
+
+					if(A.stage > 3)
+						var/chance = 15 + max(0, A.stage - 3) * 10
+						if(prob(chance))
+							A.AttemptGrow(0)
+						M:alien_op_stage = 4.0
+
+					if(M)
+						user.visible_message("\red [user] pulls an alien organism out of [M]'s chest.", "\red You pull the alien organism out of [M]'s chest.")
+						A.loc = M.loc	//alien embryo handles cleanup
+
+	else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human))))
+		return ..()
+
+	return
+
+/*
+ * Hemostat
+ */
+/obj/item/weapon/hemostat
+	name = "hemostat"
+	desc = "You think you have seen this before."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "hemostat"
+	m_amt = 5000
+	g_amt = 2500
+	flags = FPRINT | TABLEPASS | CONDUCT
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"
+	attack_verb = list("attacked", "pinched")
+
+/obj/item/weapon/hemostat/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return
+
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
+		return ..()
+
+	if(user.zone_sel.selecting == "groin")
+		if(istype(M, /mob/living/carbon/human))
+			switch(M:appendix_op_stage)
+				if(1.0)
+					if(M != user)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [user] is beginning to clamp bleeders in [M]'s abdomen cut open with [src].", 1)
+						M << "\red [user] begins to clamp bleeders in your abdomen with [src]!"
+						user << "\red You clamp bleeders in [M]'s abdomen with [src]!"
+						M:appendix_op_stage = 2.0
+				if(4.0)
+					if(M != user)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [user] is removing [M]'s appendix with [src].", 1)
+						M << "\red [user] begins to remove your appendix with [src]!"
+						user << "\red You remove [M]'s appendix with [src]!"
+						for(var/datum/disease/D in M.viruses)
+							if(istype(D, /datum/disease/appendicitis))
+								new /obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed(get_turf(M))
+								M:appendix_op_stage = 5.0
+								return
+						new /obj/item/weapon/reagent_containers/food/snacks/appendix(get_turf(M))
+						M:appendix_op_stage = 5.0
+		return
+
+	if (user.zone_sel.selecting == "eyes")
+
+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N
+			user << "\red You cannot locate any eyes on this creature!"
+			return
+
+		switch(M.eye_op_stage)
+			if(2.0)
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is having his eyes mended by [user].", 1)
+					M << "\red [user] begins to mend your eyes with [src]!"
+					user << "\red You mend [M]'s eyes with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begins to have his eyes mended.", \
+						"\red You begin to mend your eyes with [src]!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(15))
+							M:UpdateDamageIcon()
+						M.updatehealth()
+					else
+						M.take_organ_damage(15)
+				M:eye_op_stage = 3.0
+
+	else if(user.zone_sel.selecting == "chest")
+		if(M:alien_op_stage == 2.0 || M:alien_op_stage == 3.0)
+			var/mob/living/carbon/human/H = M
+			if(!istype(H))
+				return ..()
+
+			if(H.wear_suit || H.w_uniform)
+				user << "\red You're going to need to remove that suit/jumpsuit first."
+				return
+
+			user.visible_message("\red [user] begins to dig around in [M]'s chest.", "\red You begin to dig around in [M]'s chest.")
+
+			spawn(20 + (M:alien_op_stage == 3 ? 0 : rand(0,50)))
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("chest")
+						if(affecting.take_damage(30))
+							M:UpdateDamageIcon()
+					else
+						M.take_organ_damage(30)
+
+				var/obj/item/alien_embryo/A = locate() in M.contents
+				if(A)
+					var/dat = "\blue You found an unknown alien organism in [M]'s chest!"
+					if(A.stage < 4)
+						dat += " It's small and weak, barely the size of a foetus."
+					if(A.stage > 3)
+						dat += " It's grown quite large, and writhes slightly as you look at it."
+						if(prob(10))
+							A.AttemptGrow()
+					user << dat
+					M:alien_op_stage = 3.0
+				else
+					user << "\blue You find nothing of interest."
+
+	else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human))))
+		return ..()
+
+	return
+
+/*
+ * Cautery
+ */
+/obj/item/weapon/cautery
+	name = "cautery"
+	desc = "This stops bleeding."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "cautery"
+	m_amt = 5000
+	g_amt = 2500
+	flags = FPRINT | TABLEPASS | CONDUCT
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"
+	attack_verb = list("burnt")
+
+/obj/item/weapon/cautery/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return
+
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
+		return ..()
+
+	if(user.zone_sel.selecting == "groin")
+		if(istype(M, /mob/living/carbon/human))
+			switch(M:appendix_op_stage)
+				if(5.0)
+					if(M != user)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [user] is beginning to cauterize the incision in [M]'s abdomen with [src].", 1)
+						M << "\red [user] begins to cauterize the incision in your abdomen with [src]!"
+						user << "\red You cauterize the incision in [M]'s abdomen with [src]!"
+						M:appendix_op_stage = 6.0
+						for(var/datum/disease/appendicitis in M.viruses)
+							appendicitis.cure()
+		return
+
+	if (user.zone_sel.selecting == "eyes")
+
+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		if(istype(M, /mob/living/carbon/alien))//Aliens don't have eyes./N
+			user << "\red You cannot locate any eyes on this creature!"
+			return
+
+		switch(M.eye_op_stage)
+			if(3.0)
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is having his eyes cauterized by [user].", 1)
+					M << "\red [user] begins to cauterize your eyes!"
+					user << "\red You cauterize [M]'s eyes with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begins to have his eyes cauterized.", \
+						"\red You begin to cauterize your eyes!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(15))
+							M:UpdateDamageIcon()
+						M.updatehealth()
+					else
+						M.take_organ_damage(15)
+				M.sdisabilities &= ~BLIND
+				M.eye_stat = 0
+				M:eye_op_stage = 0.0
+
+	else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human))))
+		return ..()
+
+	return
+
+/*
+ * Surgical Drill
+ */
+/obj/item/weapon/surgicaldrill
+	name = "surgical drill"
+	desc = "You can drill using this item. You dig?"
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "drill"
+	hitsound = 'sound/weapons/circsawhit.ogg'
+	m_amt = 15000
+	g_amt = 10000
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 15.0
+	w_class = 1.0
+	origin_tech = "materials=1;biotech=1"
+	attack_verb = list("drilled")
+
+	suicide_act(mob/user)
+		viewers(user) << pick("/red <b>[user] is pressing the [src] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
+							"/red <b>[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
+		return (BRUTELOSS)
+/*
+ * Scalpel
+ */
+/obj/item/weapon/scalpel
+	name = "scalpel"
+	desc = "Cut, cut, and once more cut."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "scalpel"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 10.0
+	w_class = 1.0
+	throwforce = 5.0
+	throw_speed = 3
+	throw_range = 5
+	m_amt = 10000
+	g_amt = 5000
+	origin_tech = "materials=1;biotech=1"
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+	suicide_act(mob/user)
+		viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>")
+		return (BRUTELOSS)
+
+/obj/item/weapon/scalpel/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return ..()
+
+	//if(M.mutations & HUSK)	return ..()
+
+	if((CLUMSY in user.mutations) && prob(50))
+		M = user
+		return eyestab(M,user)
+
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
+		return ..()
+
+	src.add_fingerprint(user)
+
+	if(user.zone_sel.selecting == "groin")
+		if(istype(M, /mob/living/carbon/human))
+			switch(M:appendix_op_stage)
+				if(0.0)
+					if(M != user)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [M] is beginning to have his abdomen cut open with [src] by [user].", 1)
+						M << "\red [user] begins to cut open your abdomen with [src]!"
+						user << "\red You cut [M]'s abdomen open with [src]!"
+						M:appendix_op_stage = 1.0
+				if(3.0)
+					if(M != user)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [M] is beginning to have his appendix seperated with [src] by [user].", 1)
+						M << "\red [user] begins to seperate your appendix with [src]!"
+						user << "\red You seperate [M]'s appendix with [src]!"
+						M:appendix_op_stage = 4.0
+		return
+
+	if(user.zone_sel.selecting == "head" || istype(M, /mob/living/carbon/slime))
+
+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		switch(M:brain_op_stage)
+			if(0.0)
+				if(istype(M, /mob/living/carbon/slime))
+					if(M.stat == 2)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [M.name] is beginning to have its flesh cut open with [src] by [user].", 1)
+						M << "\red [user] begins to cut open your flesh with [src]!"
+						user << "\red You cut [M]'s flesh open with [src]!"
+						M:brain_op_stage = 1.0
+
+					return
+
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is beginning to have his head cut open with [src] by [user].", 1)
+					M << "\red [user] begins to cut open your head with [src]!"
+					user << "\red You cut [M]'s head open with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begins to cut open his skull with [src]!", \
+						"\red You begin to cut open your head with [src]!" \
+					)
+
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(15))
+							M:UpdateDamageIcon()
+					else
+						M.take_organ_damage(15)
+
+				if(istype(M, /mob/living/carbon/human))
+					var/datum/organ/external/affecting = M:get_organ("head")
+					affecting.take_damage(7)
+				else
+					M.take_organ_damage(7)
+
+				M.updatehealth()
+				M:brain_op_stage = 1.0
+
+			if(1)
+				if(istype(M, /mob/living/carbon/slime))
+					if(M.stat == 2)
+						for(var/mob/O in (viewers(M) - user - M))
+							O.show_message("\red [M.name] is having its silky inndards cut apart with [src] by [user].", 1)
+						M << "\red [user] begins to cut apart your innards with [src]!"
+						user << "\red You cut [M]'s silky innards apart with [src]!"
+						M:brain_op_stage = 2.0
+					return
+			if(2.0)
+				if(istype(M, /mob/living/carbon/slime))
+					if(M.stat == 2)
+						var/mob/living/carbon/slime/slime = M
+						if(slime.cores > 0)
+							if(istype(M, /mob/living/carbon/slime))
+								user << "\red You attempt to remove [M]'s core, but [src] is ineffective!"
+					return
+
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is having his connections to the brain delicately severed with [src] by [user].", 1)
+					M << "\red [user] begins to cut open your head with [src]!"
+					user << "\red You cut [M]'s head open with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begin to delicately remove the connections to his brain with [src]!", \
+						"\red You begin to cut open your head with [src]!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You nick an artery!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(75))
+							M:UpdateDamageIcon()
+					else
+						M.take_organ_damage(75)
+
+				if(istype(M, /mob/living/carbon/human))
+					var/datum/organ/external/affecting = M:get_organ("head")
+					affecting.take_damage(7)
+				else
+					M.take_organ_damage(7)
+
+				M.updatehealth()
+				M:brain_op_stage = 3.0
+			else
+				..()
+		return
+
+	else if(user.zone_sel.selecting == "eyes")
+		user << "\blue So far so good."
+
+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N
+			user << "\red You cannot locate any eyes on this creature!"
+			return
+
+		switch(M:eye_op_stage)
+			if(0.0)
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] is beginning to have his eyes incised with [src] by [user].", 1)
+					M << "\red [user] begins to cut open your eyes with [src]!"
+					user << "\red You make an incision around [M]'s eyes with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] begins to cut around his eyes with [src]!", \
+						"\red You begin to cut open your eyes with [src]!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(15))
+							M:UpdateDamageIcon()
+					else
+						M.take_organ_damage(15)
+
+				user << "\blue So far so good before."
+				M.updatehealth()
+				M:eye_op_stage = 1.0
+				user << "\blue So far so good after."
+
+	else if(user.zone_sel.selecting == "chest")
+		switch(M:alien_op_stage)
+			if(0.0)
+				var/mob/living/carbon/human/H = M
+				if(!istype(H))
+					return ..()
+
+				if(H.wear_suit || H.w_uniform)
+					user << "\red You're going to need to remove that suit/jumpsuit first."
+					return
+
+				user.visible_message("\red [user] begins to slice open [M]'s chest.", "\red You begin to slice open [M]'s chest.")
+
+				spawn(rand(20,50))
+					if(M == user && prob(25))
+						user << "\red You mess up!"
+						if(istype(M, /mob/living/carbon/human))
+							var/datum/organ/external/affecting = M:get_organ("chest")
+							if(affecting.take_damage(15))
+								M:UpdateDamageIcon()
+						else
+							M.take_organ_damage(15)
+
+					M:alien_op_stage = 1.0
+					user << "\blue So far so good."
+
+	else
+		return ..()
+/* wat
+	else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human))))
+		return ..()*/
+	return
+
+
+/*
+ * Circular Saw
+ */
+/obj/item/weapon/circular_saw
+	name = "circular saw"
+	desc = "For heavy duty cutting."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "saw3"
+	hitsound = 'sound/weapons/circsawhit.ogg'
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 15.0
+	w_class = 1.0
+	throwforce = 9.0
+	throw_speed = 3
+	throw_range = 5
+	m_amt = 20000
+	g_amt = 10000
+	origin_tech = "materials=1;biotech=1"
+	attack_verb = list("attacked", "slashed", "sawed", "cut")
+
+/obj/item/weapon/circular_saw/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	if(!istype(M))
+		return ..()
+
+	if((CLUMSY in user.mutations) && prob(50))
+		M = user
+		return eyestab(M,user)
+
+	if(!((locate(/obj/machinery/optable, M.loc) && M.resting) || (locate(/obj/structure/table/, M.loc) && M.lying && prob(50))))
+		return ..()
+
+	src.add_fingerprint(user)
+
+	if(user.zone_sel.selecting == "head" || istype(M, /mob/living/carbon/slime))
+
+		var/mob/living/carbon/human/H = M
+		if(istype(H) && ( \
+				(H.head && H.head.flags & HEADCOVERSEYES) || \
+				(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
+				(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		var/mob/living/carbon/monkey/Mo = M
+		if(istype(Mo) && ( \
+				(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
+			))
+			user << "\red You're going to need to remove that mask/helmet/glasses first."
+			return
+
+		switch(M:brain_op_stage)
+			if(1.0)
+				if(istype(M, /mob/living/carbon/slime))
+					return
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] has his skull sawed open with [src] by [user].", 1)
+					M << "\red [user] begins to saw open your head with [src]!"
+					user << "\red You saw [M]'s head open with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] saws open his skull with [src]!", \
+						"\red You begin to saw open your head with [src]!" \
+					)
+				if(M == user && prob(25))
+					user << "\red You mess up!"
+					if(istype(M, /mob/living/carbon/human))
+						var/datum/organ/external/affecting = M:get_organ("head")
+						if(affecting.take_damage(40))
+							M:UpdateDamageIcon()
+						M.updatehealth()
+					else
+						M.take_organ_damage(40)
+
+				if(istype(M, /mob/living/carbon/human))
+					var/datum/organ/external/affecting = M:get_organ("head")
+					affecting.take_damage(7)
+				else
+					M.take_organ_damage(7)
+
+				M.updatehealth()
+				M:brain_op_stage = 2.0
+
+			if(2.0)
+				if(istype(M, /mob/living/carbon/slime))
+					if(M.stat == 2)
+						var/mob/living/carbon/slime/slime = M
+						if(slime.cores > 0)
+							for(var/mob/O in (viewers(M) - user - M))
+								O.show_message("\red [M.name] is having one of its cores sawed out with [src] by [user].", 1)
+
+							slime.cores--
+							M << "\red [user] begins to remove one of your cores with [src]! ([slime.cores] cores remaining)"
+							user << "\red You cut one of [M]'s cores out with [src]! ([slime.cores] cores remaining)"
+
+							new slime.coretype(M.loc)
+
+							if(slime.cores <= 0)
+								M.icon_state = "[slime.colour] baby slime dead-nocore"
+
+					return
+
+			if(3.0)
+				/*if(M.mind && M.mind.changeling)
+					user << "\red The neural tissue regrows before your eyes as you cut it."
+					return*/
+
+				if(M != user)
+					for(var/mob/O in (viewers(M) - user - M))
+						O.show_message("\red [M] has his spine's connection to the brain severed with [src] by [user].", 1)
+					M << "\red [user] severs your brain's connection to the spine with [src]!"
+					user << "\red You sever [M]'s brain's connection to the spine with [src]!"
+				else
+					user.visible_message( \
+						"\red [user] severs his brain's connection to the spine with [src]!", \
+						"\red You sever your brain's connection to the spine with [src]!" \
+					)
+
+				user.attack_log += "\[[time_stamp()]\]<font color='red'> Debrained [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
+				M.attack_log += "\[[time_stamp()]\]<font color='orange'> Debrained by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
+
+				log_attack("<font color='red'>[user.name] ([user.ckey]) debrained [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
+
+
+				var/obj/item/brain/B = new(M.loc)
+				B.transfer_identity(M)
+
+				M:brain_op_stage = 4.0
+				M.death()//You want them to die after the brain was transferred, so not to trigger client death() twice.
+
+			else
+				..()
+		return
+
+	else if(user.zone_sel.selecting == "chest")
+		switch(M:alien_op_stage)
+			if(1.0)
+				var/mob/living/carbon/human/H = M
+				if(!istype(H))
+					return ..()
+
+				if(H.wear_suit || H.w_uniform)
+					user << "\red You're going to need to remove that suit/jumpsuit first."
+					return
+
+				user.visible_message("\red [user] begins to slice through the bone of [M]'s chest.", "\red You begin to slice through the bone of [M]'s chest.")
+
+				spawn(20 + rand(0,50))
+					if(M == user && prob(25))
+						user << "\red You mess up!"
+						if(istype(M, /mob/living/carbon/human))
+							var/datum/organ/external/affecting = M:get_organ("chest")
+							if(affecting.take_damage(15))
+								M:UpdateDamageIcon()
+						else
+							M.take_organ_damage(15)
+
+					M:alien_op_stage = 2.0
+					user << "\blue So far so good."
+
+	else
+		return ..()
+/*
+	else if((!(user.zone_sel.selecting == "head")) || (!(user.zone_sel.selecting == "groin")) || (!(istype(M, /mob/living/carbon/human))))
+		return ..()
 */
+	return
+
+//misc, formerly from code/defines/weapons.dm
+/obj/item/weapon/bonegel
+	name = "bone gel"
+	icon = 'surgery.dmi'
+	icon_state = "bone-gel"
+	force = 0
+	throwforce = 1.0
+
+/obj/item/weapon/FixOVein
+	name = "FixOVein"
+	icon = 'surgery.dmi'
+	icon_state = "fixovein"
+	force = 0
+	throwforce = 1.0
+	origin_tech = "materials=1;biotech=3"
+	var/usage_amount = 10
+
+/obj/item/weapon/bonesetter
+	name = "bone setter"
+	icon = 'surgery.dmi'
+	icon_state = "bone setter"
+	force = 8.0
+	throwforce = 9.0
+	throw_speed = 3
+	throw_range = 5
+	attack_verb = list("attacked", "hit", "bludgeoned")
@@ -23,9 +23,6 @@
 		return 1
 	return 0

-/obj/item/weapon/melee/energy/sword/attack(target as mob, mob/user as mob)
-	..()
-
 /obj/item/weapon/melee/energy/sword/New()
 	color = pick("red","blue","green","purple")

@@ -81,7 +81,7 @@
 	if (istype(src.loc, /obj/item/assembly))
 		icon = src.loc

-	if ((istype(W, /obj/item/device/analyzer) || (istype(W, /obj/item/device/pda))) && get_dist(user, src) <= 1)
+	if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
 		for (var/mob/O in viewers(user, null))
 			O << "\red [user] has used [W] on \icon[icon] [src]"

@@ -7,6 +7,23 @@
 /*
 * Locator
 */
+/obj/item/weapon/locator
+	name = "locator"
+	desc = "Used to track those with locater implants."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "locator"
+	var/temp = null
+	var/frequency = 1451
+	var/broadcasting = null
+	var/listening = 1.0
+	flags = FPRINT | TABLEPASS| CONDUCT
+	w_class = 2.0
+	item_state = "electronic"
+	throw_speed = 4
+	throw_range = 20
+	m_amt = 400
+	origin_tech = "magnets=1"
+
 /obj/item/weapon/locator/attack_self(mob/user as mob)
 	user.set_machine(src)
 	var/dat
@@ -105,6 +122,19 @@ Frequency:
 /*
 * Hand-tele
 */
+/obj/item/weapon/hand_tele
+	name = "hand tele"
+	desc = "A portable item using blue-space technology."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "hand_tele"
+	item_state = "electronic"
+	throwforce = 5
+	w_class = 2.0
+	throw_speed = 3
+	throw_range = 5
+	m_amt = 10000
+	origin_tech = "magnets=1;bluespace=3"
+
 /obj/item/weapon/hand_tele/attack_self(mob/user as mob)
 	var/turf/current_location = get_turf(user)//What turf is the user on?
 	if(!current_location||current_location.z==2||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
@@ -4,10 +4,11 @@
 * Note: Multitools are /obj/item/device
 *
 * Contains:
- * Wrench
- * Screwdriver
- * Wirecutters
- * Welding Tool
+ * 		Wrench
+ * 		Screwdriver
+ * 		Wirecutters
+ * 		Welding Tool
+ * 		Crowbar
 */

 /*
@@ -31,6 +32,27 @@
 /*
 * Screwdriver
 */
+/obj/item/weapon/screwdriver
+	name = "screwdriver"
+	desc = "You can be totally screwwy with this."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "screwdriver"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
+	force = 5.0
+	w_class = 1.0
+	throwforce = 5.0
+	throw_speed = 3
+	throw_range = 5
+	g_amt = 0
+	m_amt = 75
+	attack_verb = list("stabbed")
+
+	suicide_act(mob/user)
+		viewers(user) << pick("\red <b>[user] is stabbing the [src] into \his temple! It looks like \he's trying to commit suicide.</b>", \
+							"\red <b>[user] is stabbing the [src] into \his heart! It looks like \he's trying to commit suicide.</b>")
+		return(BRUTELOSS)
+
 /obj/item/weapon/screwdriver/New()
 	switch(pick("red","blue","purple","brown","green","cyan","yellow"))
 		if ("red")
@@ -394,23 +416,26 @@
 	if(reagents > max_fuel)
 		reagents = max_fuel

-/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
-	if(hasorgans(M))
-		var/datum/organ/external/S = M:organs_by_name[user.zone_sel.selecting]
-		if (!S) return
-		if(!(S.status & ORGAN_ROBOT) || user.a_intent != "help")
-			return ..()
-		if(S.brute_dam)
-			S.heal_damage(15,0,0,1)
-			if(user != M)
-				user.visible_message("\red You patch some dents on \the [M]'s [S.display_name]",\
-				"\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src]",\
-				"You hear a welder.")
-			else
-				user.visible_message("\red You patch some dents on your [S.display_name]",\
-				"\red \The [user] patches some dents on their [S.display_name] with \the [src]",\
-				"You hear a welder.")
-		else
-			user << "Nothing to fix!"
-	else
-		return ..()
+/*
+ * Crowbar
+ */
+
+/obj/item/weapon/crowbar
+	name = "crowbar"
+	desc = "Used to hit floors"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "crowbar"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
+	force = 5.0
+	throwforce = 7.0
+	item_state = "crowbar"
+	w_class = 2.0
+	m_amt = 50
+	origin_tech = "engineering=1"
+	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
+
+/obj/item/weapon/crowbar/red
+	icon = 'icons/obj/items.dmi'
+	icon_state = "red_crowbar"
+	item_state = "crowbar_red"
@@ -1,73 +0,0 @@
-/obj/item/weapon/trashbag
-	name = "trash bag"
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
-	icon = 'icons/obj/trash.dmi'
-	icon_state = "trashbag0"
-	item_state = "trashbag"
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 4
-	var/mode = 1		//0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 25	//the amount of trash it can carry.
-
-/obj/item/weapon/trashbag/update_icon()
-	if(contents.len == 0)
-		icon_state = "trashbag0"
-	else if(contents.len < 12)
-		icon_state = "trashbag1"
-	else if(contents.len < 25)
-		icon_state = "trashbag2"
-	else icon_state = "trashbag3"
-
-/obj/item/weapon/trashbag/attackby(obj/item/I as obj, mob/user as mob)
-	..()
-	if(contents.len < capacity)
-		if(istype(I, /obj/item))
-			if(I.w_class <= 2)
-				user.drop_item()
-				I.loc = src
-	else
-		user << "<span class='notice'>[src] is full!</span>"
-
-/obj/item/weapon/trashbag/attack_self(mob/living/user as mob)
-	if(contents.len > 0)
-		for(var/obj/item/I in contents)
-			I.loc = user.loc
-		update_icon()
-		user << "<span class='notice'>You empty [src] onto [user.loc].</span>"
-
-/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/user as mob|obj, flag)
-	if(istype(target, /obj/item))
-		var/obj/item/W = target
-		if(W.w_class <= 2)
-			if(mode == 1)
-				if(contents.len < capacity)	//slightly redundant, but it makes it prettier in the chatbox. -Pete
-					user << "<span class='notice'>You pick up all the trash.</span>"
-					for(var/obj/item/O in get_turf(W))
-						if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
-						if(contents.len < capacity)
-							if(O.w_class <= 2)
-								O.loc = src
-						else
-							user << "<span class='notice'>[src] is full!</span>"
-							break
-				else
-					user << "<span class='notice'>[src] is full!</span>"
-			else
-				if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
-				if(contents.len < capacity)
-					contents += W;
-				else
-					user << "<span class='notice'>[src] is full!</span>"
-			update_icon()
-		return
-
-/obj/item/weapon/trashbag/verb/toggle_mode()
-	set name = "Switch Bag Method"
-	set category = "Object"
-
-	mode = !mode
-	if(mode == 1)
-		usr << "<span class='notice'>[src] now picks up all trash in a tile at once.</span>"
-	else
-		usr << "<span class='notice'>[src] now picks up one piece of trash at a time.</span>"
@@ -0,0 +1,99 @@
+/obj/item/weapon/banhammer
+	desc = "A banhammer"
+	name = "banhammer"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "toyhammer"
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
+	throwforce = 0
+	w_class = 1.0
+	throw_speed = 7
+	throw_range = 15
+	attack_verb = list("banned")
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is hitting \himself with the [src]! It looks like \he's trying to ban \himself from life.</b>"
+		return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
+
+/obj/item/weapon/nullrod
+	name = "null rod"
+	desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers."
+	icon_state = "nullrod"
+	item_state = "nullrod"
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
+	force = 15
+	throw_speed = 1
+	throw_range = 4
+	throwforce = 10
+	w_class = 1
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		return (BRUTELOSS|FIRELOSS)
+
+/obj/item/weapon/sord
+	name = "\improper SORD"
+	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
+	icon_state = "sord"
+	item_state = "sord"
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
+	force = 2
+	throwforce = 1
+	w_class = 3
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>"
+		return(BRUTELOSS)
+
+/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()
+
+/obj/item/weapon/claymore
+	name = "claymore"
+	desc = "What are you standing around staring at this for? Get to killing!"
+	icon_state = "claymore"
+	item_state = "claymore"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
+	force = 40
+	throwforce = 10
+	w_class = 3
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+	IsShield()
+		return 1
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is falling on the [src]! It looks like \he's trying to commit suicide.</b>"
+		return(BRUTELOSS)
+
+/obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()
+
+/obj/item/weapon/katana
+	name = "katana"
+	desc = "Woefully underpowered in D20"
+	icon_state = "katana"
+	item_state = "katana"
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT | SLOT_BACK
+	force = 40
+	throwforce = 10
+	w_class = 3
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+	suicide_act(mob/user)
+		viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>"
+		return(BRUTELOSS)
+
+/obj/item/weapon/katana/IsShield()
+		return 1
+
+/obj/item/weapon/katana/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()