Fixes

shiptest-ss13 · Oct 5, 2024 · f2d9803 · f2d9803
1 parent 20ddf05
commit f2d9803
Show file tree

Hide file tree

Showing 18 changed files with 994 additions and 614 deletions.
diff --git a/code/game/objects/items/melee/weaponry.dm b/code/game/objects/items/melee/weaponry.dm
@@ -75,7 +75,7 @@
 /obj/item/throwing_star/magspear
 	name = "magnetic spear"
 	desc = "A reusable spear that is typically loaded into kinetic spearguns."
-	icon = 'icons/obj/ammo_bullets.dmi'
+	icon = 'icons/obj/ammunition/ammo_bullets.dmi'
 	icon_state = "magspear"
 	throwforce = 25 //kills regular carps in one hit
 	force = 10

diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm
@@ -30,10 +30,7 @@
 	backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
 	/obj/item/storage/box/teargas = 1,
 	/obj/item/storage/box/flashbangs = 1,
-	/obj/item/shield/riot/tele = 1,
-	/obj/item/ammo_box/magazine/m45 = 3,
-	/obj/item/ammo_box/c45 = 2)
-
+	/obj/item/shield/riot/tele = 1)
 
 /datum/outfit/families_police/beatcop/armored
 	name = "Families: Armored Beat Cop"
@@ -53,8 +50,7 @@
 	backpack_contents = list(/obj/item/storage/box/handcuffs = 1,
 	/obj/item/storage/box/teargas = 1,
 	/obj/item/storage/box/flashbangs = 1,
-	/obj/item/shield/riot/tele = 1,
-	/obj/item/storage/box/lethalshot = 2)
+	/obj/item/shield/riot/tele = 1)
 
 /datum/outfit/families_police/beatcop/fbi
 	name = "Families: Space FBI Officer"
@@ -65,8 +61,7 @@
 	/obj/item/storage/box/teargas = 1,
 	/obj/item/storage/box/flashbangs = 1,
 	/obj/item/shield/riot/tele = 1,
-	/obj/item/ammo_box/magazine/smgm9mm = 3,
-	/obj/item/ammo_box/c9mm = 2)
+	/obj/item/ammo_box/magazine/smgm9mm = 3)
 
 /datum/outfit/families_police/beatcop/military
 	name = "Families: Space Military"

diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm
@@ -89,11 +89,11 @@
 			var/loops = rand(1,3)
 			for(var/i in 1 to loops)
 				var/ammotype = pick(list(
-					/obj/item/ammo_box/c8x50mm_box,
-					/obj/item/ammo_box/c45,
-					/obj/item/ammo_box/a357_box,
-					/obj/item/ammo_box/c45,
-					/obj/item/ammo_box/a4570,
+					/obj/item/storage/box/ammo/a8_50r,
+					/obj/item/storage/box/ammo/c45,
+					/obj/item/storage/box/ammo/a357,
+					/obj/item/storage/box/ammo/c45,
+					/obj/item/storage/box/ammo/a4570,
 					/obj/item/stock_parts/cell/gun/mini))
 				backpack_contents += ammotype
 

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -461,8 +461,8 @@
 			/obj/item/assembly/flash/handheld = 5,
 			/obj/item/storage/box/evidence = 6,
 			/obj/item/flashlight/seclite = 4,
-			/obj/item/ammo_box/c9mm/rubbershot = 3,
-			/obj/item/ammo_box/c9mm = 1,
+			/obj/item/storage/box/ammo/c9mm_rubber = 3,
+			/obj/item/storage/box/ammo/c9mm = 1,
 			/obj/item/stock_parts/cell/gun = 3,
 			/obj/item/coin/antagtoken = 1,
 			/obj/item/grenade/stingbang = 1

diff --git a/code/modules/projectiles/ammunition/_ammo_casing.dm b/code/modules/projectiles/ammunition/_ammo_casing.dm
@@ -167,7 +167,7 @@
 	desc = "[initial(desc)][BB ? null : " This one is spent."]"
 	return ..()
 
-//proc to magically refill a casing with a new projectile
+///Proc to magically refill a casing with a new projectile
 /obj/item/ammo_casing/proc/newshot() //For energy weapons, syringe gun, shotgun shells and wands (!).
 	if(!BB)
 		BB = new projectile_type(src, src)

diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm
@@ -58,7 +58,7 @@
 	name = "9mm armor-piercing bullet casing"
 	desc = "A 9mm armor-piercing bullet casing."
 	bullet_skin = "ap"
-	projectile_type =/obj/projectile/bullet/c9mm/ap
+	projectile_type = /obj/projectile/bullet/c9mm/ap
 
 /obj/item/ammo_casing/c9mm/hp
 	name = "9mm hollow point bullet casing"