woah

shiptest-ss13 · Jan 10, 2024 · eaadd70 · eaadd70
1 parent 2c8def4
commit eaadd70
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_maps/shuttles/roumain/srm_glaive.dmm b/_maps/shuttles/roumain/srm_glaive.dmm
@@ -979,7 +979,7 @@
 /obj/item/borg/upgrade/modkit/indoors,
 /obj/item/gun/energy/kinetic_accelerator,
 /obj/item/storage/bag/ore,
-/obj/item/gun/ballistic/shotgun/flamingarrow/mk1,
+/obj/item/gun/ballistic/shotgun/flamingarrow/bolt,
 /obj/item/shovel,
 /obj/item/gps/mining,
 /obj/structure/closet/secure_closet/miningcloset,
@@ -2835,7 +2835,7 @@
 	},
 /obj/item/circuitboard/machine/rdserver,
 /obj/item/circuitboard/machine/autolathe,
-/obj/item/disk/design_disk/ammo_n762,
+/obj/item/ammo_box/c38_box,
 /obj/item/disk/design_disk/ammo_1911,
 /obj/item/circuitboard/machine/protolathe/department/ballistics,
 /obj/item/circuitboard/computer/rdconsole,

diff --git a/code/modules/projectiles/guns/ballistic/assault.dm b/code/modules/projectiles/guns/ballistic/assault.dm
@@ -316,7 +316,6 @@
 	manufacturer = MANUFACTURER_HUNTERSPRIDE
 
 	rack_sound = 'sound/weapons/gun/rifle/ar_cock.ogg'
-	eject_sound_vary = FALSE
 
 	spread_unwielded = 25
 	recoil = 0

diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -82,6 +82,7 @@
 	internal_magazine = FALSE
 	mag_type = /obj/item/ammo_box/magazine/illestren_a850r
 	empty_autoeject = TRUE
+	eject_sound_vary = FALSE
 	can_be_sawn_off = TRUE
 	manufacturer = MANUFACTURER_HUNTERSPRIDE