diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index c7141e741d8..ef32caaef34 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -1,10 +1,10 @@ /obj/item/weapon/gun/projectile - desc = "A classic revolver. Uses 357 ammo" + desc = "A pocket-sized snubnosed revolver. Uses 357 ammo" name = "revolver" - icon_state = "revolver" + icon_state = "revolver_snub" caliber = "357" origin_tech = "combat=2;materials=2" - w_class = 3.0 + w_class = 2.0 m_amt = 1000 var/ammo_type = "/obj/item/ammo_casing/a357" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index c7748091e9f..2fea6852439 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -15,6 +15,7 @@ name = "desert eagle" desc = "A robust handgun that uses .50 AE ammo" icon_state = "deagle" + w_class = 3.0 force = 14.0 max_shells = 7 caliber = ".50" @@ -54,6 +55,7 @@ name = "gyrojet pistol" desc = "A bulky pistol designed to fire self propelled rounds" icon_state = "gyropistol" + w_class = 3.0 max_shells = 8 caliber = "75" fire_sound = 'sound/effects/Explosion1.ogg' @@ -88,7 +90,7 @@ name = "\improper Stechtkin pistol" desc = "A small, easily concealable gun. Uses 9mm rounds." icon_state = "pistol" - w_class = 2 + w_class = 2.0 max_shells = 8 caliber = "9mm" silenced = 0 @@ -117,7 +119,7 @@ user << "You unscrew [silenced] from [src]." user.put_in_hands(silenced) silenced = 0 - w_class = 2 + w_class = 2.0 update_icon() return ..() @@ -131,7 +133,7 @@ user.drop_item() user << "You screw [I] onto [src]." silenced = I //dodgy? - w_class = 3 + w_class = 3.0 I.loc = src //put the silencer into the gun update_icon() return @@ -149,4 +151,4 @@ desc = "a silencer" icon = 'icons/obj/gun.dmi' icon_state = "silencer" - w_class = 2 \ No newline at end of file + w_class = 2.0 \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 0f6fca68b2b..dd96990750e 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -6,6 +6,7 @@ caliber = "38" origin_tech = "combat=2;materials=2" ammo_type = "/obj/item/ammo_casing/c38" + w_class = 3.0 special_check(var/mob/living/carbon/human/M) @@ -77,6 +78,7 @@ desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo." //>10mm hole >.357 icon_state = "mateba" origin_tech = "combat=2;materials=2" + w_class = 3.0 // A gun to play Russian Roulette! // You can spin the chamber to randomize the position of the bullet. @@ -84,8 +86,10 @@ /obj/item/weapon/gun/projectile/russian name = "Russian Revolver" desc = "A Russian made revolver. Uses .357 ammo. It has a single slot in it's chamber for a bullet." + icon_state = "revolver" max_shells = 6 origin_tech = "combat=2;materials=2" + w_class = 3.0 /obj/item/weapon/gun/projectile/russian/New() Spin() diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index e9d1940dd33..fc60560ac68 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ