yea

shiptest-ss13 · Sep 5, 2024 · 302aa94 · 302aa94
1 parent 6981d3b
commit 302aa94
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm b/_maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
@@ -1116,7 +1116,7 @@
 /area/ruin/unpowered/listening_post)
 "te" = (
 /obj/item/gun/ballistic/automatic/smg/c20r{
-	spawnwithmagazine = 0
+	default_ammo_type = null
 	},
 /obj/item/ammo_box/magazine/smgm45{
 	start_empty = 1

diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm
@@ -722,7 +722,7 @@
 	},
 /obj/item/ammo_box/a12g/rubbershot,
 /obj/item/gun/ballistic/shotgun/doublebarrel/presawn{
-	spawnwithmagazine = 0
+	default_ammo_type = null
 	},
 /obj/structure/cable/pink{
 	icon_state = "4-10"

diff --git a/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm b/code/modules/projectiles/guns/manufacturer/clip_lanchester/ballistics.dm
@@ -435,8 +435,6 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 	righthand_file = 'icons/obj/guns/manufacturer/clip_lanchester/righthand.dmi'
 	mob_overlay_icon = 'icons/obj/guns/manufacturer/clip_lanchester/onmob.dmi'
 
-
-
 	icon_state = "cm15"
 	item_state = "cm15"
 
@@ -446,7 +444,6 @@ EMPTY_GUN_HELPER(automatic/smg/cm5)
 	manufacturer = MANUFACTURER_MINUTEMAN
 
 	weapon_weight = WEAPON_MEDIUM
-//	can_suppress = FALSE
 	default_ammo_type = /obj/item/ammo_box/magazine/cm15_12g
 
 	empty_indicator = FALSE