yea

shiptest-ss13 · Sep 5, 2024 · 960454e · 960454e
1 parent ef1aa05
commit 960454e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
@@ -208,7 +208,7 @@
 			if (num_loaded)
 				to_chat(user, "<span class='notice'>You load [num_loaded] [cartridge_wording]\s into \the [src].</span>")
 				playsound(src, load_sound, load_sound_volume, load_sound_vary)
-				if (!chambered && !(reciever_flags & AMMO_RECIEVER_REQUIRES_UNIQUE_ACTION) && !(reciever_flags & AMMO_RECIEVER_CYCLE_ONLY_BEFORE_FIRE))
+				if (chambered == null && bolt_type == BOLT_TYPE_NO_BOLT)
 					chamber_round()
 				new_mag.update_appearance()
 				update_appearance()

diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -10,7 +10,7 @@
 	icon_state = "cm23"
 	item_state = "clip_generic"
 	w_class = WEIGHT_CLASS_NORMAL
-	mag_type = /obj/item/ammo_box/magazine/cm23
+	default_ammo_type = /obj/item/ammo_box/magazine/cm23
 //	can_suppress = FALSE
 	fire_sound = 'sound/weapons/gun/pistol/cm23.ogg'
 	rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
@@ -46,7 +46,7 @@
 
 	icon_state = "cm70"
 	item_state = "clip_generic"
-	mag_type = /obj/item/ammo_box/magazine/m9mm_cm70
+	default_ammo_type = /obj/item/ammo_box/magazine/m9mm_cm70
 //	can_suppress = FALSE
 	burst_size = 3
 	burst_delay = 0.1 SECONDS
@@ -89,7 +89,7 @@
 	icon_state = "cm5"
 	item_state = "cm5"
 
-	mag_type = /obj/item/ammo_box/magazine/cm5_9mm
+	default_ammo_type = /obj/item/ammo_box/magazine/cm5_9mm
 	bolt_type = BOLT_TYPE_CLIP
 	weapon_weight = WEAPON_LIGHT
 	fire_sound = 'sound/weapons/gun/smg/cm5.ogg'
@@ -230,7 +230,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 	weapon_weight = WEAPON_MEDIUM
 	w_class = WEIGHT_CLASS_BULKY
 	bolt_type = BOLT_TYPE_CLIP
-	mag_type = /obj/item/ammo_box/magazine/f4_308
+	default_ammo_type = /obj/item/ammo_box/magazine/f4_308
 	fire_sound = 'sound/weapons/gun/rifle/f4.ogg'
 	burst_size = 0
 	actions_types = list()
@@ -285,7 +285,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 
 	fire_sound = 'sound/weapons/gun/sniper/cmf90.ogg'
 
-	mag_type = /obj/item/ammo_box/magazine/f90
+	default_ammo_type = /obj/item/ammo_box/magazine/f90
 	bolt_type = BOLT_TYPE_CLIP
 
 	fire_delay = 1 SECONDS
@@ -330,7 +330,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	bolt_type = BOLT_TYPE_CLIP
-	mag_type = /obj/item/ammo_box/magazine/p16
+	default_ammo_type = /obj/item/ammo_box/magazine/p16
 	spread = 2
 	wield_delay = 0.5 SECONDS
 
@@ -393,7 +393,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 	w_class = WEIGHT_CLASS_BULKY
 	slot_flags = ITEM_SLOT_BACK
 	manufacturer = MANUFACTURER_MINUTEMAN
-	mag_type = /obj/item/ammo_box/magazine/cm40_762_40_box
+	default_ammo_type = /obj/item/ammo_box/magazine/cm40_762_40_box
 
 	spread = 10
 	spread_unwielded = 35
@@ -449,7 +449,7 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 
 	weapon_weight = WEAPON_MEDIUM
 //	can_suppress = FALSE
-	mag_type = /obj/item/ammo_box/magazine/cm15_12g
+	default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g
 
 	empty_indicator = FALSE
 	unique_mag_sprites_for_variants = FALSE

diff --git a/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm b/code/modules/projectiles/guns/manufacturer/frontier_import/ballistics.dm
@@ -9,7 +9,7 @@
 	icon_state = "mauler"
 	item_state = "hp_generic"
 	w_class = WEIGHT_CLASS_NORMAL
-	mag_type = /obj/item/ammo_box/magazine/m9mm_mauler
+	default_ammo_type = /obj/item/ammo_box/magazine/m9mm_mauler
 	fire_delay = 0.06 SECONDS
 
 	gun_firemodes = list(FIREMODE_FULLAUTO)
@@ -58,7 +58,7 @@
 
 	icon_state = "spitter"
 	item_state = "spitter"
-	mag_type = /obj/item/ammo_box/magazine/spitter_9mm
+	default_ammo_type = /obj/item/ammo_box/magazine/spitter_9mm
 	bolt_type = BOLT_TYPE_OPEN
 	weapon_weight = WEAPON_LIGHT
 	show_magazine_on_sprite = TRUE
@@ -133,7 +133,7 @@
 
 	icon_state = "pounder"
 	item_state = "pounder"
-	mag_type = /obj/item/ammo_box/magazine/c22lr_pounder_pan
+	default_ammo_type = /obj/item/ammo_box/magazine/c22lr_pounder_pan
 	burst_size = 1
 	fire_delay = 0.05 SECONDS
 	spread = 25
@@ -180,7 +180,7 @@
 
 	icon_state = "shredder"
 	item_state = "shredder"
-	mag_type = /obj/item/ammo_box/magazine/m12_shredder
+	default_ammo_type = /obj/item/ammo_box/magazine/m12_shredder
 	spread = 15
 	recoil = 2
 	recoil_unwielded = 7