- Removed support for the ONBACK and ONBELT flags.

- Replaced them with a whole range of inventory slot flags. These now govern whether an item can or can't be placed in a certain inventory slot. See setup.dm for information on the flags. These flags only affect humans tho, as humans are the only beings with an inventory to talk of. - Standardized some gun code and some other pieces of code as I came accross them. I hate indented variable definitions! This commit should not bring any change whatsoever to the game from a player's perspective. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3659 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 18:32:03 +00:00 · 2012-05-25 07:38:36 +00:00
parent 82177ceceb
commit 18ccabb33a
56 changed files with 537 additions and 430 deletions
--- a/code/WorkInProgress/BS12/uplinks.dm
+++ b/code/WorkInProgress/BS12/uplinks.dm
@@ -316,7 +316,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/temp = null 			//Temporary storage area for a message offering the option to destroy the radio
 	var/selfdestruct = 0		//Set to 1 while the radio is self destructing itself.
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "radio"
 	throwforce = 5
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -286,6 +286,7 @@
 	var/hitsound = null
 	var/w_class = 3.0
 	flags = FPRINT | TABLEPASS
+	var/slot_flags = 0		//This is used to determine on which slots an item can fit.
 	pass_flags = PASSTABLE
 	pressure_resistance = 50
 //	causeerrorheresoifixthis
--- a/code/defines/obj/clothing/ears.dm
+++ b/code/defines/obj/clothing/ears.dm
@@ -4,6 +4,7 @@
 	name = "ears"
 	w_class = 1.0
 	throwforce = 2
+	slot_flags = SLOT_EARS

 /obj/item/clothing/ears/earmuffs
 	name = "earmuffs"
--- a/code/defines/obj/clothing/gloves.dm
+++ b/code/defines/obj/clothing/gloves.dm
@@ -12,6 +12,7 @@
 	var/wired = 0
 	var/obj/item/weapon/cell/cell = 0
 	body_parts_covered = HANDS
+	slot_flags = SLOT_GLOVES


 /obj/item/clothing/gloves/boxing
--- a/code/defines/obj/clothing/head.dm
+++ b/code/defines/obj/clothing/head.dm
@@ -4,6 +4,7 @@
 	icon = 'hats.dmi'
 	body_parts_covered = HEAD
 	var/list/allowed = list()
+	slot_flags = SLOT_HEAD

 /obj/item/clothing/head/cakehat
 	name = "cake-hat"
--- a/code/defines/obj/clothing/jumpsuit.dm
+++ b/code/defines/obj/clothing/jumpsuit.dm
@@ -8,6 +8,7 @@
 	heat_transfer_coefficient = 0.30
 	permeability_coefficient = 0.90
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
+	slot_flags = SLOT_ICLOTHING
 	var/has_sensor = 1//For the crew computer 2 = unable to change mode
 	var/sensor_mode = 0
 		/*
--- a/code/defines/obj/clothing/mask.dm
+++ b/code/defines/obj/clothing/mask.dm
@@ -7,7 +7,7 @@
 	icon = 'masks.dmi'
 	body_parts_covered = HEAD
 	armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 0, rad = 0)
-
+	slot_flags = SLOT_MASK

 /obj/item/clothing/mask/breath
 	desc = "A close-fitting mask that can be connected to an air supply."
--- a/code/defines/obj/clothing/shoes.dm
+++ b/code/defines/obj/clothing/shoes.dm
@@ -5,6 +5,7 @@
 	gender = PLURAL //Carn: for grammarically correct text-parsing

 	body_parts_covered = FEET
+	slot_flags = SLOT_FEET

 	protective_temperature = 500
 	heat_transfer_coefficient = 0.10
--- a/code/defines/obj/clothing/z_gimmick.dm
+++ b/code/defines/obj/clothing/z_gimmick.dm
@@ -296,7 +296,8 @@
 	icon = 'weapons.dmi'
 	icon_state = "baton"
 	item_state = "classic_baton"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 10

 /obj/item/clothing/under/pirate
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -1844,7 +1844,8 @@
 	name = "bottle of Plant-B-Gone"
 	icon_state = "plantbgone"
 	item_state = "plantbgone"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
 	throw_speed = 2
@@ -1858,7 +1859,8 @@
 	name = "weed-spray"
 	icon_state = "weedspray"
 	item_state = "spray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 4
 	w_class = 2.0
 	throw_speed = 2
@@ -1872,7 +1874,8 @@
 	name = "pest-spray"
 	icon_state = "pestspray"
 	item_state = "spray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 4
 	w_class = 2.0
 	throw_speed = 2
--- a/code/defines/obj/toy.dm
+++ b/code/defines/obj/toy.dm
@@ -129,7 +129,8 @@
 	icon = 'gun.dmi'
 	icon_state = "revolver"
 	item_state = "gun"
-	flags =  FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY
+	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BELT
 	w_class = 3.0
 	g_amt = 10
 	m_amt = 10
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -10,7 +10,8 @@
 	desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
 	icon = 'weapons.dmi'
 	icon_state = "riot"
-	flags = FPRINT | TABLEPASS| CONDUCT| ONBACK
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BACK
 	force = 5.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -29,7 +30,8 @@
 	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 | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 15
 	throw_speed = 1
 	throw_range = 4
@@ -41,7 +43,8 @@
 	desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
 	icon_state = "sord"
 	item_state = "sord"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 2
 	throwforce = 1
 	w_class = 3
@@ -51,7 +54,8 @@
 	desc = "What are you standing around staring at this for? Get to killing!"
 	icon_state = "claymore"
 	item_state = "claymore"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 40
 	throwforce = 10
 	w_class = 3
@@ -165,7 +169,8 @@
 	icon_state = "spectrometer"
 	item_state = "analyzer"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT | OPENCONTAINER
+	flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
@@ -187,7 +192,8 @@
 	desc = "A stun baton for hitting people with."
 	icon_state = "stunbaton"
 	item_state = "baton"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7
 	w_class = 3
@@ -201,7 +207,8 @@
 	desc = "The Captain is first and all other heads are last."
 	icon_state = "chainofcommand"
 	item_state = "chainofcommand"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 10
 	throwforce = 7
 	w_class = 3
@@ -483,6 +490,7 @@
 	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
@@ -547,7 +555,8 @@
 	throw_range = 5
 	m_amt = 50
 	g_amt = 20
-	flags = TABLEPASS|USEDELAY|FPRINT|CONDUCT | ONBELT
+	flags = TABLEPASS | USEDELAY | FPRINT | CONDUCT
+	slot_flags = SLOT_BELT
 	item_state = "coil_red"

 /obj/item/weapon/cable_coil/cut
@@ -576,7 +585,8 @@
 	desc = "Used to hit floors"
 	icon = 'items.dmi'
 	icon_state = "crowbar"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 5.0
 	throwforce = 7.0
 	item_state = "wrench"
@@ -734,7 +744,8 @@
 	gender = PLURAL
 	icon = 'items.dmi'
 	icon_state = "handcuff"
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	throwforce = 5
 	w_class = 2.0
 	throw_speed = 2
@@ -833,7 +844,8 @@
 	name = "banhammer"
 	icon = 'items.dmi'
 	icon_state = "toyhammer"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	throwforce = 0
 	w_class = 1.0
 	throw_speed = 7
@@ -841,12 +853,14 @@

 /obj/item/weapon/pen/sleepypen
 	desc = "It's a normal black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;biotech=1;syndicate=7"

 /obj/item/weapon/pen/paralysis
 	desc = "It's a normal black ink pen with a sharp point."
-	flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;biotech=1;syndicate=5"

 /obj/item/weapon/rack_parts
@@ -870,7 +884,8 @@
 	desc = "You can be totally screwwy with this."
 	icon = 'items.dmi'
 	icon_state = "screwdriver"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 5.0
 	w_class = 1.0
 	throwforce = 5.0
@@ -919,7 +934,8 @@
 	var/selfdestruct = 0.0
 	var/traitor_frequency = 0.0
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	item_state = "radio"
 	throwforce = 5
 	w_class = 2.0
--- a/code/game/asteroid/device.dm
+++ b/code/game/asteroid/device.dm
@@ -2,7 +2,8 @@
 	name = "GPS"
 	icon = 'device.dmi'
 	icon_state = "pinoff"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "electronic"
 	throw_speed = 4
--- a/code/game/chemistry.dm
+++ b/code/game/chemistry.dm
@@ -11,7 +11,8 @@
 	item_state = "flashbang"
 	throw_speed = 4
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | ONBELT | USEDELAY
+	flags = FPRINT | TABLEPASS | USEDELAY
+	slot_flags = SLOT_BELT
 	var/datum/effect/effect/system/bad_smoke_spread/smoke

 /obj/item/weapon/mustardbomb
@@ -25,7 +26,8 @@
 	item_state = "flashbang"
 	throw_speed = 4
 	throw_range = 20
-	flags =  FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags =  FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	var/datum/effect/effect/system/mustard_gas_spread/mustard_gas

 /obj/item/weapon/smokebomb/New()
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -3,7 +3,8 @@
 	desc = "An arcane weapon wielded by the followers of Nar-Sie"
 	icon_state = "cultblade"
 	item_state = "cultblade"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	force = 40
 	throwforce = 10

--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -2,7 +2,8 @@
 	name = "pinpointer"
 	icon = 'device.dmi'
 	icon_state = "pinoff"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "electronic"
 	throw_speed = 4
--- a/code/game/gamemodes/wizard/soulstone.dm
+++ b/code/game/gamemodes/wizard/soulstone.dm
@@ -5,7 +5,8 @@
 	item_state = "electronic"
 	desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power."
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	origin_tech = "bluespace=4;materials=4"
 	var/imprinted = "empty"

--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -8,7 +8,8 @@
 	icon_state = "pda"
 	item_state = "electronic"
 	w_class = 1.0
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_ID | SLOT_BELT

 	//Main variables
 	var/owner = null
--- a/code/game/objects/devices/aicard.dm
+++ b/code/game/objects/devices/aicard.dm
@@ -4,7 +4,8 @@
 	icon_state = "aicard" // aicard-full
 	item_state = "electronic"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	var/flush = null
 	origin_tech = "programming=4;materials=4"

--- a/code/game/objects/devices/chameleonproj.dm
+++ b/code/game/objects/devices/chameleonproj.dm
@@ -42,7 +42,8 @@
 /obj/item/device/chameleon
 	name = "chameleon-projector"
 	icon_state = "shield0"
-	flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY
+	slot_flags = SLOT_BELT
 	item_state = "electronic"
 	throwforce = 5.0
 	throw_speed = 1
--- a/code/game/objects/devices/flashlight.dm
+++ b/code/game/objects/devices/flashlight.dm
@@ -4,14 +4,14 @@
 	icon_state = "flight0"
 	w_class = 2
 	item_state = "flight"
-	flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	m_amt = 50
 	g_amt = 20
-	var
-		on = 0
-		brightness_on = 4 //luminosity when on
-		icon_on = "flight1"
-		icon_off = "flight0"
+	var/on = 0
+	var/brightness_on = 4 //luminosity when on
+	var/icon_on = "flight1"
+	var/icon_off = "flight0"

 /obj/item/device/flashlight/initialize()
 	..()
--- a/code/game/objects/devices/paicard.dm
+++ b/code/game/objects/devices/paicard.dm
@@ -4,7 +4,8 @@
 	icon_state = "pai"
 	item_state = "electronic"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	origin_tech = "programming=2"
 	var/obj/item/device/radio/radio
 	var/looking_for_personality = 0
--- a/code/game/objects/devices/scanners.dm
+++ b/code/game/objects/devices/scanners.dm
@@ -14,7 +14,8 @@ MASS SPECTROMETER
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
 	icon_state = "t-ray0"
 	var/on = 0
-	flags = FPRINT|ONBELT|TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	w_class = 2
 	item_state = "electronic"
 	m_amt = 150
@@ -64,7 +65,8 @@ MASS SPECTROMETER
 	icon_state = "health"
 	item_state = "analyzer"
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject."
-	flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 1.0
 	throw_speed = 5
@@ -146,7 +148,8 @@ MASS SPECTROMETER
 	icon_state = "atmos"
 	item_state = "analyzer"
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 20
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -94,7 +94,8 @@
 	w_class = 1
 	throwforce = 2
 	var/candlecount = 5
-	flags = ONBELT | TABLEPASS
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT


 /obj/item/weapon/candlepack/update_icon()
--- a/code/game/objects/items/robot_parts.dm
+++ b/code/game/objects/items/robot_parts.dm
@@ -3,7 +3,8 @@
 	icon = 'robot_parts.dmi'
 	item_state = "buildpipe"
 	icon_state = "blank"
-	flags = FPRINT | ONBELT | TABLEPASS | CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	var/construction_time = 100
 	var/list/construction_cost = list("metal"=20000,"glass"=5000)

--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -58,7 +58,8 @@
 	desc = "A heavy-duty, no fun allowed trash bag."
 	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/capacity = 25; //the number of trash it can carry.
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	w_class = 2.0

 /obj/item/weapon/trashbag/update_icon()
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -56,7 +56,8 @@ ZIPPO
 	icon_state = "matchbox"
 	item_state = "zippo"
 	w_class = 1
-	flags = ONBELT | TABLEPASS
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT
 	var/matchcount = 10
 	w_class = 1.0

@@ -328,9 +329,9 @@ ZIPPO
 	item_state = "cigpacket"
 	w_class = 1
 	throwforce = 2
-	flags = ONBELT | TABLEPASS
-	var
-		cigcount = 6
+	flags = TABLEPASS
+	slot_flags = SLOT_BELT
+	var/cigcount = 6


 	update_icon()
@@ -377,7 +378,8 @@ ZIPPO
 	var/icon_off = "lighter-g"
 	w_class = 1
 	throwforce = 4
-	flags = ONBELT | TABLEPASS | CONDUCT
+	flags = TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	var/lit = 0

 /obj/item/weapon/lighter/zippo
--- a/code/game/objects/items/weapons/grenades.dm
+++ b/code/game/objects/items/weapons/grenades.dm
@@ -14,15 +14,17 @@ FLASHBANG
 	item_state = "emp"
 	throw_speed = 4
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;magnets=3"
-	var
-		active = 0
-		det_time = 50
-	proc
-		prime()
-		clown_check(var/mob/living/user)
+	var/active = 0
+	var/det_time = 50

+	proc/prime()
+		return
+
+	proc/clown_check(var/mob/living/user)
+		return

 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
 		if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container
@@ -88,17 +90,21 @@ FLASHBANG
 	item_state = "flashbang"
 	throw_speed = 4
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;combat=1"
-	var
-		active = 0
-		det_time = 30
-		banglet = 0
-	proc
-		bang(var/turf/T , var/mob/living/carbon/M)
-		prime()
-		clown_check(var/mob/living/user)
+	var/active = 0
+	var/det_time = 30
+	var/banglet = 0

+	proc/bang(var/turf/T , var/mob/living/carbon/M)
+		return
+
+	proc/prime()
+		return
+
+	proc/clown_check(var/mob/living/user)
+		return

 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if (isscrewdriver(W))
--- a/code/game/objects/items/weapons/mops_cleaners.dm
+++ b/code/game/objects/items/weapons/mops_cleaners.dm
@@ -4,7 +4,8 @@
 	name = "space cleaner"
 	icon_state = "cleaner"
 	item_state = "cleaner"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
 	throw_speed = 2
@@ -101,7 +102,8 @@
 	name = "chem sprayer"
 	icon_state = "chemsprayer"
 	item_state = "chemsprayer"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 3.0
 	throw_speed = 2
@@ -203,7 +205,8 @@
 	name = "pepperspray"
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
-	flags = ONBELT|TABLEPASS|FPRINT|USEDELAY
+	flags = TABLEPASS|FPRINT|USEDELAY
+	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
 	throw_speed = 2
--- a/code/game/objects/items/weapons/plant_bag.dm
+++ b/code/game/objects/items/weapons/plant_bag.dm
@@ -7,7 +7,8 @@
 	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 | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	w_class = 1

 /obj/item/weapon/plantbag/attack_self(mob/user as mob)
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -13,7 +13,8 @@ WELDINGTOOOL
 	desc = "A wrench with common uses. Can be found in your hand."
 	icon = 'items.dmi'
 	icon_state = "wrench"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 5.0
 	throwforce = 7.0
 	w_class = 2.0
@@ -44,7 +45,8 @@ WELDINGTOOOL
 	name = "Welding Tool"
 	icon = 'items.dmi'
 	icon_state = "welder"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -288,7 +290,8 @@ WELDINGTOOOL
 	desc = "This cuts wires."
 	icon = 'items.dmi'
 	icon_state = "cutters"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 6.0
 	throw_speed = 2
 	throw_range = 9
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -93,7 +93,7 @@
 	desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
 	force = 5
 	w_class = 4.0
-	flags = ONBACK
+	slot_flags = SLOT_BACK
 	force_unwielded = 5
 	force_wielded = 18

--- a/code/game/objects/new_year.dm
+++ b/code/game/objects/new_year.dm
@@ -55,7 +55,8 @@
 	item_state = "flashbang"
 	throw_speed = 4
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT

 /obj/item/weapon/firbang/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
 	if (user.equipped() == src)
--- a/code/game/objects/radio/headset.dm
+++ b/code/game/objects/radio/headset.dm
@@ -8,6 +8,7 @@
 	subspace_transmission = 1
 	canhear_range = 1 // can't hear headsets from very far away

+	slot_flags = SLOT_EARS
 	var/protective_temperature = 0
 	var/translate_binary = 0
 	var/translate_hive = 0
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -4,7 +4,8 @@
 	icon = 'belts.dmi'
 	icon_state = "utilitybelt"
 	item_state = "utility"
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT


 	proc/can_use()
--- a/code/game/objects/tank.dm
+++ b/code/game/objects/tank.dm
@@ -5,7 +5,8 @@

 	var/datum/gas_mixture/air_contents = null
 	var/distribute_pressure = ONE_ATMOSPHERE
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBACK
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BACK

 	pressure_resistance = ONE_ATMOSPHERE*5

--- a/code/game/objects/tanks/emergency.dm
+++ b/code/game/objects/tanks/emergency.dm
@@ -2,7 +2,8 @@
 	name = "emergency oxygen tank"
 	desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
 	icon_state = "emergency"
-	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	w_class = 2.0
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -22,7 +22,8 @@
 	var/affected_area = 3
 	throw_speed = 4
 	throw_range = 20
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY
+	flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BELT
 	New()
 		var/datum/reagents/R = new/datum/reagents(1000)
 		reagents = R
@@ -1227,7 +1228,8 @@
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = null
-	flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT

 /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob)
 	return src.attack_hand(user)
--- a/code/modules/clothing/glasses.dm
+++ b/code/modules/clothing/glasses.dm
@@ -3,10 +3,10 @@
 	icon = 'glasses.dmi'
 	w_class = 2.0
 	flags = GLASSESCOVERSEYES
-	var
-		vision_flags = 0
-		darkness_view = 0//Base human is 2
-		invisa_view = 0
+	slot_flags = SLOT_EYES
+	var/vision_flags = 0
+	var/darkness_view = 0//Base human is 2
+	var/invisa_view = 0

 /*
 SEE_SELF  // can see self, no matter what
--- a/code/modules/clothing/suit.dm
+++ b/code/modules/clothing/suit.dm
@@ -5,3 +5,4 @@
 	flags = FPRINT | TABLEPASS | ONESIZEFITSALL
 	var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	slot_flags = SLOT_OCLOTHING
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -157,7 +157,8 @@ proc/move_mining_shuttle()
 	name = "Miner's pickaxe"
 	icon = 'items.dmi'
 	icon_state = "pickaxe"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 15.0
 	throwforce = 4.0
 	item_state = "pickaxe"
@@ -241,7 +242,8 @@ proc/move_mining_shuttle()
 	name = "Shovel"
 	icon = 'items.dmi'
 	icon_state = "shovel"
-	flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS| CONDUCT
+	slot_flags = SLOT_BELT
 	force = 8.0
 	throwforce = 4.0
 	item_state = "shovel"
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -6,7 +6,8 @@
 	name = "Mining Satchel"
 	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/capacity = 50; //the number of ore pieces it can carry.
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	w_class = 1

 /obj/item/weapon/satchel/attack_self(mob/user as mob)
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -454,7 +454,7 @@
 				return
 			if (!istype(W, /obj/item))
 				return
-			if (!( W.flags & ONBACK ))
+			if (!( W.slot_flags & SLOT_BACK ))
 				return
 			if(istype(W,/obj/item/weapon/twohanded) && W:wielded)
 				usr << "<span class='warning'>Unwield the [initial(W.name)] first!</span>"
@@ -478,7 +478,9 @@
 				if (emptyHand)
 					wear_suit.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/suit) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_OCLOTHING ))
 				return
 			if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
 				src << "\red You're too fat to wear the [W.name]!"
@@ -491,7 +493,9 @@
 				if (emptyHand)
 					gloves.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/gloves) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_GLOVES ))
 				return
 			u_equip(W)
 			gloves = W
@@ -501,7 +505,9 @@
 				if (emptyHand)
 					shoes.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/shoes) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_FEET ))
 				return
 			u_equip(W)
 			shoes = W
@@ -511,7 +517,9 @@
 				if (emptyHand)
 					belt.DblClick()
 				return
-			if (!W || !W.flags || !( W.flags & ONBELT ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_BELT ))
 				return
 			u_equip(W)
 			belt = W
@@ -521,7 +529,9 @@
 				if (emptyHand)
 					glasses.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/glasses) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_EYES ))
 				return
 			u_equip(W)
 			glasses = W
@@ -531,10 +541,9 @@
 				if (emptyHand)
 					head.DblClick()
 				return
-			if (( istype(W, /obj/item/weapon/paper) ))
-				u_equip(W)
-				head = W
-			else if (!( istype(W, /obj/item/clothing/head) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_HEAD ))
 				return
 			u_equip(W)
 			head = W
@@ -550,7 +559,9 @@
 				if (emptyHand)
 					ears.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/ears) ) && !( istype(W, /obj/item/device/radio/headset) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_EARS ))
 				return
 			u_equip(W)
 			ears = W
@@ -560,7 +571,9 @@
 				if (emptyHand)
 					w_uniform.DblClick()
 				return
-			if (!( istype(W, /obj/item/clothing/under) ))
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_ICLOTHING ))
 				return
 			if (mutations & FAT && !(W.flags & ONESIZEFITSALL))
 				src << "\red You're too fat to wear the [W.name]!"
@@ -575,7 +588,9 @@
 				return
 			if (!w_uniform)
 				return
-			if (!istype(W, /obj/item/weapon/card/id) && !istype(W, /obj/item/device/pda) )
+			if (!istype(W, /obj/item))
+				return
+			if (!( W.slot_flags & SLOT_ID ))
 				return
 			u_equip(W)
 			wear_id = W
@@ -585,8 +600,11 @@
 				if (emptyHand)
 					l_store.DblClick()
 				return
-			if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform )))
+			if (!istype(W, /obj/item))
 				return
+			if ( ( W.slot_flags & SLOT_DENYPOCKET ) )
+				return
+			if ( W.w_class <= 2 || ( W.slot_flags & SLOT_POCKET ) )
 				u_equip(W)
 				l_store = W
 		if("storage2")
@@ -594,8 +612,11 @@
 				if (emptyHand)
 					r_store.DblClick()
 				return
-			if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform )))
+			if (!istype(W, /obj/item))
 				return
+			if ( ( W.slot_flags & SLOT_DENYPOCKET ) )
+				return
+			if ( W.w_class <= 2 || ( W.slot_flags & SLOT_POCKET ) )
 				u_equip(W)
 				r_store = W
 		if("suit storage")
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -9,7 +9,8 @@
 	throw_range = 10
 	var/obj/item/weapon/pen/haspen		//The stored pen.
 	var/obj/item/weapon/paper/toppaper	//The topmost piece of paper.
-	flags = FPRINT | TABLEPASS | ONBELT
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT
 	pressure_resistance = 10

 /obj/item/weapon/clipboard/New()
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -9,25 +9,24 @@
 	throw_range = 15
 	layer = 4
 	pressure_resistance = 1
+	slot_flags = SLOT_HEAD

-	var
-		info	//What's actually written on the paper.
-		info_links //A different version of the paper which includes html links at fields and EOF
-		stamps	//The (text for the) stamps on the paper.
-		fields  //Amount of user created fields
-		list/stamped
-		see_face = 1
-		body_parts_covered = HEAD
-		protective_temperature = 0
-		rigged = 0
-		spam_flag = 0
+	var/info	//What's actually written on the paper.
+	var/info_links //A different version of the paper which includes html links at fields and EOF
+	var/stamps	//The (text for the) stamps on the paper.
+	var/fields  //Amount of user created fields
+	var/list/stamped
+	var/see_face = 1
+	var/body_parts_covered = HEAD
+	var/protective_temperature = 0
+	var/rigged = 0
+	var/spam_flag = 0

-		const
-			deffont = "Verdana"
-			signfont = "Times New Roman"
-			crayonfont = "Comic Sans MS"
+	var/const/deffont = "Verdana"
+	var/const/signfont = "Times New Roman"
+	var/const/crayonfont = "Comic Sans MS"

-	New()
+/obj/item/weapon/paper/New()
 	..()
 	src.pixel_y = rand(-8, 8)
 	src.pixel_x = rand(-9, 9)
@@ -37,12 +36,12 @@
 		updateinfolinks()
 		return

-	update_icon()
+/obj/item/weapon/paper/update_icon()
 	if(src.info)
 		src.overlays += "paper_words"
 	return

-	examine()
+/obj/item/weapon/paper/examine()
 	set src in oview(1)

 //	..()	//We don't want them to see the dumb "this is a paper" thing every time.
@@ -54,13 +53,12 @@
 		onclose(usr, "[name]")
 	return

-	verb/rename()
+/obj/item/weapon/paper/verb/rename()
 	set name = "Rename paper"
 	set category = "Object"
 	set src in usr

-		if ((usr.mutations & CLUMSY) && prob(50))
-			usr << "\red You cut yourself on the paper."
+	if ((usr.mutations & CLUMSY) && prob(50))usr << "\red You cut yourself on the paper."
 		return
 	var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", null)  as text),1,MAX_NAME_LEN)
 	if ((loc == usr && usr.stat == 0))
@@ -68,7 +66,7 @@
 	add_fingerprint(usr)
 	return

-	attack_self(mob/living/user as mob)
+/obj/item/weapon/paper/attack_self(mob/living/user as mob)
 	examine()
 	if(rigged && (Holiday == "April Fool's Day"))
 		if(spam_flag == 0)
@@ -78,7 +76,7 @@
 				spam_flag = 0
 	return

-	attack_ai(var/mob/living/silicon/ai/user as mob)
+/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
 	var/dist
 	if (istype(user) && user.current) //is AI
 		dist = get_dist(src, user.current)
@@ -92,8 +90,7 @@
 		onclose(usr, "[name]")
 	return

-	proc
-		addtofield(var/id, var/text, var/links = 0)
+/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0)
 	var/locid = 0
 	var/laststart = 1
 	var/textindex = 1
@@ -130,14 +127,14 @@
 		info = before + text + after
 		updateinfolinks()

-		updateinfolinks()
+/obj/item/weapon/paper/proc/updateinfolinks()
 	info_links = info
 	var/i = 0
 	for(i=1,i<=fields,i++)
 		addtofield(i, "<font face=\"[deffont]\"><A href='?src=\ref[src];write=[i]'>write</A></font>", 1)
 	info_links = info_links + "<font face=\"[deffont]\"><A href='?src=\ref[src];write=end'>write</A></font>"

-		parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
+/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
 	t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)

 	t = dd_replacetext(t, "\[center\]", "<center>")
@@ -184,7 +181,7 @@

 	return t

-		openhelp(mob/user as mob)
+/obj/item/weapon/paper/proc/openhelp(mob/user as mob)
 	user << browse({"<HTML><HEAD><TITLE>Pen Help</TITLE></HEAD>
 	<BODY>
 		<b><center>Crayon&Pen commands</center></b><br>
@@ -206,7 +203,7 @@
 	</BODY></HTML>"}, "window=paper_help")


-	Topic(href, href_list)
+/obj/item/weapon/paper/Topic(href, href_list)
 	..()
 	if ((usr.stat || usr.restrained()))
 		return
@@ -239,7 +236,7 @@
 		if(!overlays.Find("paper_words"))
 			overlays += "paper_words"

-	attackby(obj/item/weapon/P as obj, mob/user as mob)
+/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob)
 	..()
 	var/clown = 0
 	if(user.mind && (user.mind.assigned_role == "Clown"))
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -3,7 +3,8 @@
 	name = "pen"
 	icon = 'bureaucracy.dmi'
 	icon_state = "pen"
-	flags = FPRINT | ONBELT | TABLEPASS
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT | SLOT_EARS
 	throwforce = 0
 	w_class = 1.0
 	throw_speed = 7
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -3,13 +3,13 @@
 	desc = "A bullet casing."
 	icon = 'ammo.dmi'
 	icon_state = "s-casing"
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	throwforce = 1
 	w_class = 1.0
-	var
-		caliber = ""							//Which kind of guns it can be loaded into
-		projectile_type = ""//The bullet type to create when New() is called
-		obj/item/projectile/BB = null 			//The loaded bullet
+	var/caliber = ""							//Which kind of guns it can be loaded into
+	var/projectile_type = ""//The bullet type to create when New() is called
+	var/obj/item/projectile/BB = null 			//The loaded bullet


 	New()
@@ -28,18 +28,18 @@
 	desc = "A box of ammo"
 	icon_state = "357"
 	icon = 'ammo.dmi'
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	item_state = "syringe_kit"
 	m_amt = 50000
 	throwforce = 2
 	w_class = 1.0
 	throw_speed = 4
 	throw_range = 10
-	var
-		list/stored_ammo = list()
-		ammo_type = "/obj/item/ammo_casing"
-		max_ammo = 7
-		multiple_sprites = 0
+	var/list/stored_ammo = list()
+	var/ammo_type = "/obj/item/ammo_casing"
+	var/max_ammo = 7
+	var/multiple_sprites = 0


 	New()
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -4,7 +4,8 @@
 	icon = 'gun.dmi'
 	icon_state = "detective"
 	item_state = "gun"
-	flags =  FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY
+	flags =  FPRINT | TABLEPASS | CONDUCT |  USEDELAY
+	slot_flags = SLOT_BELT
 	m_amt = 2000
 	w_class = 3.0
 	throwforce = 5
@@ -13,17 +14,19 @@
 	force = 5.0
 	origin_tech = "combat=1"

-	var
-		fire_sound = 'Gunshot.ogg'
-		obj/item/projectile/in_chamber = null
-		caliber = ""
-		silenced = 0
-		recoil = 0
-		ejectshell = 1
+	var/fire_sound = 'Gunshot.ogg'
+	var/obj/item/projectile/in_chamber = null
+	var/caliber = ""
+	var/silenced = 0
+	var/recoil = 0
+	var/ejectshell = 1

-	proc
-		load_into_chamber()
-		special_check(var/mob/M)
+
+	proc/load_into_chamber()
+		return
+
+	proc/special_check(var/mob/M)
+		return


 	load_into_chamber()
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -4,12 +4,11 @@
 	desc = "A basic energy-based gun."
 	fire_sound = 'Taser.ogg'

-	var
-		obj/item/weapon/cell/power_supply //What type of power cell this uses
-		charge_cost = 100 //How much energy is needed to fire.
-		cell_type = "/obj/item/weapon/cell"
-		projectile_type = "/obj/item/projectile/energy"
-		modifystate
+	var/obj/item/weapon/cell/power_supply //What type of power cell this uses
+	var/charge_cost = 100 //How much energy is needed to fire.
+	var/cell_type = "/obj/item/weapon/cell"
+	var/projectile_type = "/obj/item/projectile/energy"
+	var/modifystate

 	emp_act(severity)
 		power_supply.use(round(power_supply.maxcharge / severity))
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -9,8 +9,7 @@
 	origin_tech = "combat=3;magnets=2"
 	modifystate = "energystun"

-	var
-		mode = 0 //0 = stun, 1 = kill
+	var/mode = 0 //0 = stun, 1 = kill


 	attack_self(mob/living/user as mob)
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -5,7 +5,8 @@
 	fire_sound = 'Laser.ogg'
 	origin_tech = "combat=2;magnets=4"
 	w_class = 4.0
-	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
+	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BACK
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/ion"

@@ -27,7 +28,8 @@ obj/item/weapon/gun/energy/staff
 	icon_state = "staffofchange"
 	item_state = "staffofchange"
 	fire_sound = 'emitter.ogg'
-	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
+	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BACK
 	w_class = 4.0
 	charge_cost = 200
 	projectile_type = "/obj/item/projectile/change"
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -7,12 +7,11 @@
 	w_class = 3.0
 	m_amt = 1000

-	var
-		ammo_type = "/obj/item/ammo_casing/a357"
-		list/loaded = list()
-		max_shells = 7
-		load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine
-		obj/item/ammo_magazine/empty_mag = null
+	var/ammo_type = "/obj/item/ammo_casing/a357"
+	var/list/loaded = list()
+	var/max_shells = 7
+	var/load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine
+	var/obj/item/ammo_magazine/empty_mag = null


 	New()
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -6,14 +6,14 @@
 	max_shells = 4
 	w_class = 4.0
 	force = 10
-	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
+	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BACK
 	caliber = "shotgun"
 	origin_tech = "combat=4;materials=2"
 	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
-	var
-		recentpump = 0 // to prevent spammage
-		pumped = 0
-		obj/item/ammo_casing/current_shell = null
+	var/recentpump = 0 // to prevent spammage
+	var/pumped = 0
+	var/obj/item/ammo_casing/current_shell = null


 	load_into_chamber()
@@ -64,7 +64,8 @@
 	max_shells = 2
 	w_class = 4.0
 	force = 10
-	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK
+	flags =  FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BACK
 	caliber = "shotgun"
 	origin_tech = "combat=3;materials=1"
 	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
@@ -119,8 +120,8 @@
 				icon_state = "sawnshotgun"
 				w_class = 3.0
 				item_state = "gun"
-				flags &= ~ONBACK	//you can't sling it on your back
-				flags |= ONBELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+				slot_flags &= ~SLOT_BACK	//you can't sling it on your back
+				slot_flags |= SLOT_BELT	//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
 				name = "sawn-off shotgun"
 				desc = "Omar's coming!"
 				user << "<span class='warning'>You shorten the barrel of \the [src]!</span>"
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -19,33 +19,32 @@
 	flags = FPRINT | TABLEPASS
 	pass_flags = PASSTABLE
 	mouse_opacity = 0
-	var
-		bumped = 0		//Prevents it from hitting more than one guy at once
-		def_zone = ""	//Aiming at
-		mob/firer = null//Who shot it
-		silenced = 0	//Attack message
-		yo = null
-		xo = null
-		current = null
-		turf/original = null // the original turf clicked
-		turf/starting = null // the projectile's starting turf
+	var/bumped = 0		//Prevents it from hitting more than one guy at once
+	var/def_zone = ""	//Aiming at
+	var/mob/firer = null//Who shot it
+	var/silenced = 0	//Attack message
+	var/yo = null
+	var/xo = null
+	var/current = null
+	var/turf/original = null // the original turf clicked
+	var/turf/starting = null // the projectile's starting turf

-		p_x = 16
-		p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
+	var/p_x = 16
+	var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center

-		damage = 10
-		damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
-		nodamage = 0 //Determines if the projectile will skip any damage inflictions
-		flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb
-		projectile_type = "/obj/item/projectile"
+	var/damage = 10
+	var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
+	var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
+	var/flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb
+	var/projectile_type = "/obj/item/projectile"
 		//Effects
-		stun = 0
-		weaken = 0
-		paralyze = 0
-		irradiate = 0
-		stutter = 0
-		eyeblur = 0
-		drowsy = 0
+	var/stun = 0
+	var/weaken = 0
+	var/paralyze = 0
+	var/irradiate = 0
+	var/stutter = 0
+	var/eyeblur = 0
+	var/drowsy = 0


 	proc/on_hit(var/atom/target, var/blocked = 0)
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -154,7 +154,8 @@

 	w_class = 1
 	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT

 	attack_self(mob/user as mob)
 		var/dat = "<TT><B>TagMaster 2.2</B><BR><BR>"
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -98,8 +98,23 @@ var/MAX_EXPLOSION_RANGE = 14
 #define SHOES_SLOWDOWN -1.0			// How much shoes slow you down by default. Negative values speed you up


+//ITEM INVENTORY SLOT BITMASKS: (HUMANS ONLY!)
+#define SLOT_OCLOTHING 1
+#define SLOT_ICLOTHING 2
+#define SLOT_GLOVES 4
+#define SLOT_EYES 8
+#define SLOT_EARS 16
+#define SLOT_MASK 32
+#define SLOT_HEAD 64
+#define SLOT_FEET 128
+#define SLOT_ID 256
+#define SLOT_BELT 512
+#define SLOT_BACK 1024
+#define SLOT_POCKET 2048		//this is to allow items with a w_class of 3 or 4 to fit in pockets.
+#define SLOT_DENYPOCKET 4096	//this is to deny items with a w_class of 2 or 1 to fit in pockets.
+
+
 //FLAGS BITMASK
-#define ONBACK 1			// can be put in back slot
 #define TABLEPASS 2			// can pass by a table or rack

 /********************************************************************************
@@ -117,7 +132,6 @@ var/MAX_EXPLOSION_RANGE = 14
 #define NODELAY 32768		// 1 second attackby delay skipped (Can be used once every 0.2s). Most objects have a 1s attackby delay, which doesn't require a flag.
 #define NOSHIELD 32			// weapon not affected by shield
 #define CONDUCT 64			// conducts electricity (metal etc.)
-#define ONBELT 128			// can be put in belt slot
 #define FPRINT 256			// takes a fingerprint
 #define ON_BORDER 512		// item has priority to check when entering or leaving