diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index afa495d093..005dc628cc 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -635,17 +635,12 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "abN" = ( -<<<<<<< HEAD /obj/machinery/door/poddoor/shutters{ id = "armory"; name = "Armoury Shutter" }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, -======= -/obj/structure/closet/secure_closet/lethalshots, -/turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/ai_monitored/security/armory) "abO" = ( /turf/open/floor/plasteel/showroomfloor, @@ -823,7 +818,6 @@ /turf/open/floor/plasteel/freezer, /area/security/prison) "aci" = ( -<<<<<<< HEAD /obj/machinery/door/poddoor/shutters{ id = "armory"; name = "Armoury Shutter" @@ -831,10 +825,6 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, -======= -/obj/vehicle/secway, -/turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/ai_monitored/security/armory) "acj" = ( /obj/machinery/light{ @@ -5039,14 +5029,10 @@ pixel_x = -28; pixel_y = -8 }, -<<<<<<< HEAD /obj/structure/cable{ icon_state = "1-2" }, /turf/open/floor/plasteel/black, -======= -/turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/security/brig) "alA" = ( /obj/structure/table/reinforced, @@ -11978,38 +11964,16 @@ /turf/closed/wall, /area/crew_quarters/theatre/mime) "aDs" = ( -<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/crew_quarters/theatre/mime) -======= -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/turf_decal/bot_white/right, -/turf/open/floor/plasteel/vault{ - dir = 1 - }, -/area/ai_monitored/nuke_storage) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) "aDt" = ( /turf/closed/wall, /area/crew_quarters/theatre/clown) "aDv" = ( -<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/crew_quarters/theatre/clown) -======= -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/turf_decal/bot_white/left, -/turf/open/floor/plasteel/vault{ - dir = 4 - }, -/area/ai_monitored/nuke_storage) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) "aDw" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -24423,15 +24387,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -<<<<<<< HEAD /turf/open/floor/plasteel/vault{ dir = 4 }, /area/ai_monitored/nuke_storage) -======= -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) "bjz" = ( /turf/closed/wall/r_wall, /area/maintenance/central) @@ -25668,15 +25627,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -<<<<<<< HEAD /turf/open/floor/plasteel/vault{ dir = 1 }, /area/ai_monitored/nuke_storage) -======= -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) "bmw" = ( /obj/machinery/light{ dir = 4 @@ -26313,13 +26267,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -<<<<<<< HEAD /turf/open/floor/plasteel/vault, /area/ai_monitored/nuke_storage) -======= -/turf/open/floor/plasteel/dark, -/area/engine/gravity_generator) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) "bnV" = ( /obj/machinery/camera/motion{ c_tag = "Vault"; @@ -47921,12 +47870,8 @@ /obj/structure/cable{ icon_state = "1-4" }, -<<<<<<< HEAD /obj/machinery/atmospherics/pipe/manifold4w/scrubbers, -/turf/open/floor/plasteel/black, -======= /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/engine/engine_smes) "cnP" = ( /obj/machinery/power/terminal{ @@ -47936,14 +47881,10 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/plasteel/black, -======= /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/engine/engine_smes) "cnQ" = ( /obj/structure/cable{ @@ -60222,7 +60163,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -<<<<<<< HEAD /turf/open/floor/plating, /area/engine/gravity_generator) "Qvx" = ( @@ -60254,48 +60194,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -======= -/obj/item/stack/cable_coil, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoD" = ( -/obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoG" = ( -/obj/structure/girder, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoH" = ( -/obj/item/wrench, -/obj/item/weldingtool, -/obj/item/clothing/head/welding{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/structure/rack, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoI" = ( -/obj/machinery/light, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /turf/open/floor/plating, /area/engine/gravity_generator) "QvA" = ( @@ -60311,23 +60209,10 @@ }, /obj/structure/cable, /turf/open/floor/plating, -<<<<<<< HEAD /area/engine/gravity_generator) "QvB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 -======= -/area/engine/engineering) -"QoK" = ( -/obj/item/crowbar/large, -/obj/structure/rack, -/obj/item/device/flashlight, -/turf/open/floor/plasteel/dark, -/area/engine/engineering) -"QoL" = ( -/obj/machinery/camera{ - c_tag = "Kitchen Cold Room" ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) }, /turf/closed/wall/r_wall, /area/engine/gravity_generator) @@ -60352,24 +60237,8 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -<<<<<<< HEAD /turf/closed/wall/r_wall, /area/engine/gravity_generator) -======= -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) -"QoS" = ( -/obj/machinery/computer/rdconsole/production, -/turf/open/floor/plasteel, -/area/engine/engineering) -"QoT" = ( -/obj/effect/turf_decal/loading_area, -/turf/open/floor/plasteel/showroomfloor, -/area/crew_quarters/kitchen) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) (1,1,1) = {" aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5b94f11fca..5dcdee3bca 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -25902,14 +25902,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -<<<<<<< HEAD /turf/open/floor/plasteel/loadingarea{ -======= -/obj/effect/turf_decal/loading_area{ ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) dir = 1 }, -/obj/machinery/rnd/protolathe/department/service, /turf/open/floor/plasteel, /area/hallway/secondary/service) "bcb" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1fa4c1346b..9805599a28 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13643,14 +13643,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -<<<<<<< HEAD /turf/closed/wall, -======= -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/security/brig) "aCr" = ( /obj/machinery/door/airlock/security{ @@ -14260,14 +14253,10 @@ pixel_x = 29; pixel_y = -2 }, -<<<<<<< HEAD /obj/structure/filingcabinet/chestdrawer{ pixel_y = 3 }, -/turf/open/floor/plasteel/black, -======= /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/security/brig) "aDI" = ( /obj/machinery/requests_console{ @@ -14950,7 +14939,6 @@ /obj/machinery/light/small{ dir = 4 }, -<<<<<<< HEAD /obj/structure/table, /obj/item/folder/red{ pixel_x = 3 @@ -14960,10 +14948,7 @@ pixel_y = 2 }, /obj/item/restraints/handcuffs, -/turf/open/floor/plasteel/black, -======= /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/security/brig) "aEZ" = ( /obj/structure/window/reinforced{ @@ -15673,15 +15658,10 @@ network = list("Prison"); pixel_y = -30 }, -<<<<<<< HEAD /obj/machinery/computer/secure_data{ dir = 1 }, -/turf/open/floor/plasteel/black, -======= -/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/security/brig) "aGs" = ( /obj/structure/table, @@ -30930,12 +30910,7 @@ "bmh" = ( /obj/machinery/door/firedoor, /obj/machinery/mineral/ore_redemption, -<<<<<<< HEAD -/turf/open/floor/plasteel/black, -======= -/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plasteel/dark, ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) /area/quartermaster/office) "bmi" = ( /obj/effect/spawner/structure/window/reinforced, @@ -80768,42 +80743,6 @@ /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, /area/engine/atmos) -<<<<<<< HEAD -======= -"EDv" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/rnd/protolathe/department/engineering, -/turf/open/floor/plasteel, -/area/engine/engineering) -"EDw" = ( -/obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, -/area/hydroponics) -"EDx" = ( -/turf/closed/wall/mineral/plastitanium, -/area/hallway/secondary/entry) -"EDy" = ( -/turf/open/space, -/turf/closed/wall/mineral/plastitanium{ - dir = 1; - icon_state = "diagonalWall3" - }, -/area/hallway/secondary/entry) -"EDz" = ( -/turf/closed/wall/mineral/plastitanium, -/area/security/prison) -"EDA" = ( -/turf/closed/wall/mineral/plastitanium, -/area/security/prison) -"EDB" = ( -/turf/closed/wall/mineral/plastitanium, -/area/crew_quarters/fitness/recreation) -"EDC" = ( -/turf/closed/wall/mineral/plastitanium, -/area/engine/break_room) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) (1,1,1) = {" aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 1ec652eff8..d1c6ffcd44 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -51246,103 +51246,6 @@ "cCA" = ( /turf/closed/wall, /area/science/lab) -<<<<<<< HEAD -======= -"cCB" = ( -/obj/effect/turf_decal/loading_area{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/quartermaster/storage) -"cCC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/rnd/protolathe/department/cargo, -/turf/open/floor/plasteel, -/area/quartermaster/storage) -"cCD" = ( -/obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, -/area/crew_quarters/kitchen) -"cCE" = ( -/obj/machinery/rnd/protolathe/department/medical, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) -"cCF" = ( -/obj/effect/turf_decal/bot, -/turf/open/floor/plasteel/white, -/area/engine/gravity_generator) -"cCG" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/tcommsat/computer) -"cCH" = ( -/obj/effect/turf_decal/bot/left, -/turf/open/floor/plasteel/white, -/area/engine/gravity_generator) -"cCI" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cCJ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cCK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cCL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cCM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/engine/engineering) -"cCN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/main) -"cCO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/closed/wall, -/area/security/brig) -"cCP" = ( -/obj/effect/turf_decal/bot/right, -/turf/open/floor/plasteel/white, -/area/engine/gravity_generator) -"cCQ" = ( -/obj/effect/turf_decal/bot/right, -/turf/open/floor/plasteel/white, -/area/engine/gravity_generator) -"cCR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 1 - }, -/turf/open/floor/plating/airless, -/area/maintenance/department/chapel/monastery) ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) (1,1,1) = {" aaa @@ -66441,11 +66344,7 @@ cvX cke cky cld -<<<<<<< HEAD ceA -======= -cCR ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) aaa aaa aaa @@ -81075,13 +80974,8 @@ cam cam cdQ cet -<<<<<<< HEAD ceY cbX -======= -cCI -cfV ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) cfU cgu cgU @@ -81594,13 +81488,8 @@ ccc ccV cdR cet -<<<<<<< HEAD ceY cbX -======= -cCI -cfV ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) cfU cgv cgV @@ -83655,13 +83544,8 @@ cch cdc cdX cet -<<<<<<< HEAD ceY cbX -======= -cCI -cfV ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) cfU cgv cgV @@ -83917,13 +83801,8 @@ cam cam cdQ cet -<<<<<<< HEAD ceY cbX -======= -cCI -cfV ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) cfV cgv cfV @@ -84179,13 +84058,8 @@ cci cam cdQ cet -<<<<<<< HEAD ceY cbX -======= -cCI -cfV ->>>>>>> 84f0306... Cleans up floors.dmi a bit and adds new turf decals. (#32860) cfU cgx cgU diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index 4668d396c3..8cacca6d97 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ