cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some burst fire related oddities (#20072)

Browse Source 
* brug

* who is this burst fire guy

* fixes the pistols
This commit is contained in:
Paxilmaniac
2023-03-27 04:07:16 +01:00
committed by GitHub
parent 2a97682387
commit e0d6a8985f
9 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic/pistol.dm
+2 -1
View File
@@ -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
modular_skyrat/modules/assault_operatives/code/equipment_items/guns.dm
+2
View File
@@ -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()
modular_skyrat/modules/black_mesa/code/m16_variations.dm
+1
View File
@@ -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'
modular_skyrat/modules/gunsgalore/code/guns/akm.dm
+1 -2
View File
@@ -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
modular_skyrat/modules/gunsgalore/code/guns/stg.dm
+1
View File
@@ -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
modular_skyrat/modules/marines/code/smartgun.dm
+1
View File
@@ -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
modular_skyrat/modules/modular_weapons/code/rifle.dm
+1
View File
@@ -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
modular_skyrat/modules/sec_haul/code/guns/cmg.dm
+1
View File
@@ -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
modular_skyrat/modules/sec_haul/code/guns/guns.dm
+8
View File
@@ -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'