diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index fed8df4d2c7..4090e6f2dc3 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -8,6 +8,7 @@ can_suppress = TRUE burst_size = 1 fire_delay = 0 + actions_types = list() bolt_type = BOLT_TYPE_LOCKING fire_sound = 'sound/weapons/gun/pistol/shot.ogg' dry_fire_sound = 'sound/weapons/gun/pistol/dry_fire.ogg' @@ -94,7 +95,7 @@ burst_size = 3 fire_delay = 3 //SKYRAT EDIT - Original: 1 spread = 10 - //actions_types = list(/datum/action/item_action/toggle_firemode) SKYRAT EDIT REMOVAL + actions_types = list(/datum/action/item_action/toggle_firemode) suppressor_x_offset = 6 /obj/item/gun/ballistic/automatic/pistol/stickman diff --git a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm index d752943e40a..7fd189a73c6 100644 --- a/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm +++ b/modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm @@ -93,6 +93,7 @@ burst_size = 1 fire_delay = 0.8 projectile_damage_multiplier = 0.6 + actions_types = list() pin = /obj/item/firing_pin/implant/pindicate /obj/item/gun/ballistic/automatic/assault_ops_smg/Initialize(mapload) @@ -148,6 +149,7 @@ suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' burst_size = 1 fire_delay = 1.5 + actions_types = list() pin = /obj/item/firing_pin/implant/pindicate /obj/item/gun/ballistic/automatic/assault_ops_shotgun/give_manufacturer_examine() diff --git a/modular_skyrat/modules/black_mesa/code/m16_variations.dm b/modular_skyrat/modules/black_mesa/code/m16_variations.dm index c6880490811..0df517e498d 100644 --- a/modular_skyrat/modules/black_mesa/code/m16_variations.dm +++ b/modular_skyrat/modules/black_mesa/code/m16_variations.dm @@ -14,6 +14,7 @@ mag_type = /obj/item/ammo_box/magazine/m16/vintage/oldarms fire_delay = 3.5 burst_size = 1 + actions_types = list() fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/m16_fire.ogg' fire_sound_volume = 50 rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/sfrifle_cock.ogg' diff --git a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm index 3c73de359d7..10f2c5eb905 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/akm.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/akm.dm @@ -11,8 +11,8 @@ weapon_weight = WEAPON_HEAVY mag_type = /obj/item/ammo_box/magazine/akm can_suppress = FALSE - burst_size = 3 fire_delay = 2 + actions_types = list() worn_icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_back.dmi' worn_icon_state = "akm" fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/akm_fire.ogg' @@ -96,7 +96,6 @@ icon_state = "akm_civ" inhand_icon_state = "akm_civ" mag_type = /obj/item/ammo_box/magazine/akm/civvie - burst_size = 1 fire_delay = 5 dual_wield_spread = 15 spread = 5 diff --git a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm index 95a7c6f913c..1ab3bf30c32 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/stg.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/stg.dm @@ -15,6 +15,7 @@ can_suppress = FALSE fire_delay = 1.5 burst_size = 1 + actions_types = list() fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/stg_fire.ogg' fire_sound_volume = 70 alt_icons = TRUE diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm index e3a407b1e06..1efac35d0e0 100644 --- a/modular_skyrat/modules/marines/code/smartgun.dm +++ b/modular_skyrat/modules/marines/code/smartgun.dm @@ -24,6 +24,7 @@ show_bolt_icon = FALSE tac_reloads = FALSE burst_size = 1 + actions_types = list() pin = /obj/item/firing_pin/implant/mindshield mag_display_ammo = FALSE mag_display = FALSE diff --git a/modular_skyrat/modules/modular_weapons/code/rifle.dm b/modular_skyrat/modules/modular_weapons/code/rifle.dm index 6f26f8bab0b..8a91157d70f 100644 --- a/modular_skyrat/modules/modular_weapons/code/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/rifle.dm @@ -17,6 +17,7 @@ fire_delay = 5 can_suppress = FALSE burst_size = 1 + actions_types = list() mag_display = FALSE mag_display_ammo = FALSE empty_indicator = FALSE diff --git a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm index 707199535f8..724020aab2f 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/cmg.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/cmg.dm @@ -14,6 +14,7 @@ mag_type = /obj/item/ammo_box/magazine/multi_sprite/cmg fire_delay = 2 //Slightly buffed firespeed over the last cmg because the bullets are a bit weaker burst_size = 1 + actions_types = list() can_bayonet = TRUE knife_x_offset = 26 knife_y_offset = 10 diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm index 326e8d5401f..a5087554044 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm @@ -60,6 +60,7 @@ burst_size = 3 fire_delay = 2.10 spread = 8 + actions_types = list(/datum/action/item_action/toggle_firemode) mag_display = FALSE mag_display_ammo = FALSE projectile_damage_multiplier = 0.5 @@ -183,6 +184,7 @@ burst_size = 3 fire_delay = 2 spread = 5 + actions_types = list(/datum/action/item_action/toggle_firemode) /obj/item/ammo_box/magazine/multi_sprite/pdh_corpo name = "\improper PDH-6M magazine" @@ -213,6 +215,7 @@ burst_size = 3 fire_delay = 2 spread = 9 + actions_types = list(/datum/action/item_action/toggle_firemode) /obj/item/ammo_box/magazine/multi_sprite/pdh_striker name = "\improper PDH-6M magazine" @@ -465,6 +468,7 @@ burst_size = 3 fire_delay = 2.10 spread = 25 + actions_types = list(/datum/action/item_action/toggle_firemode) mag_display = FALSE mag_display_ammo = FALSE @@ -509,6 +513,7 @@ mag_display_ammo = FALSE burst_size = 2 fire_delay = 1.90 + actions_types = list(/datum/action/item_action/toggle_firemode) fire_sound = 'sound/weapons/gun/rifle/shot.ogg' rack_sound = 'sound/weapons/gun/smg/smgrack.ogg' lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' @@ -892,6 +897,7 @@ fire_sound = 'modular_skyrat/modules/sec_haul/sound/ltrifle_fire.ogg' burst_size = 1 fire_delay = 10 + actions_types = list() /obj/item/gun/ballistic/automatic/norwind/Initialize(mapload) . = ..() @@ -1059,6 +1065,7 @@ can_suppress = FALSE burst_size = 3 spread = 15 + actions_types = list(/datum/action/item_action/toggle_firemode) mag_display = TRUE mag_display_ammo = TRUE fire_sound = 'modular_skyrat/modules/sec_haul/sound/sfrifle_fire.ogg' @@ -1121,6 +1128,7 @@ fire_delay = 2 can_suppress = FALSE burst_size = 2 + actions_types = list(/datum/action/item_action/toggle_firemode) mag_display = TRUE mag_display_ammo = TRUE fire_sound = 'sound/weapons/gun/smg/shot.ogg'