cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #155 from alex-gh/revolver_ck

Browse Source 
Revolver conversion kits now modify revolvers without catastrophic failu...
This commit is contained in:
ZomgPonies
2014-02-11 18:50:08 -05:00
parent 3d4dd919c7 e0d84dba7e
commit 2c9dee38cb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+1
View File
@@ -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.
code/modules/projectiles/guns/projectile/revolver.dm
+7 -2
View File
@@ -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 << "<span class='danger'>[src] blows up in your face!</span>"
@@ -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 << "<span class='notice'>You begin to reinforce the barrel of [src].</span>"
if(magazine.ammo_count())
@@ -138,6 +138,10 @@
if(magazine.ammo_count())
user << "<span class='notice'>You can't modify it!</span>"
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 << "<span class='warning'>You reinforce the barrel of [src]! Now it will fire .357 rounds.</span>"
@@ -151,6 +155,7 @@
if(magazine.ammo_count())
user << "<span class='notice'>You can't modify it!</span>"
return
ghettomodded = 0
magazine.caliber = "38"
desc = initial(desc)
user << "<span class='warning'>You remove the modifications on [src]! Now it will fire .38 rounds.</span>"