Merge pull request #5113 from Woodratt/03262018_44revolver

44 revolvers

code/modules/projectiles/ammunition/magazines.dm

@@ -50,6 +50,7 @@
 
 /obj/item/ammo_magazine/s38/rubber
 	name = "speedloader (.38 rubber)"
+	icon_state = "T38"
 	ammo_type = /obj/item/ammo_casing/a38r
 
 /obj/item/ammo_magazine/s38/emp
@@ -493,6 +494,23 @@
 	max_ammo = 9
 	multiple_sprites = 1
 
+/obj/item/ammo_magazine/s44
+	name = "speedloader (.44)"
+	icon_state = "44"
+	ammo_type = /obj/item/ammo_casing/a44
+	matter = list(DEFAULT_WALL_MATERIAL = 1260) //metal costs are very roughly based around 1 .45 casing = 75 metal
+	caliber = ".44"
+	max_ammo = 6
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/s44/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/s44/rubber
+	name = "speedloader (.44 rubber)"
+	icon_state = "R44"
+	ammo_type = /obj/item/ammo_casing/a44r
+
 ///////// 7.62mm /////////
 
 /obj/item/ammo_magazine/m762

code/modules/projectiles/ammunition/rounds.dm

@@ -59,6 +59,12 @@
 	caliber = ".44"
 	projectile_type = /obj/item/projectile/bullet/pistol/strong
 
+/obj/item/ammo_casing/a44r
+	icon_state = "r-casing"
+	desc = "A .44 rubber bullet casing."
+	caliber = ".44"
+	projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
+
 /*
  * .75 (aka Gyrojet Rockets, aka admin abuse)
  */

code/modules/projectiles/gun.dm

@@ -58,6 +58,7 @@
 	var/move_delay = 1
 	var/fire_sound = 'sound/weapons/Gunshot.ogg'
 	var/fire_sound_text = "gunshot"
+	var/fire_anim = null
 	var/recoil = 0		//screen shake
 	var/silenced = 0
 	var/muzzle_flash = 3
@@ -456,7 +457,7 @@
 		if(!(target && target.loc))
 			target = targloc
 			//pointblank = 0
-	
+
 	var/target_for_log
 	if(ismob(target))
 		target_for_log = target
@@ -497,6 +498,9 @@
 
 //called after successfully firing
 /obj/item/weapon/gun/proc/handle_post_fire(mob/user, atom/target, var/pointblank=0, var/reflex=0)
+	if(fire_anim)
+		flick(fire_anim, src)
+
 	if(silenced)
 		if(reflex)
 			user.visible_message(

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

@@ -118,7 +118,6 @@ obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
 		return 1
 
 
-
 // Blade Runner pistol.
 /obj/item/weapon/gun/projectile/revolver/deckard
 	name = "\improper Deckard .38"
@@ -259,3 +258,24 @@ obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
 		to_chat(user, "\The [src] has a secondary barrel loaded with \a [to_print]")
 	else
 		to_chat(user, "\The [src] has a secondary barrel that is empty.")
+
+
+//Ported from Bay
+/obj/item/weapon/gun/projectile/revolver/webley
+	name = "service revolver"
+	desc = "A rugged top break revolver based on the Webley Mk. VI model, with modern improvements. Uses .44 magnum rounds."
+	icon_state = "webley2"
+	item_state = "webley2"
+	caliber = ".44"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	handle_casings = CYCLE_CASINGS
+	max_shells = 6
+	ammo_type = /obj/item/ammo_casing/a44
+
+/obj/item/weapon/gun/projectile/revolver/webley/auto
+	name = "autorevolver"
+	icon_state = "mosley"
+	desc = "A shiny Mosley Autococker automatic revolver, with black accents. Marketed as the 'Revolver for the Modern Era'. Uses .44 magnum rounds."
+	fire_delay = 5.7 //Autorevolver. Also synced with the animation
+	fire_anim = "mosley_fire"
+	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)

code/modules/projectiles/projectile/bullets.dm

@@ -147,6 +147,14 @@
 	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
 	damage = 60
 
+/obj/item/projectile/bullet/pistol/rubber/strong //"rubber" bullets for revolvers and matebas
+	fire_sound = 'sound/weapons/gunshot/gunshot_strong.ogg'
+	damage = 10
+	agony = 60
+	embed_chance = 0
+	sharp = 0
+	check_armour = "melee"
+
 /obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
 	name = "rubber bullet"
 	damage = 5