Merge pull request #5304 from Superlagg/its-a-good-system-this-CMLS

Revert "Merge pull request #5253 from Kilmented/master"
ARF-SS13 · Jun 29, 2024 · eb5998e · eb5998e
2 parents 31f8c0f + d02dd79
commit eb5998e
Show file tree

Hide file tree

Showing 145 changed files with 1,871 additions and 5,981 deletions.
diff --git a/CMLS.txt b/CMLS.txt
diff --git a/_maps/map_files/CB-WIP/Bowie_County.dmm b/_maps/map_files/CB-WIP/Bowie_County.dmm
@@ -2806,7 +2806,7 @@
 /area/f13/building)
 "jU" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/item/stack/rods/fifty,
 /turf/open/floor/wood_common,
 /area/f13/wasteland)

diff --git a/_maps/map_files/CB-WIP/Dekalb.dmm b/_maps/map_files/CB-WIP/Dekalb.dmm
@@ -1561,7 +1561,7 @@
 	},
 /area/f13/wasteland)
 "LS" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13{
 	icon_state = "purpledirtyfull"
 	},

diff --git a/_maps/map_files/CB-WIP/deerpinepass-alpha.dmm b/_maps/map_files/CB-WIP/deerpinepass-alpha.dmm
@@ -1339,7 +1339,7 @@
 /turf/closed/wall/r_wall/rust,
 /area/f13/wasteland)
 "kF" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13{
 	icon_state = "purpledirtyfull"
 	},

diff --git a/_maps/map_files/Fortress Nash/FortNash1.dmm b/_maps/map_files/Fortress Nash/FortNash1.dmm
@@ -2759,7 +2759,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "akS" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "akT" = (
@@ -59651,7 +59651,7 @@
 /area/f13/building/church)
 "qPw" = (
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3,
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13{
 	icon_state = "bluerustysolid"
 	},
@@ -71526,7 +71526,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/cafeteria,
 /area/f13/building/hospital)
 "vqq" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13/wood,
 /area/f13/building/abandoned)
 "vqy" = (

diff --git a/_maps/map_files/Fortress Nash/FortNashLower.dmm b/_maps/map_files/Fortress Nash/FortNashLower.dmm
@@ -279,7 +279,7 @@
 	},
 /area/f13/building/sewers)
 "aij" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/book/granter/crafting_recipe/gunsmith_four,
 /turf/open/floor/f13{
@@ -762,7 +762,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
 /area/f13/tunnel)
 "aDN" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked_basic,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "aEe" = (
@@ -8932,7 +8932,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
@@ -19394,7 +19394,7 @@
 	},
 /area/f13/building/sewers)
 "nND" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/effect/spawner/lootdrop/f13/blueprintLowPartsWeighted,
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ballistic/highmid,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
@@ -20155,7 +20155,7 @@
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/building/sewers)
 "otS" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/caves)
 "oud" = (
@@ -26964,7 +26964,7 @@
 	},
 /area/f13/caves)
 "tSC" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked,
 /turf/open/floor/plasteel/f13/vault_floor/dark{
 	icon_state = "darkrusty"
 	},

diff --git a/_maps/map_files/Fortress Nash/FortNashUpper1.dmm b/_maps/map_files/Fortress Nash/FortNashUpper1.dmm
@@ -6087,7 +6087,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building/mall)
 "idL" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked,
 /obj/item/book/granter/crafting_recipe/gunsmith_one,
 /obj/item/book/granter/crafting_recipe/gunsmith_three,
 /obj/item/book/granter/crafting_recipe/gunsmith_two,

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm
@@ -306,7 +306,7 @@
 	},
 /area/f13/building/sewers)
 "aij" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/book/granter/crafting_recipe/gunsmith_four,
 /turf/open/floor/f13{
@@ -848,7 +848,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
 /area/f13/tunnel)
 "aDN" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked_basic,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "aEe" = (
@@ -10034,7 +10034,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
@@ -22024,7 +22024,7 @@
 	},
 /area/f13/building/sewers)
 "nND" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/caves)
 "nNP" = (
@@ -22817,7 +22817,7 @@
 /turf/open/floor/carpet/black,
 /area/f13/building)
 "otS" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/caves)
 "oul" = (
@@ -30857,7 +30857,7 @@
 	},
 /area/f13/caves)
 "tSC" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked,
 /turf/open/floor/plasteel/f13/vault_floor/dark{
 	icon_state = "darkrusty"
 	},

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Upper.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Upper.dmm
@@ -8847,7 +8847,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building/mall)
 "idL" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked,
 /obj/item/book/granter/crafting_recipe/gunsmith_one,
 /obj/item/book/granter/crafting_recipe/gunsmith_three,
 /obj/item/book/granter/crafting_recipe/gunsmith_two,

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm
@@ -7430,7 +7430,7 @@
 /area/f13/caves)
 "dgD" = (
 /obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier3,
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13{
 	icon_state = "bluerustysolid"
 	},
@@ -9176,7 +9176,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vault1,
 /area/f13/building)
 "dRT" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked,
 /obj/item/book/granter/crafting_recipe/gunsmith_one,
 /obj/item/book/granter/crafting_recipe/gunsmith_two,
 /obj/item/book/granter/crafting_recipe/gunsmith_three,
@@ -12638,7 +12638,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked_basic,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/building)
 "fnE" = (
@@ -16264,7 +16264,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/village)
 "gLG" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/machinery/light/small{
 	dir = 8
 	},
@@ -16579,7 +16579,7 @@
 	},
 /area/f13/wasteland)
 "gSx" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo/unlocked_basic,
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
@@ -22128,7 +22128,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13/wood{
 	icon_state = "housewood2"
 	},
@@ -34415,7 +34415,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/building)
 "ovg" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/item/stack/sheet/metal,
 /turf/open/floor/f13/wood,
 /area/f13/building)
@@ -42189,7 +42189,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "rWL" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "rWN" = (
@@ -47093,7 +47093,7 @@
 /turf/open/floor/f13,
 /area/f13/building)
 "udt" = (
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /turf/open/floor/f13/wood,
 /area/f13/village)
 "udx" = (
@@ -49222,7 +49222,7 @@
 /area/f13/brotherhood/surface)
 "uZd" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/CMLS_ammo_vending_machine,
+/obj/machinery/autolathe/ammo,
 /obj/item/stack/rods/fifty,
 /turf/open/floor/f13/wood,
 /area/f13/village)