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

code/modules/projectiles/guns/projectile/revolver.dm

@@ -8,6 +8,30 @@
 	handle_casings = CYCLE_CASINGS
 	max_shells = 7
 	ammo_type = /obj/item/ammo_casing/a357
+	var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round
+
+/obj/item/weapon/gun/projectile/revolver/verb/spin_cylinder()
+	set name = "Spin cylinder"
+	set desc = "Fun when you're bored out of your skull."
+	set category = "Object"
+
+	chamber_offset = 0
+	visible_message("<span class='warning'>\The [usr] spins the cylinder of \the [src]!</span>", \
+	"<span class='notice'>You hear something metallic spin and click.</span>")
+	playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1)
+	loaded = shuffle(loaded)
+	if(rand(1,max_shells) > loaded.len)
+		chamber_offset = rand(0,max_shells - loaded.len)
+
+/obj/item/weapon/gun/projectile/revolver/consume_next_projectile()
+	if(chamber_offset)
+		chamber_offset--
+		return
+	return ..()
+
+/obj/item/weapon/gun/projectile/revolver/load_ammo(var/obj/item/A, mob/user)
+	chamber_offset = 0
+	return ..()
 
 /obj/item/weapon/gun/projectile/revolver/mateba
 	name = "mateba"
@@ -61,4 +85,14 @@
 		flick("deckard-reload",src)
 	..()
 
+/obj/item/weapon/gun/projectile/revolver/capgun
+	name = "cap gun"
+	desc = "Looks almost like the real thing! Ages 8 and up."
+	icon_state = "revolver"
+	item_state = "revolver"
+	caliber = "caps"
+	origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1)
+	handle_casings = CYCLE_CASINGS
+	max_shells = 7
+	ammo_type = /obj/item/ammo_casing/cap
 

code/modules/projectiles/projectile/bullets.dm

@@ -197,3 +197,15 @@
 /obj/item/projectile/bullet/shotgun/practice
 	name = "practice"
 	damage = 5
+
+/obj/item/projectile/bullet/pistol/cap
+	name = "cap"
+	damage_type = HALLOSS
+	damage = 0
+	nodamage = 1
+	embed = 0
+	sharp = 0
+
+/obj/item/projectile/bullet/pistol/cap/process()
+	loc = null
+	qdel(src)