Merge pull request #14637 from TheObserver-sys/DerringerPass1

Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})

code/modules/projectiles/boxes_magazines/ammo_boxes.dm

@@ -60,6 +60,13 @@
 	desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with."
 	ammo_type = /obj/item/ammo_casing/c38/match
 
+/obj/item/ammo_box/g4570
+	name = "ammo box (.45-70 GOVT)"
+	desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets."
+	ammo_type = /obj/item/ammo_casing/g4570
+	icon_state = "45box"
+	max_ammo = 10
+
 /obj/item/ammo_box/c9mm
 	name = "ammo box (9mm)"
 	icon_state = "9mmbox"

code/modules/projectiles/boxes_magazines/internal/derringer.dm

@@ -3,28 +3,17 @@
 	ammo_type = /obj/item/ammo_casing/c38
 	caliber = "38"
 	max_ammo = 2
-	multiload = FALSE
-
-/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1)
-	if (!countempties)
-		var/boolets = 0
-		for(var/obj/item/ammo_casing/bullet in stored_ammo)
-			if(bullet.BB)
-				boolets++
-		return boolets
-	else
-		return ..()
 
 /obj/item/ammo_box/magazine/internal/derringer/a357
 	name = "\improper derringer muzzle"
 	ammo_type = /obj/item/ammo_casing/a357
 	caliber = "357"
 	max_ammo = 2
-	multiload = FALSE
+	multiload = 0
 
 /obj/item/ammo_box/magazine/internal/derringer/g4570
 	name = "\improper derringer muzzle"
 	ammo_type = /obj/item/ammo_casing/g4570
 	caliber = "45-70g"
 	max_ammo = 2
-	multiload = FALSE
+	multiload = 0

code/modules/projectiles/guns/ballistic/derringer.dm

@@ -3,16 +3,14 @@
 	desc = "A easily concealable derringer. Uses .38 ammo"
 	icon = 'icons/obj/guns/projectile.dmi'
 	icon_state = "derringer"
+	flags_1 = CONDUCT_1
 	mag_type = /obj/item/ammo_box/magazine/internal/derringer
+	fire_delay = 5
 	obj_flags = UNIQUE_RENAME
 	fire_sound = 'sound/weapons/revolvershot.ogg'
 	casing_ejector = FALSE
 	w_class = WEIGHT_CLASS_TINY
 
-/obj/item/gun/ballistic/derringer/Initialize()
-	..()
-	transform *= 0.8 //Spriter too lazy to make icons smaller than default revolvers, local coder hacks in solution.
-
 /obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE)
 	var/boolets = 0 //legacy var name maturity
 	if (chambered && countchambered)
@@ -27,7 +25,7 @@
 		return
 	var/num_loaded = magazine.attackby(A, user, params, 1)
 	if(num_loaded)
-		to_chat(user, "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>")
+		to_chat(user, "<span class='notice'>You load [num_loaded] bullet\s into \the [src].</span>")
 		playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1)
 		A.update_icon()
 		update_icon()