TGS Test Merge (#1495)

BlueMoon-Labs · Dec 30, 2024 · 578ba9f · 578ba9f
2 parents 2983888 + b6d2f28
commit 578ba9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm b/modular_bluemoon/kovac_shitcode/code/modules/guns/weapons.dm
@@ -97,6 +97,9 @@
 	automatic_burst_overlay = TRUE
 	spawnwithmagazine = FALSE
 	fire_sound = 'modular_bluemoon/kovac_shitcode/sound/weapons/g22.ogg'
+	can_flashlight = 1
+	flight_x_offset = 18
+	flight_y_offset = 14
 
 /obj/item/gun/ballistic/automatic/pistol/g22/update_icon_state()
 	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"

diff --git a/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm b/modular_splurt/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -45,6 +45,11 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	mag_type = /obj/item/ammo_box/magazine/e45
 	can_suppress = TRUE
+	burst_shot_delay = 2
+	burst_size = 2
+	fire_delay = 2.5
+	fire_select_modes = list(SELECT_SEMI_AUTOMATIC, SELECT_BURST_SHOT, SELECT_FULLY_AUTOMATIC)
+	automatic_burst_overlay = TRUE
 	can_flashlight = 1
 	flight_x_offset = 18
 	flight_y_offset = 14