Moved barrier icons to objects.dm.

Updated barrier graphics. 
Barriers now spawn in the Armory (and four in the vacant Sec office), until they are tested. Required access was changed to Security likewise.
Fixed firesuit down graphics, along with hazard vest.
Reduced the number of fireclosets spawning instead of oxygen closets.

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

code/game/machinery/deployable.dm

@@ -53,22 +53,20 @@ for reference:
 /obj/machinery/depolyable
 	name = "deployable"
 	desc = "deployable"
-	icon = 'deployable.dmi'
-	layer = 5.0
-//	req_access = list(access_security)
+	icon = 'objects.dmi'
+	req_access = list(access_security)//I'm changing this until these are properly tested./N
 
 /obj/machinery/deployable/barrier
 	name = "deployable barrier"
 	desc = "A deployable barrier. Swipe your ID card to lock/unlock it."
-	icon = 'deployable.dmi'
-	layer = 5.0
+	icon = 'objects.dmi'
 	anchored = 0.0
 	density = 1.0
 	icon_state = "barrier0"
 	var/health = 100.0
 	var/maxhealth = 100.0
 	var/locked = 0.0
-	req_access = list(access_maint_tunnels)
+//	req_access = list(access_maint_tunnels)
 
 	New()
 		..()
@@ -123,18 +121,28 @@ for reference:
 			src.explode()
 		return
 
-	bullet_act(flag, A as obj)
+	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff.
+		if(air_group || (height==0))
+			return 1
+		if (mover.flags & 2)
+			return 1
+		else
+			return 0
+
+/*	bullet_act(flag, A as obj)
 		switch(flag)
 			if (PROJECTILE_BULLET)
 				src.health -= 20
-			//if (PROJECTILE_WEAKBULLET || PROJECTILE_BEANBAG) //Detective's revolver fires marshmallows
-			//	src.health -= 2
+			if (PROJECTILE_WEAKBULLET) //Detective's revolver fires marshmallows
+				src.health -= 2
 			if (PROJECTILE_LASER)
 				src.health -= 20
 			if (PROJECTILE_PULSE)
 				src.health -=50
 		if (src.health <= 0)
 			src.explode()
+These should not block bullets/N */
+
 
 	proc/explode()
 

code/game/objects/closets/emergency.dm

@@ -4,7 +4,7 @@
 	if (prob(40))
 		new /obj/item/weapon/storage/toolbox/emergency(src)
 
-	switch (pickweight(list("fire" = 25, "small" = 25, "aid" = 10, "tank" = 5, "both" = 5, "nothing" = 4, "delete" = 1)))
+	switch (pickweight(list("fire" = 15, "small" = 30, "aid" = 15, "tank" = 5, "both" = 5, "nothing" = 4, "delete" = 1)))
 		if ("small")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/tank/emergency_oxygen(src)