diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm index b9f7bcded59..7f42f32379f 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon.dmm @@ -1834,11 +1834,11 @@ /obj/item/storage/barricade, /obj/item/crafting_conversion_kit/mosin_pro, /obj/item/gun/ballistic/revolver/mateba, -/obj/item/ammo_box/a357/heartseeker, -/obj/item/ammo_box/a357/match, -/obj/item/ammo_box/a357/peacemaker, -/obj/item/ammo_box/a357/phasic, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357/heartseeker, +/obj/item/ammo_box/speedloader/c357/match, +/obj/item/ammo_box/speedloader/c357/peacemaker, +/obj/item/ammo_box/speedloader/c357/phasic, +/obj/item/ammo_box/speedloader/c357, /obj/item/mod/module/shooting_assistant, /obj/item/mod/module/scorpion_hook, /turf/open/floor/iron/dark, diff --git a/_maps/RandomZLevels/blackmesa.dmm b/_maps/RandomZLevels/blackmesa.dmm index 03f2e5a128b..00a099bd7b0 100644 --- a/_maps/RandomZLevels/blackmesa.dmm +++ b/_maps/RandomZLevels/blackmesa.dmm @@ -2102,12 +2102,12 @@ /area/awaymission/black_mesa/tram_room) "aBe" = ( /obj/structure/rack/shelf, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357/match, -/obj/item/ammo_box/a357/match, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357/match, +/obj/item/ammo_box/speedloader/c357/match, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/awaymission/black_mesa/security_outpost) @@ -7903,7 +7903,7 @@ /area/awaymission/black_mesa/employee_dorm_room) "ivz" = ( /obj/structure/closet/crate/bin, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/high_security_hallway) "ivQ" = ( @@ -10291,7 +10291,7 @@ /area/awaymission/black_mesa/security_outpost) "nbJ" = ( /obj/structure/closet/crate/large, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /turf/open/floor/plating, /area/awaymission/black_mesa/dorm_tunnel) "ncO" = ( @@ -12066,8 +12066,8 @@ "qFp" = ( /obj/structure/closet/crate/large, /obj/item/minespawner/explosive, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, /turf/open/floor/iron/smooth_large, /area/awaymission/black_mesa/deep_sci_feesh) "qFH" = ( @@ -12749,7 +12749,7 @@ /turf/open/water/xen_acid, /area/awaymission/black_mesa/xen/acid_lake) "rJj" = ( -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/textured, /area/awaymission/black_mesa/employee_dorm_room) diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index 61286ff6573..1ebfea5c7ca 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -2573,9 +2573,9 @@ "Mw" = ( /obj/machinery/porta_turret/syndicate/pod{ faction = list("Abductor"); - lethal_projectile = /obj/projectile/bullet/a357; + lethal_projectile = /obj/projectile/bullet/c357; max_integrity = 120; - stun_projectile = /obj/projectile/bullet/a357 + stun_projectile = /obj/projectile/bullet/c357 }, /turf/open/floor/plating/abductor, /area/awaymission/mothership_astrum/halls) @@ -2890,9 +2890,9 @@ "PH" = ( /obj/machinery/porta_turret/syndicate/pod{ faction = list("Abductor"); - lethal_projectile = /obj/projectile/bullet/a357; + lethal_projectile = /obj/projectile/bullet/c357; max_integrity = 120; - stun_projectile = /obj/projectile/bullet/a357 + stun_projectile = /obj/projectile/bullet/c357 }, /turf/open/floor/plating/abductor2, /area/awaymission/mothership_astrum/halls) @@ -3488,9 +3488,9 @@ "WC" = ( /obj/machinery/porta_turret/syndicate/pod{ faction = list("boss"); - lethal_projectile = /obj/projectile/bullet/a357; + lethal_projectile = /obj/projectile/bullet/c357; max_integrity = 150; - stun_projectile = /obj/projectile/bullet/a357 + stun_projectile = /obj/projectile/bullet/c357 }, /turf/open/floor/mineral/abductor, /area/awaymission/mothership_astrum/halls) @@ -3522,9 +3522,9 @@ "Xa" = ( /obj/machinery/porta_turret/syndicate/pod{ faction = list("Abductor"); - lethal_projectile = /obj/projectile/bullet/a357; + lethal_projectile = /obj/projectile/bullet/c357; max_integrity = 120; - stun_projectile = /obj/projectile/bullet/a357 + stun_projectile = /obj/projectile/bullet/c357 }, /turf/open/floor/mineral/abductor, /area/awaymission/mothership_astrum/halls) diff --git a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm index 571d2e5ea2d..548dd8721ef 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/iceboxstation_persistence.dmm @@ -12743,8 +12743,8 @@ /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/nukie, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/smgm45, diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm index 9eb65772883..8c2c90b675b 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_persistence.dmm @@ -9542,8 +9542,8 @@ /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/nukie, /obj/item/storage/belt/holster/nukie, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/smgm45, diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 3fd43f55b36..20da8950500 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -20552,7 +20552,7 @@ /obj/item/card/id/advanced/silver/reaper, /obj/item/lazarus_injector, /obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /obj/item/clothing/neck/stethoscope, /obj/item/book{ desc = "An undeniably handy book."; diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 2d328e9fdb9..76c30b5953b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -56322,7 +56322,7 @@ /area/station/service/hydroponics/garden/abandoned) "lxv" = ( /obj/effect/spawner/random/medical/surgery_tool_alien, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /obj/effect/spawner/random/exotic/antag_gear_weak, /obj/effect/spawner/random/exotic/antag_gear_weak, /obj/structure/safe/vault, diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index 6f1ae357239..b0b11778191 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -8638,7 +8638,7 @@ name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" }, /obj/item/clothing/head/costume/bearpelt, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, /obj/item/gun/ballistic/revolver/russian, /turf/open/floor/circuit/green{ luminosity = 2 diff --git a/_maps/shuttles/skyrat/whiteship_blueshift.dmm b/_maps/shuttles/skyrat/whiteship_blueshift.dmm index 31475c0b238..36908c9d0f5 100644 --- a/_maps/shuttles/skyrat/whiteship_blueshift.dmm +++ b/_maps/shuttles/skyrat/whiteship_blueshift.dmm @@ -1689,8 +1689,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot_white, /obj/structure/guncase, -/obj/item/ammo_box/a357, -/obj/item/ammo_box/a357, +/obj/item/ammo_box/speedloader/c357, +/obj/item/ammo_box/speedloader/c357, /obj/item/gun/ballistic/revolver, /obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9, diff --git a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm index db289f519e1..9b05d8c0c45 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm @@ -91,7 +91,7 @@ back = /obj/item/storage/backpack - backpack_contents = list(/obj/item/gun/ballistic/revolver/mateba, /obj/item/ammo_box/a357 = 5) + backpack_contents = list(/obj/item/gun/ballistic/revolver/mateba, /obj/item/ammo_box/speedloader/c357 = 5) l_hand = /obj/item/crowbar/freeman diff --git a/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm b/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm index d1e0aeed5c8..8ab0a58fd36 100644 --- a/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm +++ b/modular_skyrat/modules/company_imports/code/objects/vitezstvi/ammo_boxes.dm @@ -7,7 +7,7 @@ /obj/item/ammo_box/strilka310 w_class = WEIGHT_CLASS_SMALL -/obj/item/ammo_box/a357 +/obj/item/ammo_box/speedloader/c357 w_class = WEIGHT_CLASS_SMALL /obj/item/ammo_box/c38 diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 2c361132ca1..2e090b8f9f5 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -909,7 +909,7 @@ /obj/item/ammo_box/magazine, // Just magazine, because the sec-belt can hold these aswell /obj/item/gun/ballistic/revolver, /obj/item/ammo_box/c38, // Revolver speedloaders. - /obj/item/ammo_box/a357, + /obj/item/ammo_box/speedloader/c357, /obj/item/ammo_box/strilka310, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, @@ -940,7 +940,7 @@ /obj/item/ammo_box/magazine, // Just magazine, because the sec-belt can hold these aswell /obj/item/gun/ballistic/revolver, /obj/item/ammo_box/c38, // Revolver speedloaders. - /obj/item/ammo_box/a357, + /obj/item/ammo_box/speedloader/c357, /obj/item/ammo_box/strilka310, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, diff --git a/tools/UpdatePaths/Scripts/92854_speedloaders.txt b/tools/UpdatePaths/Scripts/92854_speedloaders.txt index 233c1e2a5e2..47c8e4dc07b 100644 --- a/tools/UpdatePaths/Scripts/92854_speedloaders.txt +++ b/tools/UpdatePaths/Scripts/92854_speedloaders.txt @@ -1,3 +1,3 @@ -/obj/item/ammo_box/a357/@SUBTYPES : /obj/item/ammo_box/speedloader/c357/@SUBTYPES{@OLD} +/obj/item/ammo_box/speedloader/c357/@SUBTYPES : /obj/item/ammo_box/speedloader/c357/@SUBTYPES{@OLD} /obj/item/ammo_box/c38/@SUBTYPES : /obj/item/ammo_box/speedloader/c38/@SUBTYPES{@OLD} /obj/item/ammo_box/strilka310/@SUBTYPES : /obj/item/ammo_box/speedloader/strilka310/@SUBTYPES{@OLD}