You can now interact with belts that are not on your belt slot.

Added Security Belts, 4 slot belt that can carry basic sec gear.
The security shuttle control can now be emag'd.
Removed the old take off and stabilize verbs for the pshuttle. 
Cleaned up some computer defines.
The detective's cabinet is now a secure cabinet.
Most of the secure closets cleaned up a bit.
The captain no longer spawns with an ID box in his backpack.
RD's locker got its flash back.
Added the blob node sprites.
Removed the 2% laser resist that normal jumpsuits gave.  Normal clothing should not be blocking lasers.  Left the 10% special block on each department.
Riot suit slowdown lowered to 1 from 2.5
Repiped the right side of sec and tidied up the powerlines.
Loyalty Implanter moved into the outer rec room checkpoint.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2277 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/closet.dm

@@ -26,13 +26,6 @@
 	icon_closed = "cabinet_closed"
 	icon_opened = "cabinet_open"
 
-/obj/closet/cabinet2
-	desc = "Old will forever be in fashion."
-	name = "Cabinet"
-	icon_state = "cabinetdet_closed"
-	icon_closed = "cabinetdet_closed"
-	icon_opened = "cabinetdet_open"
-
 /obj/spresent
 	desc = "It's a ... present?"
 	name = "strange present"
@@ -363,7 +356,7 @@
 	icon_closed = "extinguisher10"
 	opened = 1
 	var/localopened = 1
-	desc = "Sure was nice of CentCom to install these everywhere. Foam in them would have been nicer."
+	desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
 	anchored = 1
 
 	open()
@@ -373,8 +366,6 @@
 		return
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		//..() don't want it to behave like a normal closet.
-
 		if (isrobot(usr))
 			return
 		if (istype(O, /obj/item/weapon/extinguisher))
@@ -466,8 +457,6 @@
 	icon_opened = "syndicate1open"
 	desc = "Tacticool Gear Closet"
 
-	// Ending of my edit. ~Sillazi
-
 /obj/closet/thunderdome
 	desc = "Everything you need!"
 	icon_state = "syndicate"
@@ -504,98 +493,90 @@
 
 /obj/closet/wardrobe/black
 	name = "Black Wardrobe"
-	desc = "This contains clothes which appears to be black."
+	desc = "Contains black jumpsuits."
 	icon_state = "black"
 	icon_closed = "black"
 
 /obj/closet/wardrobe/chaplain_black
 	name = "Chaplain Wardrobe"
-	desc = "Closet of chaplain clothes. Looks meh."
+	desc = "Closet of basic chaplain clothes."
 	icon_state = "black"
 	icon_closed = "black"
 
 /obj/closet/wardrobe/green
 	name = "Green Wardrobe"
-	desc = "Green is the new green."
+	desc = "Contains green jumpsuits."
 	icon_state = "green"
 	icon_closed = "green"
 
 /obj/closet/wardrobe/mixed
 	name = "Mixed Wardrobe"
-	desc = "This appears to contain two different sets of clothing."
+	desc = "This appears to contain several different sets of clothing."
 	icon_state = "mixed"
 	icon_closed = "mixed"
 
 /obj/closet/wardrobe/orange
 	name = "Prisoners Wardrobe"
-	desc = "Prisoners now wear orange. The Security Officers kept thinking the Mime was an escapee."
+	desc = "Contains orange jumpsuits."
 	icon_state = "orange"
 	icon_closed = "orange"
 
 /obj/closet/wardrobe/pink
 	name = "Pink Wardrobe"
-	desc = "Closet of of soft clothing."
+	desc = "Contains pink jumpsuits."
 	icon_state = "pink"
 	icon_closed = "pink"
 
 /obj/closet/wardrobe/red
 	name = "Red Wardrobe"
-	desc = "This closer appears to contain clothing which are red."
+	desc = "Contains red jumpsuits."
 	icon_state = "red"
 	icon_closed = "red"
 
-/obj/closet/wardrobe/forensics_red
-	name = "Forensics Wardrobe"
-	desc = "Used by your local Forensics."
-	icon_state = "red"
-	icon_closed = "red"
-
-
 /obj/closet/wardrobe/white
 	name = "White Wardrobe"
-	desc = "Basic plain white clothing. Boring..."
+	desc = "Contains white jumpsuits."
 	icon_state = "white"
 	icon_closed = "white"
 
 /obj/closet/wardrobe/toxins_white
 	name = "Toxins Wardrobe"
-	desc = "Clothes for toxins."
+	desc = "Contains toxins jumpsuits."
 	icon_state = "white"
 	icon_closed = "white"
 
 /obj/closet/wardrobe/genetics_white
 	name = "Genetics Wardrobe"
-	desc = "Clothes for genetics. They will need this when they are human."
+	desc = "Contains genetics jumpsuits."
 	icon_state = "white"
 	icon_closed = "white"
 
-
 /obj/closet/wardrobe/yellow
 	name = "Yellow Wardrobe"
-	desc = "Basic yellow clothing."
+	desc = "Contains yellow jumpsuits."
 	icon_state = "wardrobe-y"
 	icon_closed = "wardrobe-y"
 
 /obj/closet/wardrobe/engineering_yellow
 	name = "Engineering Wardrobe"
-	desc = "The yellow Engineers loves."
+	desc = "Contains engineering jumpsuits."
 	icon_state = "yellow"
 	icon_closed = "yellow"
 
 /obj/closet/wardrobe/atmospherics_yellow
 	name = "Atmospherics Wardrobe"
-	desc = "Clothing for the most dangerous job."
+	desc = "Contains atmospheric jumpsuits."
 	icon_state = "yellow"
 	icon_closed = "yellow"
 
-
 /obj/closet/wardrobe/grey
 	name = "Grey Wardrobe"
-	desc = "This contains the clothing of the Grey Shirts."
+	desc = "Contains grey jumpsuits."
 	icon_state = "grey"
 	icon_closed = "grey"
 
 
+
 /obj/secure_closet
 	desc = "An immobile card-locked storage closet."
 	name = "Security Locker"
@@ -614,72 +595,6 @@
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 300
 
-/obj/secure_closet/courtroom
-	name = "Courtroom Locker"
-	req_access = list(access_court)
-
-/obj/secure_closet/animal
-	name = "Animal Control"
-	req_access = list(access_medical)
-
-/obj/secure_closet/brig
-	name = "Brig Locker"
-	req_access = list(access_brig)
-	var/id = null
-
-/obj/secure_closet/highsec
-	name = "Head of Personnel"
-	req_access = list(access_hop)
-
-/obj/secure_closet/hos
-	name = "Head Of Security"
-	req_access = list(access_hos)
-
-/obj/secure_closet/injection
-	name = "Lethal Injections"
-	req_access = list(access_hos)
-
-/obj/secure_closet/captains
-	name = "Captain's Closet"
-	req_access = list(access_captain)
-
-/obj/secure_closet/medical1
-	name = "Medicine Closet"
-	desc = "Filled with medical junk."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
-	req_access = list(access_medical)
-
-/obj/secure_closet/chemical
-	name = "Chemical Closet"
-	desc = "Store dangerous chemicals in here. This closet is full of cobwebs."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
-	req_access = list(access_medical)
-
-/obj/secure_closet/medical2
-	name = "Anesthetic"
-	desc = "Used to knock people out, but who uses this trash?"
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medical1"
-	req_access = list(access_medical)
-
-/obj/secure_closet/medical3
-	name = "Medical Doctor's Locker"
-	req_access = list(access_medical)
-
 /obj/secure_closet/medical_wall
 	anchored = 1
 	name = "First Aid Closet"
@@ -693,14 +608,6 @@
 	req_access = list(access_medical)
 	wall_mounted = 1
 
-/obj/secure_closet/RD
-	name = "Research Director"
-	req_access = list(access_rd)
-
-/obj/secure_closet/CMO
-	name = "Chief Medical Officer"
-	req_access = list(access_cmo)
-
 /obj/secure_closet/personal
 	desc = "The first card swiped gains control."
 	name = "Personal Closet"
@@ -708,26 +615,6 @@
 /obj/secure_closet/personal/patient
 	name = "Patient's closet"
 
-/obj/secure_closet/security1
-	name = "Security Equipment"
-	req_access = list(access_security)
-
-/obj/secure_closet/security2
-	name = "Forensics Locker"
-	req_access = list(access_forensics_lockers)
-
-/obj/secure_closet/scientist
-	name = "Scientist Locker"
-
-	req_access = list(access_tox_storage)
-/obj/secure_closet/chemtoxin
-	name = "Chemistry Locker"
-
-	req_access = list(access_medical)
-/obj/secure_closet/bar
-	name = "Booze"
-	req_access = list(access_bar)
-
 /obj/secure_closet/kitchen
 	name = "Kitchen Cabinet"
 	req_access = list(access_kitchen)
@@ -763,22 +650,6 @@
 	icon_off = "fridge1"
 	req_access = list(access_heads_vault)
 
-/obj/secure_closet/engineering_chief
-	name = "Chief Engineer's Locker"
-	req_access = list(access_ce)
-
-/obj/secure_closet/engineering_electrical
-	name = "Electrical Supplies"
-	req_access = list(access_engine)
-
-/obj/secure_closet/engineering_welding
-	name = "Welding Supplies"
-	req_access = list(access_engine)
-
-/obj/secure_closet/engineering_personal
-	name = "Engineer's Locker"
-	req_access = list(access_engine)
-
 /obj/secure_closet/wall
 	name = "wall locker"
 	req_access = list(access_security)

code/defines/obj/clothing/jumpsuit.dm

@@ -16,7 +16,7 @@
 		3 = Report location
 		*/
 
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 // Colors
 
@@ -91,7 +91,7 @@
 	item_state = "w_suit"
 	color = "white"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/color/yellow
 	name = "Yellow Jumpsuit"
@@ -129,7 +129,7 @@
 	icon_state = "engine"
 	item_state = "y_suit"
 	color = "engine"
-	armor = list(melee = 0, bullet = 0, laser = 10, taser = 2, bomb = 0, bio = 0, rad = 10)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 10)
 
 /obj/item/clothing/under/rank/forensic_technician
 	desc = "It has a Forensics rank stripe on it."
@@ -144,7 +144,7 @@
 	icon_state = "darkred"
 	item_state = "r_suit"
 	color = "darkred"
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/security
 	name = "Security Jumpsuit"
@@ -152,7 +152,7 @@
 	icon_state = "red"
 	item_state = "r_suit"
 	color = "red"
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/vice
 	name = "Vice officer Jumpsuit"
@@ -160,7 +160,7 @@
 	icon_state = "vice"
 	item_state = "gy_suit"
 	color = "vice"
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/geneticist
 	desc = "Made of a special fiber that gives special protection against biohazards. Has a genetics rank stripe on it."
@@ -169,7 +169,7 @@
 	item_state = "w_suit"
 	color = "geneticswhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/chemist
 	desc = "Made of a special fiber that gives special protection against biohazards. Has a chemist rank stripe on it."
@@ -178,7 +178,7 @@
 	item_state = "w_suit"
 	color = "geneticswhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/head_of_personnel
 	desc = "It has a Head of Personnel rank stripe on it."
@@ -221,7 +221,7 @@
 	icon_state = "hos"
 	item_state = "r_suit"
 	color = "hosred"
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/chief_engineer
 	desc = "It has a Chief Engineer rank stripe on it."
@@ -229,7 +229,7 @@
 	icon_state = "chiefengineer"
 	item_state = "g_suit"
 	color = "chief"
-	armor = list(melee = 0, bullet = 0, laser = 10, taser = 2, bomb = 0, bio = 0, rad = 10)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 10)
 
 /obj/item/clothing/under/rank/research_director
 	desc = "It has a Research Director rank stripe on it."
@@ -237,14 +237,14 @@
 	icon_state = "director"
 	item_state = "g_suit"
 	color = "director"
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 10)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/janitor
 	desc = "Official clothing of the station's poopscooper. It has a janitor rank stripe on it"
 	name = "Janitor's Jumpsuit"
 	icon_state = "janitor"
 	color = "janitor"
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/scientist
 	desc = "Made of a special fiber that gives special protection against biohazards. Has a toxins rank stripe on it."
@@ -253,7 +253,7 @@
 	item_state = "w_suit"
 	color = "toxinswhite"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 10, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 10, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/medical
 	desc = "Made of a special fiber that gives special protection against biohazards. It has a medical rank stripe on it."
@@ -262,7 +262,7 @@
 	item_state = "w_suit"
 	color = "medical"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/chief_medical_officer
 	desc = "Made of a special fiber that gives special protection against biohazards. Has a Chief Medical Officer rank stripe on it."
@@ -280,7 +280,7 @@
 	item_state = "g_suit"
 	color = "hydroponics"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/cargo
 	name = "Quartermaster's Jumpsuit"
@@ -337,7 +337,7 @@
 	item_state = "w_suit"
 	color = "genetics_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/chemist_new
 	desc = "Made of a special fiber that gives special protection against biohazards."
@@ -346,7 +346,7 @@
 	item_state = "w_suit"
 	color = "chemist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/rank/scientist_new
 	desc = "Made of a special fiber that gives special protection against biohazards and small explosions."
@@ -355,7 +355,7 @@
 	item_state = "w_suit"
 	color = "scientist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 10, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 10, bio = 0, rad = 0)
 
 /obj/item/clothing/under/rank/virologist_new
 	desc = "Made of a special fiber that gives increased protection against biohazards."
@@ -364,7 +364,7 @@
 	item_state = "w_suit"
 	color = "virologist_new"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 15, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 
 // OTHER NONRANKED STATION JOBS
@@ -374,7 +374,7 @@
 	icon_state = "detective"
 	item_state = "det"
 	color = "detective"
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/scratch
 	name = "White Suit"
@@ -398,7 +398,7 @@
 	item_state = "bl_suit"
 	color = "syndicate"
 	has_sensor = 0
-	armor = list(melee = 10, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 0, rad = 0)
+	armor = list(melee = 10, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/syndicate/tacticool
 	name = "Tacticool Turtleneck"
@@ -406,7 +406,7 @@
 	icon_state = "tactifool"
 	item_state = "bl_suit"
 	color = "tactifool"
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/under/syndicate/combat
 	name = "Combat Turtleneck"
@@ -489,7 +489,7 @@
 	item_state = "nursesuit"
 	color = "nursesuit"
 	permeability_coefficient = 0.50
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 10, rad = 0)
 
 /obj/item/clothing/under/acj
 	name = "Administrative Cybernetic Jumpsuit"

code/defines/obj/clothing/suit.dm

@@ -6,7 +6,7 @@
 	var/fire_resist = T0C+100
 	flags = FPRINT | TABLEPASS
 	var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
-	armor = list(melee = 0, bullet = 0, laser = 0, taser = 2, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/bomb_suit
 	name = "bomb suit"
@@ -39,7 +39,7 @@
 	heat_transfer_coefficient = 0.30
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	slowdown = 1.3
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 100, rad = 20)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 100, rad = 20)
 
 /obj/item/clothing/suit/bio_suit/general
 	icon_state = "bio_general"
@@ -96,7 +96,7 @@
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 50, rad = 5)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 50, rad = 5)
 
 /obj/item/clothing/suit/labcoat/cmo
 	name = "chief medical officer's labcoat"
@@ -104,7 +104,7 @@
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
 	icon_state = "labcoat_cmo_open"
 	item_state = "labcoat_cmo"
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 55, rad = 5)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 55, rad = 5)
 
 /obj/item/clothing/suit/labcoat/mad
 	name = "The Mad's labcoat"
@@ -130,7 +130,7 @@
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
 	icon_state = "labcoat_vir_open"
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 55, rad = 5)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 55, rad = 5)
 
 /obj/item/clothing/suit/labcoat/science
 	name = "Scientist Labcoat"
@@ -212,7 +212,7 @@
 	icon_state = "wizard-fake"
 	item_state = "wizrobe"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //It's not magic, shit is reasonable. --NEO
-	armor = list(melee = 5, bullet = 0, laser = 5, taser = 5, bomb = 5, bio = 5, rad = 5)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/wizrobe/marisa
 	name = "Witch Robe"
@@ -362,8 +362,8 @@
 	icon_state = "riot"
 	item_state = "swat_suit"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
-	slowdown = 2.5
-	armor = list(melee = 82, bullet = 5, laser = 2, taser = 2, bomb = 5, bio = 0, rad = 0)
+	slowdown = 1
+	armor = list(melee = 80, bullet = 5, laser = 5, taser = 0, bomb = 5, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/bulletproof
 	name = "Bulletproof Vest"
@@ -415,7 +415,7 @@
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
 	slowdown = 1.3
-	armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 60, rad = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 60, rad = 100)
 
 /obj/item/clothing/suit/fire/heavy
 	name = "firesuit"
@@ -477,7 +477,7 @@
 	icon_state = "chickensuit"
 	item_state = "chickensuit"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HEAD
-	armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 5, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/monkeysuit
 	name = "Monkey Suit"
@@ -485,7 +485,7 @@
 	icon_state = "monkeysuit"
 	item_state = "monkeysuit"
 	body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HANDS
-	armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
+	armor = list(melee = 5, bullet = 0, laser = 0, taser = 0, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/holidaypriest
 	name = "Holiday Priest"

code/defines/obj/computer.dm

@@ -5,12 +5,6 @@
 	anchored = 1.0
 	var/obj/item/weapon/circuitboard/circuit = null //if circuit==null, computer can't disassemble
 
-/*
-/obj/machinery/computer/airtunnel
-	name = "Air Tunnel Control"
-	icon = 'airtunnelcomputer.dmi'
-	icon_state = "console00"
-*/
 
 /obj/machinery/computer/operating
 	name = "Operating Computer"
@@ -18,15 +12,10 @@
 	anchored = 1.0
 	icon_state = "operating"
 	circuit = "/obj/item/weapon/circuitboard/operating"
-
 	var/mob/living/carbon/human/victim = null
-
 	var/obj/machinery/optable/table = null
 	var/id = 0.0
 
-/*
- *	Arcade -- An arcade cabinet.
- */
 
 /obj/machinery/computer/arcade
 	name = "arcade machine"
@@ -43,41 +32,46 @@
 	var/gameover = 0
 	var/blocked = 0 //Player cannot attack/heal while set
 
+
 /obj/machinery/computer/aiupload
 	name = "AI Upload"
-	desc = "It is said that you can upload silly laws to AI's with this."
+	desc = "Used to upload laws to the AI."
 	icon_state = "command"
 	circuit = "/obj/item/weapon/circuitboard/aiupload"
 	var/mob/living/silicon/ai/current = null
 	var/opened = 0
 
+
 /obj/machinery/computer/borgupload
 	name = "Cyborg Upload"
-	desc = "Used for uploading responsible laws to Cyborg. Right..."
+	desc = "Used to upload laws to Cyborgs."
 	icon_state = "command"
 	circuit = "/obj/item/weapon/circuitboard/borgupload"
 	var/mob/living/silicon/robot/current = null
 
-/obj/machinery/computer/atmosphere
-	name = "atmos"
-	desc = "A computer for Atmospherics."
 
 /obj/machinery/computer/station_alert
 	name = "Station Alert Computer"
-	desc = "Alert. Alert. ALERT!!!"
+	desc = "Used to access the station's automated alert system."
 	icon_state = "alert:0"
 	circuit = "/obj/item/weapon/circuitboard/stationalert"
 	var/alarms = list("Fire"=list(), "Atmosphere"=list(), "Power"=list())
 
+
 /obj/machinery/computer/atmos_alert
 	name = "Atmospheric Alert Computer"
-	desc = "Used to detect where they messed up this time."
+	desc = "Used to access the station's atmospheric sensors."
 	icon_state = "alert:0"
 	var/list/priority_alarms = list()
 	var/list/minor_alarms = list()
 	var/receive_frequency = 1437
 
 
+/obj/machinery/computer/atmosphere
+	name = "atmos"
+	desc = "A computer for Atmospherics."
+
+
 /obj/machinery/computer/atmosphere/siphonswitch
 	name = "Area Air Control"
 	desc = "Nanotrasen provided this, barely."
@@ -85,12 +79,14 @@
 	var/otherarea
 	var/area/area
 
+
 /obj/machinery/computer/atmosphere/siphonswitch/mastersiphonswitch
 	name = "Master Air Control"
 
+
 /obj/machinery/computer/card
 	name = "Identification Computer"
-	desc = "You can use this to change ID's. YOU ARE GOD!"
+	desc = "You can use this to change ID's."
 	icon_state = "id"
 	circuit = "/obj/item/weapon/circuitboard/card"
 	var/obj/item/weapon/card/id/scan = null
@@ -100,29 +96,13 @@
 	var/printing = null
 	req_access = list(access_change_ids)
 
-//ID changing computer for CentCom.
+
 /obj/machinery/computer/card/centcom
 	name = "CentCom Identification Computer"
-	desc = "You are the Gods's God."
 	circuit = "/obj/item/weapon/circuitboard/card/centcom"
 	req_access = list(access_cent_captain)
 
 
-/obj/machinery/computer/data
-	name = "data"
-	icon_state = "aiupload"
-
-	var/list/topics = list(  )
-
-/obj/machinery/computer/data/weapon
-	name = "weapon"
-
-/obj/machinery/computer/data/weapon/info
-	name = "Research Computer"
-
-/obj/machinery/computer/data/weapon/log
-	name = "Log Computer"
-
 /obj/machinery/computer/dna
 	name = "DNA operations computer"
 	desc = "A Computer used to advanced DNA stuff."
@@ -133,6 +113,7 @@
 	var/mode = null
 	var/temp = null
 
+
 /obj/machinery/computer/hologram_comp
 	name = "Hologram Computer"
 	desc = "Rumoured to control holograms."
@@ -145,6 +126,7 @@
 	var/h_g = 245.0
 	var/h_b = 245.0
 
+
 /obj/machinery/computer/med_data
 	name = "Medical Records"
 	desc = "This can be used to check medical records."
@@ -161,11 +143,13 @@
 	var/temp = null
 	var/printing = null
 
+
 /obj/machinery/computer/med_data/laptop
 	name = "Medical Laptop"
 	desc = "Cheap Nanotrasen Laptop."
 	icon_state = "medlaptop"
 
+
 /obj/machinery/computer/pod
 	name = "Pod Launch Control"
 	desc = "A controll for launching pods. Some people prefer firing Mechas."
@@ -175,19 +159,108 @@
 	var/timing = 0.0
 	var/time = 30.0
 
+
 /obj/machinery/computer/pod/old
 	icon_state = "old"
 	name = "DoorMex Control Computer"
 
+
 /obj/machinery/computer/pod/old/syndicate
 	name = "ProComp Executive IIc"
 	desc = "The Syndicate operate on a tight budget. Operates external airlocks."
 
+
 /obj/machinery/computer/pod/old/swf
 	name = "Magix System IV"
 	desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition"
 
-/*/obj/machinery/computer/scan_consolenew    //Coming Soon
+
+/obj/machinery/computer/secure_data
+	name = "Security Records"
+	desc = "Used to view and edit personnel's security records"
+	icon_state = "security"
+	req_access = list(access_security)
+	circuit = "/obj/item/weapon/circuitboard/secure_data"
+	var/obj/item/weapon/card/id/scan = null
+	var/authenticated = null
+	var/rank = null
+	var/screen = null
+	var/datum/data/record/active1 = null
+	var/datum/data/record/active2 = null
+	var/a_id = null
+	var/temp = null
+	var/printing = null
+	var/can_change_id = 0
+
+
+/obj/machinery/computer/secure_data/detective_computer
+	icon = 'computer.dmi'
+	icon_state = "messyfiles"
+
+
+/obj/machinery/computer/security
+	name = "Security Cameras"
+	desc = "Used to access the various cameras on the station."
+	icon_state = "cameras"
+	circuit = "/obj/item/weapon/circuitboard/security"
+	var/obj/machinery/camera/current = null
+	var/last_pic = 1.0
+	var/network = "SS13"
+	var/maplevel = 1
+
+
+/obj/machinery/computer/security/telescreen
+	name = "Telescreen"
+	desc = "Used for watching an empty arena."
+	icon = 'stationobjs.dmi'
+	icon_state = "telescreen"
+	network = "thunder"
+	density = 0
+	circuit = null
+
+
+/obj/machinery/computer/security/wooden_tv
+	name = "Security Cameras"
+	desc = "An old TV hooked into the stations camera network."
+	icon_state = "security_det"
+
+
+/obj/machinery/computer/security/mining
+	name = "Outpost Cameras"
+	desc = "Used to access the various cameras on the outpost."
+	icon_state = "miningcameras"
+	network = "MINE"
+	circuit = "/obj/item/weapon/circuitboard/mining"
+
+
+/obj/machinery/computer/crew
+	name = "Crew monitoring computer"
+	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
+	icon_state = "crew"
+	use_power = 1
+	idle_power_usage = 250
+	active_power_usage = 500
+	circuit = "/obj/item/weapon/circuitboard/crew"
+	var/list/tracked =	list(  )
+
+
+/obj/machinery/computer/robotics
+	name = "Robotics Control"
+	desc = "Used to remotely lockdown or detonate linked Cyborgs."
+	icon = 'computer.dmi'
+	icon_state = "robot"
+	req_access = list(access_robotics)
+	circuit = "/obj/item/weapon/circuitboard/robotics"
+
+	var/id = 0.0
+	var/temp = null
+	var/status = 0
+	var/timeleft = 60
+	var/stop = 0.0
+	var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
+
+
+/*/obj/machinery/computer/scan_consolenew    //Coming Soon, I highly doubt this but Ill leave it here anyways
 	name = "DNA Modifier Access Console"
 	desc = "Scand DNA."
 	icon = 'computer.dmi'
@@ -224,101 +297,3 @@
 	use_power = 1
 	idle_power_usage = 10
 	active_power_usage = 400 */
-
-/obj/machinery/computer/secure_data
-	name = "Security Records"
-	desc = "Beepsky. ARREST!!!"
-	icon_state = "security"
-	req_access = list(access_security)
-	circuit = "/obj/item/weapon/circuitboard/secure_data"
-	var/obj/item/weapon/card/id/scan = null
-	var/authenticated = null
-	var/rank = null
-	var/screen = null
-	var/datum/data/record/active1 = null
-	var/datum/data/record/active2 = null
-	var/a_id = null
-	var/temp = null
-	var/printing = null
-	var/can_change_id = 0
-
-/obj/machinery/computer/secure_data/detective_computer
-	icon = 'computer.dmi'
-	icon_state = "messyfiles"
-
-/obj/machinery/computer/security
-	name = "Security Cameras"
-	desc = "Better than Television."
-	icon_state = "cameras"
-	circuit = "/obj/item/weapon/circuitboard/security"
-	var/obj/machinery/camera/current = null
-	var/last_pic = 1.0
-	var/network = "SS13"
-	var/maplevel = 1
-
-/obj/machinery/computer/security/telescreen
-	name = "Telescreen"
-	desc = "Used for watching an empty arena."
-	icon = 'stationobjs.dmi'
-	icon_state = "telescreen"
-	network = "thunder"
-	density = 0
-	circuit = null
-
-/obj/machinery/computer/security/wooden_tv
-	name = "Security Cameras"
-	desc = "Nanotrasen gave the detective this for Noir feeling."
-	icon_state = "security_det"
-
-/obj/machinery/computer/security/mining
-	name = "Outpost Status Display"
-	desc = "It's better than reality TV."
-	icon_state = "miningcameras"
-	network = "MINE"
-	circuit = "/obj/item/weapon/circuitboard/mining"
-
-/obj/machinery/computer/shuttle
-	name = "Shuttle"
-	desc = "For shuttle controll."
-	icon_state = "shuttle"
-	var/auth_need = 3.0
-	var/list/authorized = list(  )
-
-/obj/machinery/computer/teleporter
-	name = "Teleporter"
-	desc = "Use this to set your destination...hopefully..."
-	icon_state = "teleport"
-	circuit = "/obj/item/weapon/circuitboard/teleporter"
-	var/obj/item/locked = null
-	var/id = null
-
-/obj/machinery/computer/teleporter/security
-	name = "Teleporter"
-	desc = "Use this to set your destination...hopefully..."
-	icon_state = "teleport"
-	locked = null
-	id = null
-
-/obj/machinery/computer/crew
-	name = "Crew monitoring computer"
-	icon_state = "crew"
-	use_power = 1
-	idle_power_usage = 250
-	active_power_usage = 500
-	circuit = "/obj/item/weapon/circuitboard/crew"
-	var/list/tracked =	list(  )
-
-/obj/machinery/computer/robotics
-	name = "Robotics Control"
-	icon = 'computer.dmi'
-	icon_state = "robot"
-	req_access = list(access_robotics)
-	circuit = "/obj/item/weapon/circuitboard/robotics"
-
-	var/id = 0.0
-	var/temp = null
-	var/status = 0
-	var/timeleft = 60
-	var/stop = 0.0
-	var/screen = 0 // 0 - Main Menu, 1 - Cyborg Status, 2 - Kill 'em All! -- In text
-

code/defines/obj/storage.dm

@@ -1,54 +1,3 @@
-/obj/item/weapon/storage/utilitybelt
-	name = "utility belt"
-	desc = "Can hold various tools."
-	icon = 'belts.dmi'
-	icon_state = "utilitybelt"
-	item_state = "utility"
-	can_hold = list(
-		"/obj/item/weapon/crowbar",
-		"/obj/item/weapon/screwdriver",
-		"/obj/item/weapon/weldingtool",
-		"/obj/item/weapon/wirecutters",
-		"/obj/item/weapon/wrench",
-		"/obj/item/device/multitool",
-		"/obj/item/device/flashlight",
-		"/obj/item/weapon/cable_coil",
-		"/obj/item/device/t_scanner",
-		"/obj/item/device/analyzer")
-	flags = FPRINT | TABLEPASS | ONBELT
-
-/obj/item/weapon/storage/utilitybelt/full/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/weapon/wirecutters(src)
-	new /obj/item/weapon/cable_coil(src,30,pick("red","yellow"))
-
-
-/obj/item/weapon/storage/utilitybelt/medical
-   name = "medical belt"
-   desc = "Can hold various medical equipment."
-   icon_state = "medicalbelt"
-   item_state = "medical"
-   can_hold = list(
-		"/obj/item/device/healthanalyzer",
-		"/obj/item/weapon/dnainjector",
-		"/obj/item/weapon/reagent_containers/dropper",
-		"/obj/item/weapon/reagent_containers/glass/beaker",
-		"/obj/item/weapon/reagent_containers/glass/bottle",
-		"/obj/item/weapon/reagent_containers/pill",
-		"/obj/item/weapon/reagent_containers/syringe",
-		"/obj/item/weapon/reagent_containers/glass/dispenser",
-		"/obj/item/weapon/zippo",
-		"/obj/item/weapon/cigpacket",
-		"/obj/item/weapon/storage/pill_bottle",
-		"/obj/item/stack/medical",
-		"/obj/item/device/flashlight/pen"
-	)
-   flags = FPRINT | TABLEPASS | ONBELT
-
 /obj/item/weapon/storage/backpack
 	name = "backpack"
 	desc = "You wear this on your back and put items into it."

code/defines/obj/supplypacks.dm

@@ -300,9 +300,9 @@
 
 /datum/supply_packs/mechanical
 	name = "Mechanical maintenance crate"
-	contains = list("/obj/item/weapon/storage/utilitybelt/full",
-					"/obj/item/weapon/storage/utilitybelt/full",
-					"/obj/item/weapon/storage/utilitybelt/full",
+	contains = list("/obj/item/weapon/storage/belt/utility/full",
+					"/obj/item/weapon/storage/belt/utility/full",
+					"/obj/item/weapon/storage/belt/utility/full",
 					"/obj/item/clothing/suit/hazardvest",
 					"/obj/item/clothing/suit/hazardvest",
 					"/obj/item/clothing/suit/hazardvest",