From 0b4dcfd73a3486e4064840135d655d1d71a30f7f Mon Sep 17 00:00:00 2001 From: Elizabeth Lavenza Date: Tue, 16 Apr 2024 02:10:25 -0400 Subject: [PATCH] Fix invalid gun overlays --- code/modules/projectiles/guns/ballistic/launchers.dm | 1 + code/modules/projectiles/guns/ballistic/magweapon.dm | 1 + code/modules/projectiles/guns/ballistic/toy.dm | 1 + code/modules/projectiles/guns/energy/pulse.dm | 1 + .../code/modules/projectiles/guns/ballistic/rifles.dm | 4 +++- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index 10a6eea89d..f4fc9b8f43 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -41,6 +41,7 @@ fire_delay = 0 fire_select_modes = list(SELECT_SEMI_AUTOMATIC) casing_ejector = FALSE + automatic_burst_overlay = FALSE /obj/item/gun/ballistic/automatic/gyropistol/update_icon_state() icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]" diff --git a/code/modules/projectiles/guns/ballistic/magweapon.dm b/code/modules/projectiles/guns/ballistic/magweapon.dm index cdb88f754a..6efe73f931 100644 --- a/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -18,6 +18,7 @@ dualwield_spread_mult = 1.4 weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY + automatic_burst_overlay = FALSE var/obj/item/stock_parts/cell/cell var/cell_type = /obj/item/stock_parts/cell/magnetic diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index a72a172891..cd3473f8fc 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -128,6 +128,7 @@ weapon_weight = WEAPON_MEDIUM dualwield_spread_mult = 1.4 w_class = WEIGHT_CLASS_BULKY + automatic_burst_overlay = FALSE /obj/item/gun/ballistic/shotgun/toy/mag name = "foam force magpistol" diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index a34a551cc2..691f15e746 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -77,3 +77,4 @@ icon_state = "m1911" item_state = "gun" cell_type = /obj/item/stock_parts/cell/infinite + modifystate = FALSE diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm index e89bb92b33..44ebec0399 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm @@ -15,6 +15,7 @@ fire_delay = 1 spread = 30 //should be 40 for XCOM memes, but since its adminspawn only, might as well make it useable recoil = 1 + automatic_burst_overlay = FALSE ///toy memes/// @@ -98,7 +99,7 @@ wound_bonus = 15 sharpness = SHARP_EDGED wound_falloff_tile = 0 - + ///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)/// /obj/item/ammo_casing/caseless/flechetteap @@ -271,3 +272,4 @@ w_class = WEIGHT_CLASS_NORMAL burst_size = 4 //Shh. fire_delay = 1 + automatic_burst_overlay = FALSE