diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index b681f31dce2..d18e854c461 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -145,7 +145,7 @@ trait_name = "Station" map_files = ["catwalk_supermatter.dmm"] directory = "_maps/bubber/automapper/templates/CatwalkStation/" required_map = "CatwalkStation_2023.dmm" -coordinates = [171, 163, 1] +coordinates = [172, 163, 1] trait_name = "Station" # CENTRAL COMMAND MAP EDITS @@ -516,22 +516,6 @@ required_map = "NebulaStation.dmm" coordinates = [90, 132, 1] trait_name = "Station" -# Nebulastation Library East -[templates.nebulastation_library_e] -map_files = ["nebulastation_library_e.dmm"] -directory = "_maps/bubber/automapper/templates/NebulaStation/" -required_map = "NebulaStation.dmm" -coordinates = [105, 133, 2] -trait_name = "Station" - -# Nebulastation Library West -[templates.nebulastation_library_w] -map_files = ["nebulastation_library_w.dmm"] -directory = "_maps/bubber/automapper/templates/NebulaStation/" -required_map = "NebulaStation.dmm" -coordinates = [91, 133, 2] -trait_name = "Station" - # Nebulastation NTR Office [templates.nebulastation_ntrep_office] map_files = ["nebulastation_ntrep_office.dmm"] diff --git a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_arrivals.dmm b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_arrivals.dmm index 30d63549633..3c56cc97e84 100644 --- a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_arrivals.dmm +++ b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_arrivals.dmm @@ -28,15 +28,6 @@ /obj/structure/chair/sofa/bench/tram/left, /turf/open/water, /area/station/hallway/secondary/entry) -"fD" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/chair/sofa/bench/tram/left, -/turf/open/floor/iron/white, -/area/station/hallway/secondary/entry) "iU" = ( /obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/dark_blue{ @@ -83,6 +74,7 @@ }, /obj/effect/turf_decal/tile/dark_blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "mO" = ( @@ -91,9 +83,14 @@ /area/template_noop) "mW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/template_noop, -/area/template_noop) +/obj/structure/cable, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/entry) "ne" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 1 @@ -121,8 +118,6 @@ "ry" = ( /obj/structure/flora/bush/fullgrass/style_random, /obj/structure/flora/bush/ferny/style_random, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/hallway/secondary/entry) "ty" = ( @@ -225,10 +220,6 @@ /obj/effect/turf_decal/siding/brown{ dir = 10 }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/turf_decal/tile/dark_blue{ dir = 1 }, @@ -254,6 +245,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "FP" = ( @@ -340,6 +333,14 @@ /obj/machinery/computer/shuttle/arrivals/recall, /turf/open/water, /area/station/hallway/secondary/entry) +"NX" = ( +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/entry) "Oa" = ( /obj/structure/lattice/catwalk, /obj/machinery/camera/autoname/directional/south, @@ -399,20 +400,14 @@ }, /obj/effect/turf_decal/tile/dark_blue, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 }, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "Ru" = ( -/obj/effect/turf_decal/tile/dark_blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/hallway/secondary/entry) +/obj/structure/cable, +/turf/template_noop, +/area/template_noop) "RA" = ( /obj/item/kirbyplants/random, /turf/template_noop, @@ -425,6 +420,7 @@ /obj/effect/turf_decal/tile/dark_blue, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "RZ" = ( @@ -489,6 +485,17 @@ /obj/structure/sign/poster/timeclock_psa/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"UQ" = ( +/obj/effect/landmark/start/assistant, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue, +/obj/structure/chair/sofa/bench/tram/right, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/hallway/secondary/entry) "UZ" = ( /obj/machinery/light/directional/west, /turf/template_noop, @@ -523,8 +530,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark_blue, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/hallway/secondary/entry) "Zv" = ( @@ -601,7 +607,7 @@ jp jp jp jp -jp +NX rc BJ tI @@ -925,7 +931,7 @@ wG "} (16,1,1) = {" kX -iU +UQ Da jp zG @@ -939,7 +945,7 @@ UP BE rc rc -Ru +rc UE Cs MZ @@ -951,22 +957,22 @@ wG "} (17,1,1) = {" kX -fD +RZ BY RQ RQ lA -jp -jp -jp -jp -jp -jp -jp -jp -jp -jp +mW +mW +mW Zk +Zk +Zk +Zk +rc +rc +rc +rc BJ tI zH @@ -988,11 +994,11 @@ kX kX mO kX +Ru kX kX kX kX -mW RA kX kX @@ -1014,7 +1020,7 @@ kX kX kX kX -kX +Ru kX kX kX diff --git a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_centcom.dmm b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_centcom.dmm index 19eec7a9023..74b6e4d3948 100644 --- a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_centcom.dmm +++ b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_centcom.dmm @@ -7,15 +7,15 @@ dir = 4 }, /obj/machinery/newscaster/directional/north, -/turf/template_noop, -/area/template_noop) +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "f" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/light/cold/dim/directional/north, -/turf/template_noop, -/area/template_noop) +/obj/machinery/light/cold/dim/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "j" = ( /obj/machinery/door/airlock/maintenance, /turf/open/floor/engine/hull, @@ -114,11 +114,6 @@ }, /turf/template_noop, /area/template_noop) -"M" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "N" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -127,12 +122,8 @@ /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "P" = ( -/obj/machinery/door/airlock/external{ - name = "Auxiliary Ship Docks" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) "Q" = ( /obj/machinery/door/airlock/external{ @@ -163,7 +154,7 @@ (1,1,1) = {" u u -u +G P z c @@ -182,7 +173,7 @@ u u u d -M +Y Y x Y @@ -216,7 +207,7 @@ u "} (4,1,1) = {" u -u +G f E Y @@ -234,8 +225,8 @@ u "} (5,1,1) = {" u -u -u +G +G G z z @@ -253,10 +244,10 @@ u (6,1,1) = {" u u -u Z -u -u +Z +Z +Z u u u diff --git a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_supermatter.dmm b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_supermatter.dmm index 2bb8393bc18..1f2b8cb2422 100644 --- a/_maps/bubber/automapper/templates/CatwalkStation/catwalk_supermatter.dmm +++ b/_maps/bubber/automapper/templates/CatwalkStation/catwalk_supermatter.dmm @@ -1,48 +1,33 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"b" = ( +/turf/template_noop, +/area/template_noop) +"z" = ( /obj/structure/sign/delam_procedure, /turf/closed/wall/r_wall, /area/station/engineering/supermatter) -"b" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/engine, -/area/station/engineering/supermatter) -"z" = ( -/turf/open/floor/noslip, -/area/station/engineering/supermatter/room) -"E" = ( +"D" = ( +/obj/machinery/atmospherics/components/unary/delam_scram/directional/west, /turf/template_noop, /area/template_noop) -"J" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/supermatter) -"L" = ( -/turf/template_noop, -/area/station/engineering/supermatter/room) "O" = ( /obj/machinery/button/delam_scram, /turf/template_noop, /area/template_noop) -"Q" = ( -/obj/machinery/atmospherics/components/unary/delam_scram/directional/east{ - dir = 8 - }, -/turf/template_noop, -/area/template_noop) (1,1,1) = {" -L -a +O +b "} (2,1,1) = {" z b "} (3,1,1) = {" -O -J +b +b "} (4,1,1) = {" -E -Q +b +D "} diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_aux.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_aux.dmm index be7ff072ce0..05a99774965 100644 --- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_aux.dmm +++ b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_aux.dmm @@ -1,23 +1,15 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "bc" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Engineering External Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, -/area/station/commons/dock/aux) -"bx" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing{ +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/structure/marker_beacon/yellow, -/obj/structure/railing, -/turf/open/space/basic, -/area/space/nearstation) +/turf/template_noop, +/area/template_noop) +"bx" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/engineering/main) "by" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -66,14 +58,7 @@ }, /area/station/maintenance/aft/lesser) "hT" = ( -/obj/machinery/door/airlock/external/glass{ - name = "Engineering External Access" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, +/turf/closed/wall/r_wall, /area/station/commons/dock/aux) "ic" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -178,6 +163,15 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/textured, /area/station/commons/dock/aux) +"nT" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark/small, +/area/station/engineering/main) "nY" = ( /obj/structure/lattice, /turf/open/space/basic, @@ -621,10 +615,8 @@ /turf/open/floor/iron/dark/textured, /area/station/commons/dock/aux) "Lo" = ( -/obj/machinery/light/floor, -/obj/effect/turf_decal/box, -/turf/open/floor/plating, -/area/station/commons/dock/aux) +/turf/closed/wall/r_wall, +/area/station/engineering/main) "Lr" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 4 @@ -1036,9 +1028,9 @@ uD ic na Hm -wX hT -wX +hT +hT Wp Wp EO @@ -1053,9 +1045,9 @@ qW As yM Hm -wX -Lo -wX +hT +xq +xq xq xq xq @@ -1069,13 +1061,13 @@ Ch uD Gq XZ -wX -wX -bc -wX +hT +hT +xq +xq +xq +xq xq -Yn -Yn Yn "} (19,1,1) = {" @@ -1087,12 +1079,12 @@ kk lw oL qC -nY -bx -nY xq -Yn -Yn +xq +xq +xq +xq +xq Yn "} (20,1,1) = {" @@ -1104,12 +1096,12 @@ vn kx QB qC -Yn -Yn -Yn -Yn -Yn -Yn +xq +xq +xq +xq +xq +xq Yn "} (21,1,1) = {" @@ -1121,12 +1113,12 @@ PI Pv qK qC -Yn -Yn -Yn -Yn -Yn -Yn +xq +xq +xq +xq +xq +xq Yn "} (22,1,1) = {" @@ -1138,12 +1130,12 @@ RA ud pN Yd -Yn -bx -Yn -Yn -Yn -Yn +xq +xq +xq +xq +xq +xq Yn "} (23,1,1) = {" @@ -1155,6 +1147,15 @@ ho Lr Dx Ah +bx +bx +Lo +xq +xq +xq +xq +"} +(24,1,1) = {" Yn Yn Yn @@ -1162,6 +1163,14 @@ Yn Yn Yn Yn +Yn +nT +bc +Yn +Yn +Yn +Yn +Yn "} (1,1,2) = {" @@ -1555,3 +1564,20 @@ Yn Yn Yn "} +(24,1,2) = {" +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +xq +"} diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_e.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_e.dmm deleted file mode 100644 index 5ad54f835fc..00000000000 --- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_e.dmm +++ /dev/null @@ -1,98 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/turf/open/floor/grass, -/area/station/service/library/upper) -"j" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_yw, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) -"x" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) -"A" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/grass, -/area/station/service/library/upper) -"F" = ( -/turf/template_noop, -/area/template_noop) -"I" = ( -/obj/machinery/camera/autoname/directional/east, -/turf/template_noop, -/area/template_noop) -"J" = ( -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/fullgrass, -/obj/structure/marker_beacon/lime, -/turf/open/floor/grass, -/area/station/service/library/upper) -"L" = ( -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) -"N" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/large{ - pixel_y = -2 - }, -/obj/structure/marker_beacon/lime, -/turf/open/floor/grass, -/area/station/service/library/upper) -"T" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/flowers_yw, -/turf/open/floor/grass, -/area/station/service/library/upper) -"V" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) - -(1,1,1) = {" -F -F -F -V -a -L -F -F -"} -(2,1,1) = {" -I -x -a -j -F -T -a -A -"} -(3,1,1) = {" -F -F -N -F -F -F -J -F -"} diff --git a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_w.dmm b/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_w.dmm deleted file mode 100644 index 68d94aaa6c0..00000000000 --- a/_maps/bubber/automapper/templates/NebulaStation/nebulastation_library_w.dmm +++ /dev/null @@ -1,91 +0,0 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"e" = ( -/obj/machinery/camera/autoname/directional/west, -/turf/template_noop, -/area/template_noop) -"f" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_yw, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) -"o" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/large{ - pixel_y = -2 - }, -/obj/structure/marker_beacon/lime, -/turf/open/floor/grass, -/area/station/service/library/upper) -"p" = ( -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) -"t" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/turf/open/floor/grass, -/area/station/service/library/upper) -"D" = ( -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/fullgrass, -/obj/structure/marker_beacon/lime, -/turf/open/floor/grass, -/area/station/service/library/upper) -"T" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/flowers_yw, -/turf/open/floor/grass, -/area/station/service/library/upper) -"V" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/lavendergrass/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/grass, -/area/station/service/library/upper) -"X" = ( -/obj/structure/flora/bush/fullgrass, -/obj/structure/flora/bush/grassy/style_random, -/obj/structure/flora/bush/flowers_br/style_2, -/turf/open/floor/grass, -/area/station/service/library/upper) - -(1,1,1) = {" -a -a -o -a -a -a -D -a -"} -(2,1,1) = {" -e -X -t -f -a -T -t -V -"} -(3,1,1) = {" -a -a -a -p -t -p -a -a -"} diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index f3d369214c0..f6de6e94f6c 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -2596,7 +2596,7 @@ /obj/machinery/modular_computer/preset/id{ dir = 4 }, -/obj/item/computer_disk/quartermaster, +/obj/item/disk/computer/quartermaster, /obj/machinery/keycard_auth/wall_mounted/directional/south, /turf/open/floor/mineral/gold, /area/station/command/heads_quarters/qm) @@ -12066,10 +12066,11 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/effect/spawner/random/trash/moisture_trap, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 }, +/obj/structure/sink/directional/east, +/obj/structure/mirror/directional/west, /turf/open/floor/iron/dark, /area/station/command/secure_bunker) "dfp" = ( @@ -16969,7 +16970,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, /turf/open/floor/iron/dark, /area/station/science/ordnance) "esm" = ( @@ -18330,12 +18331,6 @@ /obj/machinery/status_display/shuttle/directional/south, /turf/open/floor/grass, /area/station/service/hydroponics) -"eKI" = ( -/obj/structure/sink/directional/east, -/obj/structure/mirror/directional/west, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/command/secure_bunker) "eKL" = ( /turf/closed/wall/r_wall/rust, /area/station/security/execution/education) @@ -54797,7 +54792,6 @@ /obj/structure/closet/crate/wooden/toy, /obj/item/toy/figure/clown, /obj/item/toy/figure/mime, -/obj/item/inspector/clown/bananium, /obj/item/radio/intercom/directional/south, /obj/item/bot_assembly/honkbot, /obj/item/bikehorn, @@ -61711,7 +61705,7 @@ dir = 1 }, /obj/machinery/modular_computer/preset/cargochat/security, -/obj/item/computer_disk/security, +/obj/item/disk/computer/security, /turf/open/floor/iron/dark, /area/station/security/office) "pNC" = ( @@ -64080,11 +64074,11 @@ "qsl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table, -/obj/item/computer_disk, -/obj/item/computer_disk{ +/obj/item/disk/computer, +/obj/item/disk/computer{ pixel_y = 3 }, -/obj/item/computer_disk{ +/obj/item/disk/computer{ pixel_y = 6 }, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -72659,6 +72653,7 @@ /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, +/obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/iron/dark, /area/station/command/secure_bunker) "sFC" = ( @@ -81219,11 +81214,11 @@ /turf/open/floor/iron/white, /area/station/science/lab) "uRQ" = ( -/obj/structure/sign/warning/secure_area/directional/east, /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 }, /obj/effect/turf_decal/sand/plating, +/obj/structure/sign/warning/secure_area/directional/east, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) "uSe" = ( @@ -90775,7 +90770,7 @@ /area/station/commons/storage/primary) "xsY" = ( /obj/structure/table/glass/plasmaglass, -/obj/item/computer_disk/ordnance, +/obj/item/disk/computer/ordnance, /obj/item/circuitboard/aicore, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/rd) @@ -255209,7 +255204,7 @@ hwC syq mAM vNa -eKI +dJP dfn epC mAM diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index 8a40659a003..c8d7f3b0157 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -60,7 +60,9 @@ * just_initialized - If the spark is just being created, and we need to manually affect everything in the location */ /obj/effect/particle_effect/sparks/proc/affect_location(turf/location, just_initialized = FALSE) +#ifndef UNIT_TESTS // Bubber Edit: Start - I have no fucking idea what makes us so special to have our sparks explode the unit testing chamber. location.hotspot_expose(1000, 100) +#endif // Bubber Edit: End SEND_SIGNAL(location, COMSIG_ATOM_TOUCHED_SPARKS, src) // for plasma floors; other floor types only have to worry about the mysterious HAZARDOUS sparks if(just_initialized) for(var/atom/movable/singed in location) @@ -78,12 +80,13 @@ SIGNAL_HANDLER SEND_SIGNAL(singed, COMSIG_ATOM_TOUCHED_SPARKS, src) +#ifndef UNIT_TESTS // Bubber Edit: I have no fucking idea what makes us so special to have our sparks explode the unit testing chamber. if(isobj(singed)) var/datum/reagents/reagents = singed.reagents // heat up things that contain reagents before we check to see if they burn if(reagents && !(reagents.flags & SEALED_CONTAINER)) reagents.expose_temperature(1000) // we set this at 1000 because that's the max reagent temp for a chem heater, higher temps require more than sparks return - +#endif // Bubber edit End. if(ishuman(singed)) var/mob/living/carbon/human/singed_human = singed for(var/obj/item/anything in singed_human.get_visible_items()) diff --git a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm index a456656e67b..2c22eb5a540 100644 --- a/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm +++ b/modular_zubbers/code/modules/syndicate_offstation/equipment_items/mod_types.dm @@ -38,7 +38,6 @@ /obj/item/mod/module/shove_blocker, /obj/item/mod/module/night, /obj/item/mod/module/welding/syndicate, - /obj/item/mod/module/headprotector, ) default_pins = list( /obj/item/mod/module/jetpack/advanced, diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/types.ts b/tgui/packages/tgui/interfaces/PreferencesMenu/types.ts index 261bce48aac..9725261ebc5 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/types.ts +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/types.ts @@ -190,32 +190,31 @@ export type CharacterPreferencesData = { preview_options: string[]; // SKYRAT EDIT ADDITION preview_selection: string; // SKYRAT EDIT ADDITION - character_preferences: { - clothing: Record; - features: Record; - game_preferences: Record; - non_contextual: { - random_body: RandomSetting; - [otherKey: string]: unknown; - }; - secondary_features: Record; - character_basics: Record; // BUBBER EDIT ADDITION: more character setup tabs - ooc_preferences: Record; // BUBBER EDIT ADDITION: more character setup tabs - silicon_preferences: Record; // BUBBER EDIT ADDITION: more character setup tabs - supplemental_features: Record; - manually_rendered_features: Record; + clothing: Record; + features: Record; + game_preferences: Record; + non_contextual: { + random_body: RandomSetting; + [otherKey: string]: unknown; + }; + secondary_features: Record; + character_basics: Record; // BUBBER EDIT ADDITION: more character setup tabs + ooc_preferences: Record; // BUBBER EDIT ADDITION: more character setup tabs + silicon_preferences: Record; // BUBBER EDIT ADDITION: more character setup tabs + supplemental_features: Record; + manually_rendered_features: Record; names: Record; - misc: { - gender: Gender; - joblessrole: JoblessRole; - species: string; - loadout_lists: LoadoutList; // BUBBER EDIT: Multiple loadout presets: ORIGINAL: loadout_list: LoadoutList; - job_clothes: BooleanLike; - loadout_index: string; // BUBBER EDIT ADDITION: Multiple loadout presets - background_state: string; // BUBBER EDIT ADDITION: Swappable character editor backgrounds - }; + misc: { + gender: Gender; + joblessrole: JoblessRole; + species: string; + loadout_lists: LoadoutList; // BUBBER EDIT: Multiple loadout presets: ORIGINAL: loadout_list: LoadoutList; + job_clothes: BooleanLike; + loadout_index: string; // BUBBER EDIT ADDITION: Multiple loadout presets + background_state: string; // BUBBER EDIT ADDITION: Swappable character editor backgrounds + }; randomization: Record; };