diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 5b2a201fdff..d2bcb71dea2 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -22740,10 +22740,7 @@ layer = 2.9 }, /obj/item/extinguisher, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/port) "bsd" = ( @@ -23409,10 +23406,7 @@ dir = 8; layer = 2.9 }, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/port) "buc" = ( @@ -24175,10 +24169,7 @@ /area/station/hallway/secondary/exit) "bwK" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/port) "bwL" = ( @@ -25416,10 +25407,7 @@ /area/space) "bCj" = ( /obj/structure/closet/emcloset, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plasteel, /area/station/maintenance/port) "bCk" = ( @@ -31121,10 +31109,7 @@ /area/station/command/office/rd) "bYk" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "bYm" = ( @@ -33595,10 +33580,7 @@ /area/station/medical/cryo) "cho" = ( /obj/structure/closet/firecloset, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/port) "chp" = ( @@ -40365,10 +40347,7 @@ dir = 8; layer = 2.9 }, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/effect/spawner/random_spawners/cobweb_left_frequent, /turf/simulated/floor/plating, /area/station/maintenance/port) @@ -41764,10 +41743,7 @@ /area/station/maintenance/aft) "cKQ" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cKR" = ( @@ -43264,10 +43240,7 @@ /area/station/science/hallway) "cQC" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cQE" = ( @@ -47886,10 +47859,7 @@ /area/station/turret_protected/aisat/interior) "dhk" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/item/toy/minimeteor, /obj/item/poster/random_contraband, /turf/simulated/floor/plating, @@ -49387,10 +49357,7 @@ /area/station/maintenance/asmaint) "dmr" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dms" = ( @@ -51328,10 +51295,7 @@ /area/station/medical/morgue) "dxN" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plating, /area/station/maintenance/aft) "dxQ" = ( @@ -54219,10 +54183,7 @@ }, /area/station/engineering/smes) "eNn" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "eNs" = ( @@ -55418,10 +55379,7 @@ "fof" = ( /obj/structure/rack, /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fog" = ( @@ -55526,10 +55484,7 @@ "fqt" = ( /obj/item/storage/bag/plasticbag, /obj/item/trash/fried_vox, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "fqw" = ( @@ -56500,10 +56455,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "fPq" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -56774,10 +56726,7 @@ /area/station/hallway/primary/port/west) "fVy" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/item/storage/fancy/cigarettes/dromedaryco, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -58060,10 +58009,7 @@ /area/station/command/office/captain) "gEj" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -60981,10 +60927,7 @@ "iac" = ( /obj/structure/table, /obj/item/wrench, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/aft) "iag" = ( @@ -63310,10 +63253,7 @@ "jmU" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "jnc" = ( @@ -63331,10 +63271,7 @@ }, /obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/port) "jnh" = ( @@ -67478,10 +67415,7 @@ }, /area/station/security/permabrig) "llx" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -69338,10 +69272,7 @@ /area/station/medical/cryo) "meB" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/item/tank/internals/oxygen/yellow, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) @@ -71845,10 +71776,7 @@ /area/station/maintenance/fpmaint2) "nyh" = ( /obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/eight, /turf/simulated/floor/plating, /area/station/maintenance/aft) "nyC" = ( @@ -81440,10 +81368,7 @@ /area/station/hallway/primary/port/east) "rVK" = ( /obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "rVV" = ( @@ -82328,10 +82253,7 @@ }, /area/station/public/toilet/unisex) "ssL" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /obj/item/clothing/gloves/color/blue, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -82936,10 +82858,7 @@ }, /area/station/command/office/ce) "sKQ" = ( -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/three, /obj/structure/sign/poster/official/help_others{ pixel_y = 31 }, @@ -85806,10 +85725,7 @@ "ufC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ugC" = ( @@ -88293,10 +88209,7 @@ /area/station/security/permabrig) "vxz" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/item/reagent_containers/syringe/insulin, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, @@ -93870,10 +93783,7 @@ /area/station/maintenance/apmaint) "yjF" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "yjH" = ( diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 23beea49a86..1895fb4673d 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -21998,8 +21998,7 @@ pixel_y = 2 }, /obj/item/assembly/timer{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/assembly/timer{ pixel_x = 5; @@ -25526,18 +25525,15 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/sign/directions/medical{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/sign/directions/cargo{ dir = 4; - pixel_y = 40; - pixel_x = 0 + pixel_y = 40 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -36473,8 +36469,7 @@ }, /obj/structure/sign/directions/engineering{ dir = 1; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/structure/sign/directions/evac{ pixel_y = -8; @@ -50894,8 +50889,7 @@ }, /obj/structure/table, /obj/item/book/manual/wiki/sop_science{ - pixel_x = -6; - pixel_y = 0 + pixel_x = -6 }, /obj/item/book/manual/wiki/sop_command, /obj/item/paper/monitorkey, @@ -52320,10 +52314,7 @@ pixel_x = 5; pixel_y = -2 }, -/obj/effect/spawner/lootdrop/maintenance{ - pixel_x = -4; - pixel_y = 2 - }, +/obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/starboard) "jUz" = ( @@ -53978,18 +53969,15 @@ }, /obj/structure/sign/directions/evac{ dir = 4; - pixel_x = 0; pixel_y = 24 }, /obj/structure/sign/directions/medical{ dir = 4; - pixel_x = 0; pixel_y = 32 }, /obj/structure/sign/directions/cargo{ dir = 4; - pixel_y = 40; - pixel_x = 0 + pixel_y = 40 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -54062,8 +54050,7 @@ }, /obj/structure/sign/directions/security{ dir = 1; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/sign/directions/service{ dir = 1; @@ -62747,13 +62734,6 @@ /obj/structure/sign/securearea, /turf/simulated/wall, /area/station/engineering/tech_storage) -"nde" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating{ - pixel_x = 0; - pixel_y = 0 - }, -/area/station/maintenance/disposal/south) "ndl" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "rd" @@ -66559,8 +66539,7 @@ }, /obj/structure/sign/directions/security{ dir = 1; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -69031,8 +69010,7 @@ pixel_y = 1 }, /obj/item/assembly/igniter{ - pixel_x = 3; - pixel_y = 0 + pixel_x = 3 }, /obj/item/assembly/igniter{ pixel_y = -1; @@ -69051,7 +69029,6 @@ /obj/machinery/door_control{ id = "maintcham"; name = "Containment Control"; - pixel_y = 0; pixel_x = 26 }, /turf/simulated/floor/plating, @@ -74915,7 +74892,6 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "darkpurplecorners" }, /area/station/maintenance/electrical_shop) @@ -84816,18 +84792,15 @@ }, /obj/structure/sign/directions/security{ dir = 8; - pixel_x = 0; pixel_y = 40 }, /obj/structure/sign/directions/engineering{ dir = 8; - pixel_x = 0; pixel_y = 32 }, /obj/structure/sign/directions/service{ pixel_y = 24; - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -91047,9 +91020,7 @@ "vDm" = ( /obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - pixel_x = 0; - pixel_y = 0 + icon_state = "whitepurple" }, /area/station/science/test_chamber) "vDC" = ( @@ -91408,8 +91379,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/table, /obj/item/storage/box/syringes{ - pixel_x = 5; - pixel_y = 0 + pixel_x = 5 }, /obj/item/reagent_containers/glass/beaker/large{ pixel_x = -12; @@ -92700,7 +92670,6 @@ /obj/machinery/door_control{ id = "maintcham2"; name = "Containment Control"; - pixel_y = 0; pixel_x = 26 }, /turf/simulated/floor/plating, @@ -95575,8 +95544,7 @@ pixel_y = 11 }, /obj/item/storage/box/beakers{ - pixel_x = 10; - pixel_y = 0 + pixel_x = 10 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -97672,8 +97640,7 @@ pixel_y = 10 }, /obj/item/lighter{ - pixel_x = 9; - pixel_y = 0 + pixel_x = 9 }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, @@ -100158,7 +100125,6 @@ /obj/item/mmi, /obj/item/mmi, /turf/simulated/floor/plasteel{ - dir = 2; icon_state = "darkpurplecorners" }, /area/station/science/robotics) @@ -115337,7 +115303,7 @@ sKo ftr bbw qkb -nde +xxU qDH dXN eBJ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index ccee4f46c65..5ed74fa0ff9 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -29043,10 +29043,7 @@ /area/station/maintenance/port) "caj" = ( /obj/structure/closet/crate/can, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, +/obj/effect/spawner/lootdrop/maintenance/two, /obj/item/trash/pistachios, /obj/item/trash/raisins, /obj/item/trash/gum, diff --git a/tools/UpdatePaths/Scripts/26451_maintloot_varedits.txt b/tools/UpdatePaths/Scripts/26451_maintloot_varedits.txt new file mode 100644 index 00000000000..91d32e35637 --- /dev/null +++ b/tools/UpdatePaths/Scripts/26451_maintloot_varedits.txt @@ -0,0 +1,3 @@ +/obj/effect/spawner/lootdrop/maintenance{lootcount=2} : /obj/effect/spawner/lootdrop/maintenance/two +/obj/effect/spawner/lootdrop/maintenance{lootcount=3} : /obj/effect/spawner/lootdrop/maintenance/three +/obj/effect/spawner/lootdrop/maintenance{lootcount=8} : /obj/effect/spawner/lootdrop/maintenance/eight