diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index f73acb7c584..6597cda95a0 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -87979,7 +87979,7 @@ /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, /obj/item/trash/liquidfood, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/item/trash/spacetwinkie, /obj/item/trash/raisins, /obj/item/trash/raisins, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index fbbc5126d48..43fef9766d2 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -48755,9 +48755,7 @@ }, /area/station/medical/storage/secondary) "iIS" = ( -/obj/item/trash/spentcasing{ - icon_state = "r-casing" - }, +/obj/item/trash/spentcasing/bullet, /obj/effect/decal/cleanable/blood/splatter, /turf/simulated/floor/plating{ icon_state = "asteroidplating" @@ -54973,9 +54971,7 @@ /area/station/maintenance/asmaint) "kpK" = ( /obj/effect/decal/cleanable/blood/drip, -/obj/item/trash/spentcasing{ - icon_state = "r-casing" - }, +/obj/item/trash/spentcasing/bullet, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, @@ -67874,9 +67870,7 @@ }, /area/station/engineering/control) "ohJ" = ( -/obj/item/trash/spentcasing{ - icon_state = "r-casing" - }, +/obj/item/trash/spentcasing/bullet, /turf/simulated/floor/plating{ icon_state = "asteroidplating" }, diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 862e23ca87a..63fb7cad390 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -32941,7 +32941,7 @@ /turf/simulated/wall, /area/station/science/research) "ggS" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/landmark/burnturf, /turf/simulated/floor/plasteel{ @@ -34302,7 +34302,7 @@ /area/station/public/dorms) "gtw" = ( /obj/effect/landmark/burnturf, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/spawner/random_spawners/cobweb_left_rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -47269,7 +47269,7 @@ }, /area/station/security/range) "iOO" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/spawner/random_spawners/blood_maybe, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -48222,7 +48222,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) "iXG" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" @@ -63939,7 +63939,7 @@ "lWJ" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "lWR" = ( @@ -70922,7 +70922,7 @@ /area/station/supply/lobby) "npe" = ( /obj/effect/landmark/burnturf, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) @@ -90701,7 +90701,7 @@ }, /area/station/hallway/primary/central/sw) "qVm" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/landmark/burnturf, /turf/simulated/floor/plating, /area/station/maintenance/dorms/port) @@ -94418,7 +94418,7 @@ /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, /obj/item/trash/liquidfood, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/item/trash/spacetwinkie, /obj/item/trash/raisins, /obj/item/trash/raisins, @@ -95538,7 +95538,7 @@ /turf/simulated/floor/wood, /area/station/service/library) "rMs" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /obj/machinery/economy/atm/directional/west, /turf/simulated/floor/plating, @@ -103374,7 +103374,7 @@ /area/station/supply/sorting) "tic" = ( /obj/item/circuitboard/arcade/orion_trail, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -109862,7 +109862,7 @@ /area/station/science/research) "utj" = ( /obj/item/chair/stool, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /obj/item/food/candy/coin, /obj/effect/landmark/burnturf, @@ -112005,7 +112005,7 @@ /turf/simulated/floor/carpet, /area/station/public/mrchangs) "uMC" = ( -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/dorms/starboard) @@ -118640,7 +118640,7 @@ "vYs" = ( /obj/item/dice/d6, /obj/effect/decal/cleanable/dirt, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "vYu" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 749a1eba6c9..ed6bbd5d7f3 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -70715,7 +70715,7 @@ /area/station/security/permabrig) "oMo" = ( /obj/structure/lattice, -/obj/item/trash/spentcasing, +/obj/item/trash/spentcasing/shotgun, /turf/space, /area/space/nearstation) "oMJ" = ( diff --git a/tools/UpdatePaths/Scripts/27180_spentcasings.txt b/tools/UpdatePaths/Scripts/27180_spentcasings.txt new file mode 100644 index 00000000000..105c9b966f9 --- /dev/null +++ b/tools/UpdatePaths/Scripts/27180_spentcasings.txt @@ -0,0 +1,2 @@ +/obj/item/trash/spentcasing{icon_state="r-casing"} : /obj/item/trash/spentcasing/bullet +/obj/item/trash/spentcasing : /obj/item/trash/spentcasing/shotgun diff --git a/tools/maplint/lints/spentcasing_roottype.yml b/tools/maplint/lints/spentcasing_roottype.yml new file mode 100644 index 00000000000..c9665ccb12d --- /dev/null +++ b/tools/maplint/lints/spentcasing_roottype.yml @@ -0,0 +1,3 @@ +help: 'Use one of the spent casing subtypes for mapping.' +=/obj/item/trash/spentcasing: + banned: true