tweak(gun): deckard's return to his former state

#12795
ChaoticOnyx · Sep 20, 2024 · 279f6e2 · 279f6e2
1 parent 8d50801
commit 279f6e2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm
@@ -27,7 +27,7 @@
 								/obj/item/gun/projectile/revolver/detective 		= TRADER_ALL,
 								/obj/item/gun/projectile/revolver/m2019/detective 	= TRADER_THIS_TYPE,
 								/obj/item/gun/projectile/revolver/coltpython 		= TRADER_THIS_TYPE,
-								/obj/item/gun/projectile/revolver/deckard 			= TRADER_THIS_TYPE,
+								/obj/item/gun/projectile/revolver/deckard 			= TRADER_ALL,
 								/obj/item/gun/projectile/pistol 					= TRADER_SUBTYPES_ONLY,
 								/obj/item/gun/projectile/pistol/secgun/MK 			= TRADER_BLACKLIST,
 								/obj/item/gun/projectile/shotgun 					= TRADER_SUBTYPES_ONLY,

diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
@@ -72,6 +72,11 @@
 	icon_state = "R38"
 	ammo_type = /obj/item/ammo_casing/c44/rubber
 
+/obj/item/ammo_magazine/c44/emp
+	name = "speed loader (.44 magnum, haywire)"
+	icon_state = "E38"
+	ammo_type = /obj/item/ammo_casing/c44/emp
+
 /obj/item/ammo_magazine/c45m
 	name = "magazine (.45)"
 	icon_state = "45"

diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
@@ -78,7 +78,6 @@
 	icon_state = "r-casing"
 	spent_icon = "r-casing-spent"
 
-
 /obj/item/ammo_casing/c45
 	desc = "A .45 bullet casing."
 	caliber = ".45"
@@ -236,6 +235,13 @@
 	projectile_type = /obj/item/projectile/ion/small
 	matter = list(MATERIAL_STEEL = 130, MATERIAL_URANIUM = 100)
 
+/obj/item/ammo_casing/c44/emp
+	name = ".44 haywire round"
+	desc = "A .44 bullet casing fitted with a single-use ion pulse generator."
+	icon_state = "empcasing"
+	projectile_type = /obj/item/projectile/ion/small
+	matter = list(MATERIAL_STEEL = 130, MATERIAL_URANIUM = 100)
+
 /obj/item/ammo_casing/c45/emp
 	name = ".45 haywire round"
 	desc = "A .45 bullet casing fitted with a single-use ion pulse generator."

diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -103,14 +103,14 @@
 
 // Blade Runner pistol.
 /obj/item/gun/projectile/revolver/deckard
-	name = "Deckard .38"
+	name = "Deckard .44"
 	desc = "A custom-built revolver, based off the semi-popular Detective Special model."
 	icon_state = "deckard-empty"
-	caliber = ".38"
-	ammo_type = /obj/item/ammo_magazine/c38/rubber
+	caliber = ".44"
+	ammo_type = /obj/item/ammo_casing/c44/rubber
 
 /obj/item/gun/projectile/revolver/deckard/emp
-	ammo_type = /obj/item/ammo_casing/c38/emp
+	ammo_type = /obj/item/ammo_casing/c44/emp
 
 /obj/item/gun/projectile/revolver/deckard/on_update_icon()
 	..()
@@ -120,9 +120,10 @@
 		icon_state = "deckard-empty"
 
 /obj/item/gun/projectile/revolver/deckard/load_ammo(obj/item/A, mob/user)
-	if(istype(A, /obj/item/ammo_magazine))
-		flick("deckard-reload",src)
-	..()
+    var/old_loaded_len = loaded.len
+    ..()
+    if(old_loaded_len != loaded.len)
+        flick("deckard-reload",src)
 
 /obj/item/gun/projectile/revolver/capgun
 	name = "cap gun"

diff --git a/icons/obj/guns/gun.dmi b/icons/obj/guns/gun.dmi