diff --git a/code/datums/ammo/bullet/revolver.dm b/code/datums/ammo/bullet/revolver.dm index 83a8bee01b..654aceed7a 100644 --- a/code/datums/ammo/bullet/revolver.dm +++ b/code/datums/ammo/bullet/revolver.dm @@ -120,7 +120,7 @@ name = "small revolver bullet" headshot_state = HEADSHOT_OVERLAY_LIGHT - damage = 70 + damage = 45 penetration = ARMOR_PENETRATION_TIER_3 @@ -128,7 +128,7 @@ name = "small hollowpoint revolver bullet" headshot_state = HEADSHOT_OVERLAY_MEDIUM - damage = 85 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong + damage = 75 // way too strong because it's hard to make a good balance between HP and normal with this system, but the damage falloff is really strong penetration = 0 damage_falloff = DAMAGE_FALLOFF_TIER_6 diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index a4db22b49d..42aa2e13b8 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -32,13 +32,13 @@ list("SIDEARMS", -1, null, null), list("88 Mod 4 Combat Pistol", round(scale * 25), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Combat Revolver", round(scale * 25), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR), + list("M44 Combat Revolver", round(scale * 25), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), list("M4A3 Service Pistol", round(scale * 25), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), list("M82F Flare Gun", round(scale * 10), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), list("88M4 AP Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR), + list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 25), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", -1, null, null), @@ -434,14 +434,14 @@ list("SIDEARMS", -1, null, null), list("88 Mod 4 Combat Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Combat Revolver", round(scale * 2), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR), + list("M44 Combat Revolver", round(scale * 2), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), list("M4A3 Service Pistol", round(scale * 2), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), list("VP78 pistol", round(scale * 2), /obj/item/weapon/gun/pistol/vp78, VENDOR_ITEM_REGULAR), list("M82F Flare Gun", round(scale * 1), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR), + list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), @@ -552,7 +552,7 @@ list("SIDEARMS", -1, null, null), //forecon loves their pistols list("M48A4 Service Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/m1911/socom, VENDOR_ITEM_REGULAR), list("88 Mod 4 Combat Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Combat Revolver", round(scale * 5), /obj/item/weapon/gun/revolver/cmb/marine, VENDOR_ITEM_REGULAR), + list("M44 Combat Revolver", round(scale * 5), /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), list("M4A3 Service Pistol", round(scale * 5), /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), list("VP78 pistol", round(scale * 5), /obj/item/weapon/gun/pistol/vp78, VENDOR_ITEM_REGULAR), list("M82F Flare Gun", round(scale * 3), /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), @@ -560,7 +560,7 @@ list("SIDEARM AMMUNITION", -1, null, null), list("M1911 Magazine (.45)", round(scale * 20), /obj/item/ammo_magazine/pistol/m1911, VENDOR_ITEM_REGULAR), list("88M4 AP Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/mod88, VENDOR_ITEM_REGULAR), - list("SA .357 Speedloader (.357)", round(scale * 20), /obj/item/ammo_magazine/revolver/cmb/normalpoint, VENDOR_ITEM_REGULAR), + list("M44 Speedloader (.44)", round(scale * 20), /obj/item/ammo_magazine/revolver, VENDOR_ITEM_REGULAR), list("M4A3 Magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol, VENDOR_ITEM_REGULAR), list("VP78 magazine (9mm)", round(scale * 20), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR), @@ -639,7 +639,8 @@ list("M37 Wooden Stock", round(scale * 1.5), /obj/item/attachable/stock/shotgun, VENDOR_ITEM_REGULAR), list("M39 Arm Brace", round(scale * 1.5), /obj/item/attachable/stock/smg/collapsible/brace, VENDOR_ITEM_REGULAR), list("M39 Stock", round(scale * 1.5), /obj/item/attachable/stock/smg, VENDOR_ITEM_REGULAR), - list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR) + list("M41A Solid Stock", round(scale * 1.5), /obj/item/attachable/stock/rifle, VENDOR_ITEM_REGULAR), + list("M44 Magnum Sharpshooter Stock", round(scale * 1.5), /obj/item/attachable/stock/revolver, VENDOR_ITEM_REGULAR) ) //------------ESSENTIAL SETS--------------- diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 8317ced831..0e7ff3c9af 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -746,14 +746,3 @@ /obj/item/weapon/gun/revolver/cmb/normalpoint current_mag = /obj/item/ammo_magazine/internal/revolver/cmb - -//------------------------------------------------------- -//MARINE REVOLVER //Spearhead exists in Alien cannon, this one is based on the Dark Descent model. - -/obj/item/weapon/gun/revolver/cmb/marine - name = "\improper SA .357" - desc = "An automatic revolver chambered in .357, recognizably similar to its civilian counterpart. In Limited Service with the USCM, typically provided to more veteran units." - icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' - icon_state = "mspearhead" - item_state = "mspearhead" - current_mag = /obj/item/ammo_magazine/internal/revolver/cmb diff --git a/code/modules/projectiles/magazines/revolvers.dm b/code/modules/projectiles/magazines/revolvers.dm index 6ab7ba3b8c..7d56612530 100644 --- a/code/modules/projectiles/magazines/revolvers.dm +++ b/code/modules/projectiles/magazines/revolvers.dm @@ -90,7 +90,7 @@ /obj/item/ammo_magazine/revolver/cmb/normalpoint //put these in the marshal ert - ok sure :) name = "\improper Spearhead speed loader (.357)" - desc = "A speedloader of 6 FMJ .357 bullets, uncommonly issued to Colonial Marshals due to overpenetration risks but service standard for the USCM." + desc = "A speedloader of 6 FMJ .357 bullets, uncommonly issued to Colonial Marshals due to overpenetration risks." default_ammo = /datum/ammo/bullet/revolver/small icon_state = "cmb" diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 8a56376cdf..37b5f9bcc6 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index a81a34ff27..3ad8b52d04 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi index c12cc0d122..caa62ef556 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/colony.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi index dc0510ff4b..52ea934b17 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi differ