Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme

code/modules/projectiles/ammunition/boxes.dm

@@ -192,6 +192,15 @@
 	max_ammo = 20
 	multiple_sprites = 1
 
+/obj/item/ammo_magazine/caps
+	name = "speed loader (caps)"
+	icon_state = "T38"
+	caliber = "caps"
+	color = "#FF0000"
+	ammo_type = /obj/item/ammo_casing/cap
+	matter = list(DEFAULT_WALL_MATERIAL = 600)
+	max_ammo = 7
+	multiple_sprites = 1
 /obj/item/ammo_magazine/g12
 	name = "magazine (12 gauge)"
 	icon_state = "g12"
@@ -215,4 +224,4 @@
 	ammo_type = /obj/item/ammo_casing/shotgun/flash
 
 /obj/item/ammo_magazine/g12/empty
-	initial_ammo = 0
+	initial_ammo = 0

code/modules/projectiles/ammunition/bullets.dm

@@ -158,3 +158,10 @@
 	icon_state = "rocketshell"
 	projectile_type = /obj/item/missile
 	caliber = "rocket"
+
+/obj/item/ammo_casing/cap
+	name = "cap"
+	desc = "A cap for children toys."
+	caliber = "caps"
+	color = "#FF0000"
+	projectile_type = /obj/item/projectile/bullet/pistol/cap