Job system should be working now. I had a '==' where a '&' should have been that would cause it to only work when you had one job of the same level and department selected.

The loyalty implant box now spawn in the HoS' locker and not in nullspace.
Gave the HoS' locker a secbelt.
The revolver now use the proper bullet.
Robotics spawn with their labcoat/toolbox.

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

code/game/objects/closets/secure/security.dm

@@ -6,16 +6,16 @@
 	New()
 		..()
 		sleep(2)
-		new /obj/item/clothing/suit/captunic( src )
-		new /obj/item/clothing/head/helmet/cap( src )
-		new /obj/item/clothing/under/rank/captain( src )
-		new /obj/item/clothing/suit/armor/vest( src )
-		new /obj/item/clothing/gloves/captain( src )
-		new /obj/item/clothing/head/helmet/swat( src )
-		new /obj/item/clothing/shoes/brown( src )
-		new /obj/item/device/radio/headset/heads/captain( src )
+		new /obj/item/clothing/suit/captunic(src)
+		new /obj/item/clothing/head/helmet/cap(src)
+		new /obj/item/clothing/under/rank/captain(src)
+		new /obj/item/clothing/suit/armor/vest(src)
+		new /obj/item/clothing/gloves/captain(src)
+		new /obj/item/clothing/head/helmet/swat(src)
+		new /obj/item/clothing/shoes/brown(src)
+		new /obj/item/device/radio/headset/heads/captain(src)
 		new /obj/item/weapon/reagent_containers/food/drinks/flask(src)
-		new /obj/item/weapon/gun/energy/gun( src )
+		new /obj/item/weapon/gun/energy/gun(src)
 		return
 
 
@@ -55,12 +55,13 @@
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
 		new /obj/item/weapon/shield/riot(src)
+		new /obj/item/weapon/storage/lockbox/loyalty(src)
+		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/storage/belt/security(src)
+		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/gun(src)
 		new /obj/item/device/flash(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
-		new /obj/item/weapon/storage/flashbang_kit(src)
-		new /obj/item/weapon/storage/lockbox/loyalty()
-		new /obj/item/weapon/melee/baton(src)
 		return
 
 
@@ -77,8 +78,8 @@
 		new /obj/item/clothing/suit/armor/vest(src)
 		new /obj/item/clothing/head/helmet/warden(src)
 		new /obj/item/device/radio/headset/headset_sec(src)
-		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/storage/flashbang_kit(src)
+		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/melee/baton(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)

code/game/objects/devices/PDA/uplink.dm

@@ -98,7 +98,7 @@
 			if("revolver_ammo")
 				if (uses >= 2)
 					uses -= 2
-					new /obj/item/ammo_magazine(get_turf(hostpda))
+					new /obj/item/ammo_magazine/a357(get_turf(hostpda))
 			if("suffocation_revolver_ammo")
 				if (uses >= 3)
 					uses -= 3

code/game/objects/items/weapons/hydroponics.dm

@@ -84,7 +84,7 @@ Deathnettle
 			user.take_organ_damage(0,force)
 
 /obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user as mob)
-	if (force > 0)
+	if(force > 0)
 		force -= rand(1,(force/3)+1) // When you whack someone with it, leaves fall off
 	else
 		usr << "All the leaves have fallen off the nettle from violent whacking."

code/game/objects/items/weapons/uplinks.dm

@@ -92,7 +92,7 @@ SYNDICATE UPLINK
 				if("revolver_ammo")
 					if (src.uses >= 2)
 						src.uses -= 2
-						new /obj/item/ammo_magazine(get_turf(src))
+						new /obj/item/ammo_magazine/a357(get_turf(src))
 				if("suffocation_revolver_ammo")
 					if (uses >= 3)
 						uses -= 3

code/game/objects/storage/storage.dm

@@ -280,7 +280,7 @@
 
 		if ("guns")
 			new /obj/item/weapon/gun/projectile(src)
-			new /obj/item/ammo_magazine(src)
+			new /obj/item/ammo_magazine/a357(src)
 			new /obj/item/weapon/card/emag(src)
 			new /obj/item/weapon/plastique(src)
 			return