TG: - 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.
Revision: r3659
Author: 	 baloh.matevz

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))

code/modules/projectiles/guns/energy/nuclear.dm

@@ -10,8 +10,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)

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"

code/modules/projectiles/guns/projectile.dm

@@ -8,12 +8,11 @@
 	m_amt = 1000
 	force = 10 //Pistol whipp'n good.  (It was frigging SIXTY on pre-goon code)
 
-	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()

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()
@@ -66,7 +66,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"
@@ -124,8 +125,8 @@
 				item_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>"