From ee83b4da1411691af419fa008d0c86d66d518207 Mon Sep 17 00:00:00 2001 From: Trilby Date: Sat, 21 Dec 2024 19:27:53 -0500 Subject: [PATCH] Fabricator conistanty --- code/game/machinery/autolathe/fabricators.dm | 235 +++++++++---------- 1 file changed, 117 insertions(+), 118 deletions(-) diff --git a/code/game/machinery/autolathe/fabricators.dm b/code/game/machinery/autolathe/fabricators.dm index 6c21b203f4b..f55a22c61da 100644 --- a/code/game/machinery/autolathe/fabricators.dm +++ b/code/game/machinery/autolathe/fabricators.dm @@ -19,88 +19,88 @@ var/list/recipes = list( "9mm Speed Loader", - list(name="Speed Loader (9mm Special)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35), - list(name="Speed Loader (9mm high-velocity)", cost=50, path=/obj/item/ammo_magazine/speed_loader_pistol_35/hv), - list(name="Speed Loader (9mm Hollow-point)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35/lethal), + list(name="Speed Loader (9mm)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35), + list(name="Speed Loader (9mm High Velocity)", cost=50, path=/obj/item/ammo_magazine/speed_loader_pistol_35/hv), + list(name="Speed Loader (9mm Hollow Point)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35/lethal), list(name="Speed Loader (9mm Rubber)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35/rubber), list(name="Speed Loader (9mm Pepperball)", cost=30, path=/obj/item/ammo_magazine/speed_loader_pistol_35/rubber/pepperball), list(name="Speed Loader (9mm Practice)", cost=10, path=/obj/item/ammo_magazine/speed_loader_pistol_35/practice), "9mm Standard", list(name="Standard Magazine (9mm)", cost=50, path=/obj/item/ammo_magazine/pistol_35), - list(name="Standard Magazine (9mm high-velocity)", cost=80, path=/obj/item/ammo_magazine/pistol_35/highvelocity), - list(name="Standard Magazine (9mm hollow-point)", cost=50, path=/obj/item/ammo_magazine/pistol_35/lethal), - list(name="Standard Magazine (9mm rubber)", cost=50, path= /obj/item/ammo_magazine/pistol_35/rubber), - list(name="Standard Magazine (9mm pepperball)", cost=50, path= /obj/item/ammo_magazine/pistol_35/rubber/pepperball), - list(name="Standard Magazine (9mm Auto practice)", cost=50, path=/obj/item/ammo_magazine/pistol_35/practice), + list(name="Standard Magazine (9mm High Velocity)", cost=80, path=/obj/item/ammo_magazine/pistol_35/highvelocity), + list(name="Standard Magazine (9mm Hollow Point)", cost=50, path=/obj/item/ammo_magazine/pistol_35/lethal), + list(name="Standard Magazine (9mm Rubber)", cost=50, path= /obj/item/ammo_magazine/pistol_35/rubber), + list(name="Standard Magazine (9mm Pepperball)", cost=50, path= /obj/item/ammo_magazine/pistol_35/rubber/pepperball), + list(name="Standard Magazine (9mm Practice)", cost=50, path=/obj/item/ammo_magazine/pistol_35/practice), "9mm High Capacity", list(name="High Capacity Magazine (9mm)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35), - list(name="High Capacity Magazine (9mm high-velocity)", cost=150, path=/obj/item/ammo_magazine/highcap_pistol_35/highvelocity), - list(name="High Capacity Magazine (9mm hollow-point)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/lethal), - list(name="High Capacity Magazine (9mm rubber)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/rubber), - list(name="High Capacity Magazine (9mm pepperball)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/rubber/pepperball), - list(name="High Capacity Magazine (9mm practice)", cost=20, path=/obj/item/ammo_magazine/highcap_pistol_35/practice), + list(name="High Capacity Magazine (9mm High Velocity)", cost=150, path=/obj/item/ammo_magazine/highcap_pistol_35/highvelocity), + list(name="High Capacity Magazine (9mm Hollow Point)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/lethal), + list(name="High Capacity Magazine (9mm Rubber)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/rubber), + list(name="High Capacity Magazine (9mm Pepperball)", cost=100, path=/obj/item/ammo_magazine/highcap_pistol_35/rubber/pepperball), + list(name="High Capacity Magazine (9mm Practice)", cost=20, path=/obj/item/ammo_magazine/highcap_pistol_35/practice), "9mm SMG", list(name="SMG Magazine (9mm)", cost=180, path= /obj/item/ammo_magazine/smg_35), - list(name="SMG Magazine (9mm high-velocity)", cost=250, path= /obj/item/ammo_magazine/smg_35/hv), - list(name="SMG Magazine (9mm hollow-point)", cost=180, path= /obj/item/ammo_magazine/smg_35/lethal), - list(name="SMG Magazine (9mm rubber)", cost=180, path= /obj/item/ammo_magazine/smg_35/rubber), - list(name="SMG Magazine (9mm pepperball)", cost=180, path= /obj/item/ammo_magazine/smg_35/rubber/pepperball), - list(name="SMG Magazine (9mm practice)", cost=70, path= /obj/item/ammo_magazine/smg_35/practice), + list(name="SMG Magazine (9mm High Velocity)", cost=250, path= /obj/item/ammo_magazine/smg_35/hv), + list(name="SMG Magazine (9mm Hollow Point)", cost=180, path= /obj/item/ammo_magazine/smg_35/lethal), + list(name="SMG Magazine (9mm Rubber)", cost=180, path= /obj/item/ammo_magazine/smg_35/rubber), + list(name="SMG Magazine (9mm Pepperball)", cost=180, path= /obj/item/ammo_magazine/smg_35/rubber/pepperball), + list(name="SMG Magazine (9mm Practice)", cost=70, path= /obj/item/ammo_magazine/smg_35/practice), "9mm Drum", list(name="Standard Drum (9mm)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum), - list(name="Standard Drum (9mm high-velocity)", cost=460, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/hv), - list(name="Standard Drum (9mm hollow-point)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/lethal), - list(name="Standard Drum (9mm rubber)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/rubber), - list(name="Standard Drum (9mm pepperball)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/rubber/pepperball), - list(name="Standard Drum (9mm empty)", cost=200, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/empty), + list(name="Standard Drum (9mm High Velocity)", cost=460, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/hv), + list(name="Standard Drum (9mm Hollow Point)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/lethal), + list(name="Standard Drum (9mm Rubber)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/rubber), + list(name="Standard Drum (9mm Pepperball)", cost=375, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/rubber/pepperball), + list(name="Standard Drum (9mm Empty)", cost=200, path=/obj/item/ammo_magazine/highcap_pistol_35/drum/empty), "9mm Ammo Boxes", list(name="Packet (9mm Auto)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35), - list(name="Packet (9mm Auto high-velocity)", cost=270, path=/obj/item/ammo_magazine/ammobox/pistol_35/hv), - list(name="Packet (9mm Auto hollow-point)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/lethal), - list(name="Packet (9mm Auto rubber)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/rubber), - list(name="Packet (9mm Auto pepperball)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/rubber/pepperball), - list(name="Packet (9mm Auto practice)", cost=100, path=/obj/item/ammo_magazine/ammobox/pistol_35/practice), + list(name="Packet (9mm Auto High Velocity)", cost=270, path=/obj/item/ammo_magazine/ammobox/pistol_35/hv), + list(name="Packet (9mm Auto Hollow Point)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/lethal), + list(name="Packet (9mm Auto Rubber)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/rubber), + list(name="Packet (9mm Auto Pepperball)", cost=165, path=/obj/item/ammo_magazine/ammobox/pistol_35/rubber/pepperball), + list(name="Packet (9mm Auto Practice)", cost=100, path=/obj/item/ammo_magazine/ammobox/pistol_35/practice), list(name="Box (9mm auto)", cost=1155, path=/obj/item/ammo_magazine/ammobox/pistol_35/large), - list(name="Box (9mm auto high-velocity)", cost=1955, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/hv), - list(name="Box (9mm auto hollow-point)", cost=1155, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/lethal), - list(name="Box (9mm auto rubber)", cost=1155, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/rubber), + list(name="Box (9mm auto High Velocity)", cost=1955, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/hv), + list(name="Box (9mm auto Hollow Point)", cost=1155, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/lethal), + list(name="Box (9mm auto Rubber)", cost=1155, path=/obj/item/ammo_magazine/ammobox/pistol_35/large/rubber), "10mm Magnum, Speed Loader", - list(name="Speed Loader (10mm Special)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40), - list(name="Speed Loader (10mm High-velocity)", cost=80, path=/obj/item/ammo_magazine/speed_loader_magnum_40/highvelocity), - list(name="Speed Loader (10mm Hollow-point)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40/lethal), + list(name="Speed Loader (10mm)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40), + list(name="Speed Loader (10mm High velocity)", cost=80, path=/obj/item/ammo_magazine/speed_loader_magnum_40/highvelocity), + list(name="Speed Loader (10mm Hollow point)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40/lethal), list(name="Speed Loader (10mm Rubber)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40/rubber), list(name="Speed Loader (10mm Pepperball)", cost=45, path=/obj/item/ammo_magazine/speed_loader_magnum_40/rubber/pepperball), list(name="Speed Loader (10mm Practice)", cost=25, path=/obj/item/ammo_magazine/speed_loader_magnum_40/practice), "10mm Magnum, Pistol", - list(name="Magnum Magazine (10mm Magnum standard)", cost=75, path=/obj/item/ammo_magazine/magnum_40), - list(name="Magnum Magazine (10mm Magnum high velocity)", cost=130, path=/obj/item/ammo_magazine/magnum_40/hv), - list(name="Magnum Magazine (10mm Magnum hollow-point)", cost=75, path=/obj/item/ammo_magazine/magnum_40/lethal), - list(name="Magnum Magazine (10mm Magnum rubber)", cost=75, path=/obj/item/ammo_magazine/magnum_40/rubber), - list(name="Magnum Magazine (10mm Magnum pepperball)", cost=75, path=/obj/item/ammo_magazine/magnum_40/rubber/pepperball), - list(name="Magnum Magazine (10mm Magnum practice)", cost=30, path=/obj/item/ammo_magazine/magnum_40/practice), + list(name="Magnum Magazine (10mm Magnum)", cost=75, path=/obj/item/ammo_magazine/magnum_40), + list(name="Magnum Magazine (10mm Magnum High Velocity)", cost=130, path=/obj/item/ammo_magazine/magnum_40/hv), + list(name="Magnum Magazine (10mm Magnum Hollow Point)", cost=75, path=/obj/item/ammo_magazine/magnum_40/lethal), + list(name="Magnum Magazine (10mm Magnum Rubber)", cost=75, path=/obj/item/ammo_magazine/magnum_40/rubber), + list(name="Magnum Magazine (10mm Magnum Pepperball)", cost=75, path=/obj/item/ammo_magazine/magnum_40/rubber/pepperball), + list(name="Magnum Magazine (10mm Magnum Practice)", cost=30, path=/obj/item/ammo_magazine/magnum_40/practice), "10mm Magnum, SMG", list(name="SMG Magazine (10mm Magnum)", cost=480, path= /obj/item/ammo_magazine/smg_magnum_40), - list(name="SMG Magazine (10mm Magnum high-velocity)", cost=750, path= /obj/item/ammo_magazine/smg_magnum_40/hv), - list(name="SMG Magazine (10mm Magnum hollow-point)", cost=480, path= /obj/item/ammo_magazine/smg_magnum_40/lethal), - list(name="SMG Magazine (10mm Magnum rubber)", cost=400, path= /obj/item/ammo_magazine/smg_magnum_40/rubber), - list(name="SMG Magazine (10mm Magnum pepperball)", cost=400, path= /obj/item/ammo_magazine/smg_magnum_40/rubber/pepperball), - list(name="SMG Magazine (10mm Magnum practice)", cost=300, path= /obj/item/ammo_magazine/smg_magnum_40/practice), - list(name="SMG Magazine (10mm Magnum empty)", cost=240, path= /obj/item/ammo_magazine/smg_magnum_40/empty), + list(name="SMG Magazine (10mm Magnum High Velocity)", cost=750, path= /obj/item/ammo_magazine/smg_magnum_40/hv), + list(name="SMG Magazine (10mm Magnum Hollow Point)", cost=480, path= /obj/item/ammo_magazine/smg_magnum_40/lethal), + list(name="SMG Magazine (10mm Magnum Rubber)", cost=400, path= /obj/item/ammo_magazine/smg_magnum_40/rubber), + list(name="SMG Magazine (10mm Magnum Pepperball)", cost=400, path= /obj/item/ammo_magazine/smg_magnum_40/rubber/pepperball), + list(name="SMG Magazine (10mm Magnum Practice)", cost=300, path= /obj/item/ammo_magazine/smg_magnum_40/practice), + list(name="SMG Magazine (10mm Magnum Empty)", cost=240, path= /obj/item/ammo_magazine/smg_magnum_40/empty), "10mm Ammo Boxes", - list(name="Packet (10mm Magnum standard)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40), - list(name="Packet (10mm Magnum high velocity)", cost=460, path=/obj/item/ammo_magazine/ammobox/magnum_40/hv), - list(name="Packet (10mm Magnum hollow-point)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/lethal), - list(name="Packet (10mm Magnum rubber)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/rubber), - list(name="Packet (10mm Magnum pepperball)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/rubber/pepperball), - list(name="Packet (10mm Magnum practice)", cost=100, path=/obj/item/ammo_magazine/ammobox/magnum_40/practice), + list(name="Packet (10mm Magnum)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40), + list(name="Packet (10mm Magnum High Velocity)", cost=460, path=/obj/item/ammo_magazine/ammobox/magnum_40/hv), + list(name="Packet (10mm Magnum Hollow Point)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/lethal), + list(name="Packet (10mm Magnum Rubber)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/rubber), + list(name="Packet (10mm Magnum Pepperball)", cost=250, path=/obj/item/ammo_magazine/ammobox/magnum_40/rubber/pepperball), + list(name="Packet (10mm Magnum Practice)", cost=100, path=/obj/item/ammo_magazine/ammobox/magnum_40/practice), list(name="Box (10mm Magnum)", cost=1250, path=/obj/item/ammo_magazine/ammobox/magnum_40/large), - list(name="Box (10mm Magnum high-velocity)", cost=1920, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/hv), - list(name="Box (10mm Magnum hollow-point)", cost=1250, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/lethal), - list(name="Box (10mm Magnum rubber)", cost=1250, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/rubber), + list(name="Box (10mm Magnum High Velocity)", cost=1920, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/hv), + list(name="Box (10mm Magnum Hollow Point)", cost=1250, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/lethal), + list(name="Box (10mm Magnum Rubber)", cost=1250, path=/obj/item/ammo_magazine/ammobox/magnum_40/large/rubber), "12mm, Speed Loader", - list(name="Speed Loader (12mm Special)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50), - list(name="Speed Loader (12mm High-velocity)", cost=100, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/highvelocity), - list(name="Speed Loader (12mm Hollow-point)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/lethal), + list(name="Speed Loader (12mm)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50), + list(name="Speed Loader (12mm High Velocity)", cost=100, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/highvelocity), + list(name="Speed Loader (12mm Hollow Point)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/lethal), list(name="Speed Loader (12mm Rubber)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/rubber), list(name="Speed Loader (12mm Pepperball)", cost=60, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/rubber/pepperball), list(name="Speed Loader (12mm Practice)", cost=20, path=/obj/item/ammo_magazine/speed_loader_kurtz_50/practice), @@ -113,119 +113,119 @@ list(name="Heavy Pistol Magazine (12mm Practice)", cost=20, path=/obj/item/ammo_magazine/kurtz_50/practice), "12mm, Ammo Boxes", list(name="Box (12mm Standard)", cost=330, path=/obj/item/ammo_magazine/ammobox/kurtz_50), - list(name="Box (12mm High velocity)", cost=480, path=/obj/item/ammo_magazine/ammobox/kurtz_50/hv), - list(name="Box (12mm Hollow point)", cost=330, path=/obj/item/ammo_magazine/ammobox/kurtz_50/lethal), + list(name="Box (12mm High Velocity)", cost=480, path=/obj/item/ammo_magazine/ammobox/kurtz_50/hv), + list(name="Box (12mm Hollow Point)", cost=330, path=/obj/item/ammo_magazine/ammobox/kurtz_50/lethal), list(name="Box (12mm Rubber)", cost=330, path=/obj/item/ammo_magazine/ammobox/kurtz_50/rubber), list(name="Box (12mm Pepperball)", cost=330, path=/obj/item/ammo_magazine/ammobox/kurtz_50/rubber/pepperball), list(name="Box (12mm Practice)", cost=100, path=/obj/item/ammo_magazine/ammobox/kurtz_50/practice), "10x24 Caseless", - list(name="Caseless Light Rifle Magazine (10x24mm Standard)", cost=100, path=/obj/item/ammo_magazine/smg_10x24), - list(name="Caseless Magazine (10x24mm Standard)", cost=500, path=/obj/item/ammo_magazine/c10x24), + list(name="Caseless Light Rifle Magazine (10x24mm)", cost=100, path=/obj/item/ammo_magazine/smg_10x24), + list(name="Caseless Magazine (10x24mm)", cost=500, path=/obj/item/ammo_magazine/c10x24), list(name="Box (10x24mm Caseless)", cost=1650, path=/obj/item/ammo_magazine/ammobox/c10x24), "6.5 Carbine, Short", - list(name="Short Carbine Magazine (Standard)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short), - list(name="Short Carbine Magazine (High velocity)", cost=300, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/hv), - list(name="Short Carbine Magazine (Hollow-point)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/lethal), - list(name="Short Carbine Magazine (Rubber)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/rubber), - list(name="Short Carbine Magazine (Pepperball)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/rubber/pepperball), - list(name="Short Carbine Magazine (Practice)", cost=50, path=/obj/item/ammo_magazine/light_rifle_257_short/practice), + list(name="Short Carbine Magazine (6.5)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short), + list(name="Short Carbine Magazine (6.5 High Velocity)", cost=300, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/hv), + list(name="Short Carbine Magazine (6.5 Hollow Point)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/lethal), + list(name="Short Carbine Magazine (6.5 Rubber)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/rubber), + list(name="Short Carbine Magazine (6.5 Pepperball)", cost=200, path=/obj/item/ammo_magazine/light_rifle_257_short/rubber/pepperball), + list(name="Short Carbine Magazine (6.5 Practice)", cost=50, path=/obj/item/ammo_magazine/light_rifle_257_short/practice), "6.5 Carbine, Long", - list(name="Carbine Magazine (Standard)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257), - list(name="Carbine Magazine (High velocity)", cost=450, path=/obj/item/ammo_magazine/light_rifle_257/highvelocity), - list(name="Carbine Magazine (Hollow-point)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/lethal), - list(name="Carbine Magazine (Rubber)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/rubber), - list(name="Carbine Magazine (Pepperball)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/rubber/pepperball), - list(name="Carbine Magazine (Practice)", cost=100, path=/obj/item/ammo_magazine/light_rifle_257/practice), + list(name="Carbine Magazine (6.5)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257), + list(name="Carbine Magazine (6.5 High Velocity)", cost=450, path=/obj/item/ammo_magazine/light_rifle_257/highvelocity), + list(name="Carbine Magazine (6.5 Hollow Point)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/lethal), + list(name="Carbine Magazine (6.5 Rubber)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/rubber), + list(name="Carbine Magazine (6.5 Pepperball)", cost=300, path=/obj/item/ammo_magazine/light_rifle_257/rubber/pepperball), + list(name="Carbine Magazine (6.5 Practice)", cost=100, path=/obj/item/ammo_magazine/light_rifle_257/practice), "6.5 Carbine, Drum", - list(name="Carbine Drum Magazine (Standard)", cost=1080, path= /obj/item/ammo_magazine/light_rifle_257_drum), - list(name="Carbine Drum Magazine (High velocity)", cost=1620, path= /obj/item/ammo_magazine/light_rifle_257_drum/highvelocity), - list(name="Carbine Drum Magazine (Hollow-point)", cost=1080, path= /obj/item/ammo_magazine/light_rifle_257_drum/lethal), - list(name="Carbine Drum Magazine (Rubber)", cost=680, path= /obj/item/ammo_magazine/light_rifle_257_drum/rubber), - list(name="Carbine Drum Magazine (Pepperball)", cost=680, path= /obj/item/ammo_magazine/light_rifle_257_drum/rubber/pepperball), - list(name="Carbine Drum Magazine (Practice)", cost=420, path= /obj/item/ammo_magazine/light_rifle_257_drum/practice), - list(name="Carbine Drum Magazine (Empty)", cost=420, path= /obj/item/ammo_magazine/light_rifle_257_drum/empty), + list(name="Carbine Drum Magazine (6.5)", cost=1080, path= /obj/item/ammo_magazine/light_rifle_257_drum), + list(name="Carbine Drum Magazine (6.5 High Velocity)", cost=1620, path= /obj/item/ammo_magazine/light_rifle_257_drum/highvelocity), + list(name="Carbine Drum Magazine (6.5 Hollow Point)", cost=1080, path= /obj/item/ammo_magazine/light_rifle_257_drum/lethal), + list(name="Carbine Drum Magazine (6.5 Rubber)", cost=680, path= /obj/item/ammo_magazine/light_rifle_257_drum/rubber), + list(name="Carbine Drum Magazine (6.5 Pepperball)", cost=680, path= /obj/item/ammo_magazine/light_rifle_257_drum/rubber/pepperball), + list(name="Carbine Drum Magazine (6.5 Practice)", cost=420, path= /obj/item/ammo_magazine/light_rifle_257_drum/practice), + list(name="Carbine Drum Magazine (6.5 Empty)", cost=420, path= /obj/item/ammo_magazine/light_rifle_257_drum/empty), "6.5, Ammo Box", - list(name="Packet (6.5 Standard)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small), - list(name="Packet (6.5 High velocity)", cost=1485, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/hv), - list(name="Packet (6.5 Hollow-point)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/lethal), + list(name="Packet (6.5)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small), + list(name="Packet (6.5 High Velocity)", cost=1485, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/hv), + list(name="Packet (6.5 Hollow Point)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/lethal), list(name="Packet (6.5 Rubber)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/rubber), list(name="Packet (6.5 Pepperball)", cost=990, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/rubber/pepperball), list(name="Packet (6.5 Practice)", cost=850, path=/obj/item/ammo_magazine/ammobox/light_rifle_257_small/practice), - list(name="Box (6.5 Standard)", cost=2800, path=/obj/item/ammo_magazine/ammobox/light_rifle_257), - list(name="Box (6.5 High velocity)", cost=4200, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/highvelocity), - list(name="Box (6.5 Hollow-point)", cost=2800, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/lethal), + list(name="Box (6.5)", cost=2800, path=/obj/item/ammo_magazine/ammobox/light_rifle_257), + list(name="Box (6.5 High Velocity)", cost=4200, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/highvelocity), + list(name="Box (6.5 Hollow Point)", cost=2800, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/lethal), list(name="Box (6.5 Rubber)", cost=2800, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/rubber), list(name="Box (6.5 Practice)", cost=200, path=/obj/item/ammo_magazine/ammobox/light_rifle_257/practice), - list(name="Linked Ammunition Box (6.5 Standard)", cost=1000, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257), - list(name="Linked Ammunition Box (6.5 High velocity)", cost=1500, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/highvelocity), - list(name="Linked Ammunition Box (6.5 Hollow-point)", cost=1000, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/lethal), + list(name="Linked Ammunition Box (6.5)", cost=1000, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257), + list(name="Linked Ammunition Box (6.5 High Velocity)", cost=1500, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/highvelocity), + list(name="Linked Ammunition Box (6.5 Hollow Point)", cost=1000, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/lethal), list(name="Linked Ammunition Box (6.5 Rubber)", cost=675, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/rubber), list(name="Linked Ammunition Box (6.5 Empty)", cost=200, path=/obj/item/ammo_magazine/rifle_75_linked_box/light_rifle_257/empty), "7.62 Rifle, Short", - list(name="Short Rifle Magazine (7.62 Standard)", cost=300, path=/obj/item/ammo_magazine/rifle_75_short), + list(name="Short Rifle Magazine (7.62)", cost=300, path=/obj/item/ammo_magazine/rifle_75_short), list(name="Short Rifle Magazine (7.62 APDS)", cost=450, path=/obj/item/ammo_magazine/rifle_75_short/highvelocity), - list(name="Short Rifle Magazine (7.62 Hollow point)", cost=300, path=/obj/item/ammo_magazine/rifle_75_short/lethal), + list(name="Short Rifle Magazine (7.62 Hollow Point)", cost=300, path=/obj/item/ammo_magazine/rifle_75_short/lethal), list(name="Short Rifle Magazine (7.62 Rubber)", cost=300, path=/obj/item/ammo_magazine/rifle_75_short/rubber), list(name="Short Rifle Magazine (7.62 Practice)", cost=75, path=/obj/item/ammo_magazine/rifle_75_short/practice), "7.62 Rifle", - list(name="Ammo Strip (7.62mm Rifle)", cost=400, path=/obj/item/ammo_magazine/speed_loader_rifle_75), - list(name="Rifle Magazine (7.62 Standard)", cost=400, path=/obj/item/ammo_magazine/rifle_75), + list(name="Ammo Strip (7.62 Rifle)", cost=400, path=/obj/item/ammo_magazine/speed_loader_rifle_75), + list(name="Rifle Magazine (7.62)", cost=400, path=/obj/item/ammo_magazine/rifle_75), list(name="Rifle Magazine (7.62 APDS)", cost=600, path=/obj/item/ammo_magazine/rifle_75/highvelocity), - list(name="Rifle Magazine (7.62 Hollow point)", cost=400, path=/obj/item/ammo_magazine/rifle_75/lethal), + list(name="Rifle Magazine (7.62 Hollow Point)", cost=400, path=/obj/item/ammo_magazine/rifle_75/lethal), list(name="Rifle Magazine (7.62 Rubber)", cost=400, path=/obj/item/ammo_magazine/rifle_75/rubber), list(name="Rifle Magazine (7.62 Practice)", cost=100, path=/obj/item/ammo_magazine/rifle_75/practice), "7.62 Rifle, Drum", - list(name="Rifle Drum Magazine (7.62 Standard)", cost=1080, path=/obj/item/ammo_magazine/rifle_75_drum), + list(name="Rifle Drum Magazine (7.62)", cost=1080, path=/obj/item/ammo_magazine/rifle_75_drum), list(name="Rifle Drum Magazine (7.62 APDS)", cost=1620, path=/obj/item/ammo_magazine/rifle_75_drum/highvelocity), - list(name="Rifle Drum Magazine (7.62 Hollow point)", cost=1080, path=/obj/item/ammo_magazine/rifle_75_drum/lethal), + list(name="Rifle Drum Magazine (7.62 Hollow Point)", cost=1080, path=/obj/item/ammo_magazine/rifle_75_drum/lethal), list(name="Rifle Drum Magazine (7.62 Rubber)", cost=680, path=/obj/item/ammo_magazine/rifle_75_drum/rubber), list(name="Rifle Drum Magazine (7.62 Practice)", cost=420, path=/obj/item/ammo_magazine/rifle_75_drum/practice), list(name="Rifle Drum Magazine (7.62 Empty)", cost=420, path=/obj/item/ammo_magazine/rifle_75_drum/empty), - list(name="Rifle Pan (7.62 standard)", cost=1600, path=/obj/item/ammo_magazine/maxim_75), + list(name="Rifle Pan (7.62)", cost=1600, path=/obj/item/ammo_magazine/maxim_75), list(name="Rifle Pan (7.62 empty)", cost=300, path=/obj/item/ammo_magazine/maxim_75/empty), "7.62, Ammo Boxes", - list(name="Packet (7.62 Standard)", cost=990, path=/obj/item/ammo_magazine/ammobox/rifle_75_small), + list(name="Packet (7.62)", cost=990, path=/obj/item/ammo_magazine/ammobox/rifle_75_small), list(name="Packet (7.62 APDS)", cost=1485, path=/obj/item/ammo_magazine/ammobox/rifle_75_small/hv), - list(name="Packet (7.62 Hollow-point)", cost=990, path=/obj/item/ammo_magazine/ammobox/rifle_75_small/lethal), + list(name="Packet (7.62 Hollow Point)", cost=990, path=/obj/item/ammo_magazine/ammobox/rifle_75_small/lethal), list(name="Packet (7.62 Rubber)", cost=990, path=/obj/item/ammo_magazine/ammobox/rifle_75_small/rubber), list(name="Packet (7.62 Practice)", cost=850, path=/obj/item/ammo_magazine/ammobox/rifle_75_small/practice), - list(name="Box (7.62 Standard)", cost=3500, path=/obj/item/ammo_magazine/ammobox/rifle_75), + list(name="Box (7.62)", cost=3500, path=/obj/item/ammo_magazine/ammobox/rifle_75), list(name="Box (7.62 APDS)", cost=5250, path=/obj/item/ammo_magazine/ammobox/rifle_75/hv), - list(name="Box (7.62 Hollow point)", cost=3500, path=/obj/item/ammo_magazine/ammobox/rifle_75/lethal), + list(name="Box (7.62 Hollow Point)", cost=3500, path=/obj/item/ammo_magazine/ammobox/rifle_75/lethal), list(name="Box (7.62 Rubber)", cost=3500, path=/obj/item/ammo_magazine/ammobox/rifle_75/rubber), list(name="Box (7.62 Practice)", cost=200, path=/obj/item/ammo_magazine/ammobox/rifle_75/practice), list(name="Linked Ammunition Box (7.62mm Rifle)", cost=1300, path=/obj/item/ammo_magazine/rifle_75_linked_box), list(name="Linked Ammunition Box (7.62mm APDS)", cost=1950, path=/obj/item/ammo_magazine/rifle_75_linked_box/highvelocity), - list(name="Linked Ammunition Box (7.62mm Hollow-point)", cost=1300, path=/obj/item/ammo_magazine/rifle_75_linked_box/lethal), + list(name="Linked Ammunition Box (7.62mm Hollow Point)", cost=1300, path=/obj/item/ammo_magazine/rifle_75_linked_box/lethal), list(name="Linked Ammunition Box (7.62mm Rubber)", cost=1100, path=/obj/item/ammo_magazine/rifle_75_linked_box/rubber), list(name="Linked Ammunition Box (7.62mm Empty)", cost=500, path=/obj/item/ammo_magazine/rifle_75_linked_box/empty), "8.6 Heavy Rifle", - list(name="Heavy Rifle Stripper Clip (8.6mm Rifle)", cost=500, path=/obj/item/ammo_magazine/speed_loader_heavy_rifle_408), - list(name="Heavy Rifle Magazine (8.6 Standard)", cost=500, path=/obj/item/ammo_magazine/heavy_rifle_408), + list(name="Heavy Rifle Stripper Clip (8.6 Rifle)", cost=500, path=/obj/item/ammo_magazine/speed_loader_heavy_rifle_408), + list(name="Heavy Rifle Magazine (8.6)", cost=500, path=/obj/item/ammo_magazine/heavy_rifle_408), list(name="Heavy Rifle Magazine (8.6 SLAP)", cost=750, path=/obj/item/ammo_magazine/heavy_rifle_408/hv), - list(name="Heavy Rifle Magazine (8.6 Hollow point)", cost=500, path=/obj/item/ammo_magazine/heavy_rifle_408/lethal), + list(name="Heavy Rifle Magazine (8.6 Hollow Ooint)", cost=500, path=/obj/item/ammo_magazine/heavy_rifle_408/lethal), list(name="Heavy Rifle Magazine (8.6 Rubber)", cost=400, path=/obj/item/ammo_magazine/heavy_rifle_408/rubber), list(name="Heavy Rifle Magazine (8.6 Practice)", cost=100, path=/obj/item/ammo_magazine/heavy_rifle_408/practice), "8.6 Heavy Rifle, Drum", - list(name="Heavy Rifle Drum Magazine (8.6mm Drum, Ball)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum), - list(name="Heavy Rifle Drum Magazine (8.6mm Drum, SLAP)", cost=1080, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/slap), - list(name="Heavy Rifle Drum Magazine (8.6mm Drum, Hollow-Tip)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/lethal), - list(name="Heavy Rifle Drum Magazine (8.6mm Drum, Baton)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/rubber), - list(name="Heavy Rifle Drum Magazine (8.6mm Drum, Incendiary)", cost=1620, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/incend), + list(name="Heavy Rifle Drum Magazine (8.6mm Ball)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum), + list(name="Heavy Rifle Drum Magazine (8.6mm SLAP)", cost=1080, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/slap), + list(name="Heavy Rifle Drum Magazine (8.6mm Hollow Point)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/lethal), + list(name="Heavy Rifle Drum Magazine (8.6mm Baton)", cost=700, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/rubber), + list(name="Heavy Rifle Drum Magazine (8.6mm Incendiary)", cost=1620, path=/obj/item/ammo_magazine/heavy_rifle_408_drum/incend), "8.6, Ammo Packets", - list(name="Packet (8.6mm Ball)", cost=1200, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small), + list(name="Packet (8.6)", cost=1200, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small), list(name="Packet (8.6 SLAP)", cost=1480, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/hv), - list(name="Packet (8.6 Hollow-point)", cost=1480, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/lethal), + list(name="Packet (8.6 Hollow Point)", cost=1480, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/lethal), list(name="Packet (8.6 Rubber)", cost=1200, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/rubber), list(name="Packet (8.6 Practice)", cost=70, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/practice), list(name="Packet (8.6 Incendiary)", cost=1500, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/incend), "8.6, Ammo Boxes", - list(name="Box (8.6 Standard)", cost=3820, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408), + list(name="Box (8.6)", cost=3820, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408), list(name="Box (8.6 SLAP)", cost=5730, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408/hv), - list(name="Box (8.6 Hollow point)", cost=3820, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408/lethal), + list(name="Box (8.6 Hollow Point)", cost=3820, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408/lethal), list(name="Box (8.6 Rubber)", cost=3220, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408/rubber), list(name="Box (8.6 Practice)", cost=200, path=/obj/item/ammo_magazine/ammobox/heavy_rifle_408/practice), - list(name="Linked Ammunition Box (8.6 Ball)", cost=2820, path=/obj/item/ammo_magazine/rifle_75_linked_box/heavy_rifle_408), + list(name="Linked Ammunition Box (8.6)", cost=2820, path=/obj/item/ammo_magazine/rifle_75_linked_box/heavy_rifle_408), list(name="Linked Ammunition Box (8.6 SLAP)", cost=4230, path=/obj/item/ammo_magazine/rifle_75_linked_box/heavy_rifle_408/highvelocity), list(name="Linked Ammunition Box (8.6 Hollow Point)", cost=2820, path=/obj/item/ammo_magazine/rifle_75_linked_box/heavy_rifle_408/lethal), list(name="Linked Ammunition Box (8.6 Rubber)", cost=2820, path=/obj/item/ammo_magazine/rifle_75_linked_box/heavy_rifle_408/rubber), @@ -251,7 +251,7 @@ list(name="SBAW Magazine (20mm Beanbag)", cost=500, path=/obj/item/ammo_magazine/sbaw/beanbag), //list(name="SBAW Magazine (20mm HEFI)", cost=2600, path=/obj/item/ammo_magazine/sbaw/he), list(name="SBAW Magazine (20mm Empty)", cost=400, path=/obj/item/ammo_magazine/sbaw/empty), - list(name="Ammo Drum (20mm Sabot slug)", cost=850, path=/obj/item/ammo_magazine/m12), + list(name="Ammo Drum (20mm Sabot Slug)", cost=850, path=/obj/item/ammo_magazine/m12), list(name="Ammo Drum (20mm Buckshot)", cost=850, path=/obj/item/ammo_magazine/m12/pellet), list(name="Ammo Drum (20mm Beanbag)", cost=650, path=/obj/item/ammo_magazine/m12/beanbag), list(name="Ammo Drum (20mm Empty)", cost=500, path=/obj/item/ammo_magazine/m12/empty), @@ -457,4 +457,3 @@ return TRUE to_chat(user, SPAN_NOTICE("You don't know how to make the [src] work, you lack the training or mechanical skill.")) return FALSE -