Polaris Sync

code/modules/projectiles/ammunition/magazines.dm

@@ -159,6 +159,34 @@
 	name = "ammo clip (.45 flash)"
 	ammo_type = /obj/item/ammo_casing/a45f
 
+/obj/item/ammo_magazine/s45
+	name = "speedloader (.45)"
+	icon_state = "45s"
+	ammo_type = /obj/item/ammo_casing/a45
+	matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
+	caliber = ".45"
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_magazine/s45/empty
+	initial_ammo = 0
+
+/obj/item/ammo_magazine/s45/rubber
+	name = "speedloader (.45 rubber)"
+	ammo_type = /obj/item/ammo_casing/a45r
+
+/obj/item/ammo_magazine/s45/practice
+	name = "speedloader (.45 practice)"
+	ammo_type = /obj/item/ammo_casing/a45p
+
+/obj/item/ammo_magazine/s45/flash
+	name = "speedloader (.45 flash)"
+	ammo_type = /obj/item/ammo_casing/a45f
+
+/obj/item/ammo_magazine/s45/ap
+	name = "speedloader (.45 AP)"
+	ammo_type = /obj/item/ammo_casing/a45ap
+
 ///////// 9mm /////////
 
 /obj/item/ammo_magazine/m9mm

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

@@ -23,7 +23,7 @@
 			icon_state = "[initial(icon_state)]-e"
 
 /obj/item/weapon/gun/projectile/colt/detective
-	desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds."
+	desc = "A Martian recreation of an old pistol. Uses .45 rounds."
 	magazine_type = /obj/item/ammo_magazine/m45/rubber
 
 /obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun()
@@ -60,7 +60,8 @@
 	options["H&K VP"] = "VP78"
 	options["P08 Luger"] = "p08"
 	options["P08 Luger, Brown"] = "p08b"
-	var/choice = input(M,"What do you want the gun's sprite to be?","Resprite Gun") in options
+	options["Glock 37"] = "enforcer_black"
+	var/choice = input(M,"Choose your sprite!","Resprite Gun") in options
 	if(src && choice && !M.stat && in_range(M,src))
 		icon_state = options[choice]
 		unique_reskin = options[choice]

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

@@ -66,6 +66,58 @@
 		M << "You name the gun [input]. Say hello to your new friend."
 		return 1
 
+/obj/item/weapon/gun/projectile/revolver/detective45
+	name = ".45 revolver"
+	desc = "A fancy replica of an old revolver, modified for .45 rounds and a seven-shot cylinder."
+	icon_state = "detective"
+	caliber = ".45"
+	origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2)
+	fire_sound = 'sound/weapons/gunshot_heavy.ogg'
+	ammo_type = /obj/item/ammo_casing/a45r
+	max_shells = 7
+
+
+obj/item/weapon/gun/projectile/revolver/detective45/verb/rename_gun()
+	set name = "Name Gun"
+	set category = "Object"
+	set desc = "Rename your gun. If you're the Detective."
+
+	var/mob/M = usr
+	if(!M.mind)	return 0
+	var/job = M.mind.assigned_role
+	if(job != "Detective")
+		M << "<span class='notice'>You don't feel cool enough to name this gun, chump.</span>"
+		return 0
+
+	var/input = sanitizeSafe(input("What do you want to name the gun?", ,""), MAX_NAME_LEN)
+
+	if(src && input && !M.stat && in_range(M,src))
+		name = input
+		M << "You name the gun [input]. Say hello to your new friend."
+		return 1
+
+/obj/item/weapon/gun/projectile/revolver/detective45/verb/reskin_gun()
+	set name = "Resprite gun"
+	set category = "Object"
+	set desc = "Click to choose a sprite for your gun."
+
+	var/mob/M = usr
+	var/list/options = list()
+	options["Colt Detective Special"] = "detective"
+	options["Ruger GP100"] = "GP100"
+	options["Colt Single Action Army"] = "detective_peacemaker"
+	options["Colt Single Action Army, Dark"] = "detective_peacemaker_dark"
+	options["H&K PT"] = "detective_panther"
+	options["Vintage LeMat"] = "lemat_old"
+	options["Webley MKVI "] = "webley"
+	var/choice = input(M,"Choose your sprite!","Resprite Gun") in options
+	if(src && choice && !M.stat && in_range(M,src))
+		icon_state = options[choice]
+		M << "Your gun is now sprited as [choice]. Say hello to your new friend."
+		return 1
+
+
+
 // Blade Runner pistol.
 /obj/item/weapon/gun/projectile/revolver/deckard
 	name = "\improper Deckard .38"