diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 41914b5406e..4c5708ac626 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -18,6 +18,7 @@ var/fire_sound = 'sound/weapons/Gunshot.ogg' var/obj/item/projectile/in_chamber = null var/silenced = 0 + var/ghettomodded = 0 var/recoil = 0 var/clumsy_check = 1 var/obj/item/ammo_casing/chambered = null // The round (not bullet) that is in the chamber. THIS MISPLACED ITEM BROUGHT TO YOU BY HACKY BUCKSHOT. diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index aaa60b2f024..bc5bc8567df 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -83,7 +83,7 @@ /obj/item/weapon/gun/projectile/revolver/detective/special_check(var/mob/living/carbon/human/M) - if(magazine.caliber == initial(magazine.caliber)) + if(!ghettomodded) return 1 if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 M << "[src] blows up in your face!" @@ -127,7 +127,7 @@ /obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob) ..() - if(istype(A, /obj/item/weapon/screwdriver)) + if(istype(A, /obj/item/weapon/screwdriver) || istype(A, /obj/item/weapon/conversion_kit)) if(magazine.caliber == "38") user << "You begin to reinforce the barrel of [src]." if(magazine.ammo_count()) @@ -138,6 +138,10 @@ if(magazine.ammo_count()) user << "You can't modify it!" return + if (istype(A, /obj/item/weapon/conversion_kit)) + ghettomodded = 0 + else + ghettomodded = 1 magazine.caliber = "357" desc = "[initial(desc)] The barrel and chamber assembly seems to have been modified." user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." @@ -151,6 +155,7 @@ if(magazine.ammo_count()) user << "You can't modify it!" return + ghettomodded = 0 magazine.caliber = "38" desc = initial(desc) user << "You remove the modifications on [src]! Now it will fire .38 rounds."