From 5c4afa51ecccc05b4f6bb35348e1bb73c3516138 Mon Sep 17 00:00:00 2001 From: benj8560 Date: Mon, 22 Jan 2024 05:15:41 -0500 Subject: [PATCH] fixes hopefully the last of frameless weapons. (#4961) * fixes hopefully the last of frameless weapons. most likely fixes the last of the deconstructable frameless weapons. Being the pilgrim and the many bluecrosses that needed it. * Update breakaction.dm * Update flaregun.dm REALLY!? --- code/modules/projectiles/guns/oddity_items.dm | 7 +++++++ .../projectiles/guns/projectile/boltgun/flaregun.dm | 1 + .../projectiles/guns/projectile/revolver/breakaction.dm | 2 ++ .../modules/projectiles/guns/projectile/revolver/lemant.dm | 2 ++ 4 files changed, 12 insertions(+) diff --git a/code/modules/projectiles/guns/oddity_items.dm b/code/modules/projectiles/guns/oddity_items.dm index 5c00f08fb2d..4fc4af733b1 100644 --- a/code/modules/projectiles/guns/oddity_items.dm +++ b/code/modules/projectiles/guns/oddity_items.dm @@ -21,6 +21,7 @@ max_shells = 60 init_recoil = RIFLE_RECOIL(1.1) price_tag = 3000 + gun_parts = null serial_type = "BlueCross" /obj/item/gun/projectile/revolver/mistral/elite/New() @@ -44,6 +45,7 @@ penetration_multiplier = 2 init_recoil = RIFLE_RECOIL(4) price_tag = 3250 + gun_parts = null gun_tags = list(GUN_PROJECTILE, GUN_INTERNAL_MAG) //Regains its internal mag due to its more annoying way of reloading serial_type = "BlueCross" icon = 'icons/obj/guns/projectile/sawnoff/bluecross_shotgun.dmi' @@ -155,6 +157,7 @@ penetration_multiplier = 2 max_shells = 1 price_tag = 2750 + gun_parts = null sharp = FALSE saw_off = FALSE serial_type = "BlueCross" @@ -165,6 +168,7 @@ A small red eye has been painted onto the firing pin of this formerly undepowered pistol, this one has been modified with a better feed mechanism to allow \ for deadlier shots. Uses 9mm rounds and can take standard pistol magazines, high cap magazines, or submachine gun mags." price_tag = 2000 + gun_parts = null mag_well = MAG_WELL_PISTOL | MAG_WELL_H_PISTOL | MAG_WELL_SMG damage_multiplier = 1.5 icon = 'icons/obj/guns/projectile/clarissa.dmi' @@ -187,6 +191,7 @@ max_shells = 4 init_recoil = HMG_RECOIL(2) price_tag = 3000 + gun_parts = null serial_type = "BlueCross" /obj/item/gun/projectile/automatic/slaught_o_matic/lockpickomatic @@ -250,6 +255,7 @@ origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) matter = list(MATERIAL_PLASTEEL = 12, MATERIAL_PLASTIC = 6) price_tag = 1420 + gun_parts = null fire_sound = 'sound/weapons/guns/fire/9mm_pistol.ogg' can_dual = TRUE load_method = MAGAZINE @@ -291,6 +297,7 @@ origin_tech = list(TECH_MAGNET = 10) //3500 points for rnd, eh its meant to stay in player hands not be deconned matter = list(MATERIAL_PLASTEEL = 20, MATERIAL_GOLD = 10, MATERIAL_SILVER = 10, MATERIAL_GLASS = 10, MATERIAL_PLATINUM = 8) price_tag = 2450 + gun_parts = null fire_sound = 'sound/weapons/guns/fire/9mm_pistol.ogg' can_dual = TRUE load_method = MAGAZINE diff --git a/code/modules/projectiles/guns/projectile/boltgun/flaregun.dm b/code/modules/projectiles/guns/projectile/boltgun/flaregun.dm index bc320afb6a0..4603bab286e 100644 --- a/code/modules/projectiles/guns/projectile/boltgun/flaregun.dm +++ b/code/modules/projectiles/guns/projectile/boltgun/flaregun.dm @@ -22,6 +22,7 @@ eject_animatio = FALSE //TODO: this gun_tags = list(GUN_PROJECTILE, GUN_SCOPE) //We cant be overshooter or sharpened, but we can take a scope! price_tag = 30 + gun_parts = null //no free mosin! serial_type = "H&S" diff --git a/code/modules/projectiles/guns/projectile/revolver/breakaction.dm b/code/modules/projectiles/guns/projectile/revolver/breakaction.dm index b9b8011b212..00209f28017 100644 --- a/code/modules/projectiles/guns/projectile/revolver/breakaction.dm +++ b/code/modules/projectiles/guns/projectile/revolver/breakaction.dm @@ -11,6 +11,7 @@ max_shells = 6 matter = list(MATERIAL_PLASTEEL = 14, MATERIAL_WOOD = 6) price_tag = 700 + gun_parts = null damage_multiplier = 1.4 penetration_multiplier = 1.3 init_recoil = HANDGUN_RECOIL(1.2) @@ -53,6 +54,7 @@ fire_sound = 'sound/weapons/guns/fire/9mm_revolver.ogg' matter = list(MATERIAL_PLASTEEL = 10, MATERIAL_WOOD = 6) price_tag = 300 + gun_parts = null damage_multiplier = 1.2 penetration_multiplier = 1.3 init_recoil = HANDGUN_RECOIL(1.1) diff --git a/code/modules/projectiles/guns/projectile/revolver/lemant.dm b/code/modules/projectiles/guns/projectile/revolver/lemant.dm index e3ceff31538..acd4682fc2e 100644 --- a/code/modules/projectiles/guns/projectile/revolver/lemant.dm +++ b/code/modules/projectiles/guns/projectile/revolver/lemant.dm @@ -12,6 +12,7 @@ max_shells = 9 matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_PLASTIC = 8) price_tag = 450 + gun_parts = null damage_multiplier = 1.2 penetration_multiplier = 1.1 init_recoil = HANDGUN_RECOIL(0.8) @@ -181,6 +182,7 @@ max_shells = 9 matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_PLASTIC = 8) price_tag = 700 + gun_parts = null damage_multiplier = 1.3 penetration_multiplier = 1.2 init_recoil = HANDGUN_RECOIL(1.1)