two tweaks to fix bugs with null default_ammo_types

shiptest-ss13 · Sep 25, 2024 · 836139b · 836139b
1 parent 407153a
commit 836139b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
@@ -40,7 +40,7 @@
 		bolt_locked = TRUE
 		update_appearance()
 		return
-	if (!magazine)
+	if (!magazine && default_ammo_type)
 		magazine = new default_ammo_type(src)
 	if (!default_ammo_type)
 		get_ammo_list (drop_all = TRUE)

diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
@@ -61,8 +61,6 @@
 	. = ..()
 	if(default_ammo_type)
 		cell = new default_ammo_type(src)
-	else
-		cell = new(src)
 	if(dead_cell)
 		cell.use(cell.maxcharge)
 	update_ammo_types()