Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge

Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme

code/modules/projectiles/gun.dm

@@ -189,7 +189,7 @@
 	update_held_icon()
 
 	//update timing
-	user.setClickCooldown(4)
+	user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
 	user.setMoveCooldown(move_delay)
 	next_fire_time = world.time + fire_delay
 

code/modules/projectiles/projectile/bullets.dm

@@ -136,6 +136,7 @@
 
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
+	check_armour = "melee"
 	damage = 10
 	agony = 40
 	embed = 0
@@ -150,6 +151,7 @@
 
 /obj/item/projectile/bullet/shotgun/beanbag		//because beanbags are not bullets
 	name = "beanbag"
+	check_armour = "melee"
 	damage = 20
 	agony = 60
 	embed = 0
@@ -234,4 +236,4 @@
 
 /obj/item/projectile/bullet/pistol/cap/process()
 	loc = null
-	qdel(src)
+	qdel(src)

code/modules/projectiles/projectile/energy.dm

@@ -22,13 +22,13 @@
 
 	//blind adjacent people
 	for (var/mob/living/carbon/M in viewers(T, flash_range))
-		if(M.eyecheck() < 1)
+		if(M.eyecheck() < FLASH_PROTECTION_MODERATE)
 			flick("e_flash", M.flash)
 
 	//snap pop
 	playsound(src, 'sound/effects/snap.ogg', 50, 1)
 	src.visible_message("<span class='warning'>\The [src] explodes in a bright flash!</span>")
-	
+
 	new /obj/effect/decal/cleanable/ash(src.loc) //always use src.loc so that ash doesn't end up inside windows
 	new /obj/effect/effect/sparks(T)
 	new /obj/effect/effect/smoke/illumination(T, brightness=max(flash_range*2, brightness), lifetime=light_duration)