diff --git a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm index 7d2338a09c6..5bb04203a45 100644 --- a/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm +++ b/_maps/RandomRuins/LavaRuins/bubberstation/lavaland_dauntless.dmm @@ -1146,10 +1146,9 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/dauntless/service/diner) "hc" = ( -/obj/machinery/door/window/survival_pod{ +/obj/machinery/door/window/survival_pod/left/directional/north{ name = "Bar"; - req_access = list("syndicate"); - dir = 1 + req_access = list("syndicate") }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1169,12 +1168,10 @@ /area/ruin/space/has_grav/bubbers/dauntless/service/diner) "hf" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/door/window/survival_pod{ - dir = 2; +/obj/machinery/door/window/survival_pod/left/directional/south{ req_access = list("syndicate") }, -/obj/machinery/door/window/survival_pod{ - dir = 1; +/obj/machinery/door/window/survival_pod/left/directional/north{ req_access = list("syndicate_leader") }, /obj/machinery/door/poddoor/shutters{ @@ -1215,9 +1212,7 @@ "hn" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/machinery/door/window/survival_pod{ - dir = 4 - }, +/obj/machinery/door/window/survival_pod/left/directional/east, /turf/open/floor/plating, /area/ruin/space/has_grav/bubbers/dauntless/service/hydro) "ho" = ( @@ -1925,8 +1920,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/sec/officer) "ln" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/south, -/obj/machinery/door/window/survival_pod{ - dir = 4; +/obj/machinery/door/window/survival_pod/left/directional/east{ name = "Subject B"; req_access = list("syndicate") }, @@ -2192,8 +2186,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/cargo) "mU" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/north, -/obj/machinery/door/window/survival_pod{ - dir = 4; +/obj/machinery/door/window/survival_pod/left/directional/east{ name = "Subject A" }, /obj/effect/turf_decal/tile/dark_red/full, @@ -2549,8 +2542,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/service/kitchen) "oH" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/machinery/door/window/survival_pod{ - dir = 2; +/obj/machinery/door/window/survival_pod/left/directional/south{ name = "Virology Airlock"; req_access = list("syndicate") }, @@ -3186,13 +3178,11 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/dauntless/sec/interrogation) "rD" = ( -/obj/machinery/door/window/survival_pod{ - dir = 8; +/obj/machinery/door/window/survival_pod/left/directional/west{ req_access = list("syndicate_leader"); name = "Isolation" }, -/obj/machinery/door/window/survival_pod{ - dir = 4; +/obj/machinery/door/window/survival_pod/left/directional/east{ req_access = list("syndicate_leader"); name = "Isolation" }, @@ -4321,9 +4311,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/engineering/dispolsals) "xj" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/door/window/survival_pod{ - dir = 1 - }, +/obj/machinery/door/window/survival_pod/left/directional/north, /obj/effect/turf_decal/siding/dark{ dir = 5 }, @@ -4357,8 +4345,7 @@ /turf/closed/wall/r_wall/syndicate/nodiagonal, /area/ruin/space/has_grav/bubbers/dauntless/sec/prison/shower) "xo" = ( -/obj/machinery/door/window/survival_pod{ - dir = 4; +/obj/machinery/door/window/survival_pod/left/directional/east{ req_access = list("syndicate") }, /obj/effect/turf_decal/siding/wood{ @@ -4515,9 +4502,7 @@ /obj/structure/window/reinforced/survival_pod/spawner/directional/east{ pixel_x = 4 }, -/obj/machinery/door/window/survival_pod{ - dir = 1 - }, +/obj/machinery/door/window/survival_pod/left/directional/north, /obj/effect/turf_decal/siding/dark{ dir = 1 }, @@ -5981,7 +5966,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/engineering/dispolsals) "EF" = ( /obj/structure/fans/tiny, -/obj/machinery/door/window/survival_pod{ +/obj/machinery/door/window/survival_pod/left/directional/south{ name = "Slime Pacification Chamber"; req_access = list("syndicate") }, @@ -7662,8 +7647,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/dauntless/service) "Mh" = ( -/obj/machinery/door/window/survival_pod{ - dir = 1; +/obj/machinery/door/window/survival_pod/left/directional/north{ req_access = list("syndicate"); name = "Holding Cell" }, @@ -8333,12 +8317,10 @@ /area/ruin/space/has_grav/bubbers/dauntless/service/dorms) "Qv" = ( /obj/structure/table/reinforced, -/obj/machinery/door/window/survival_pod{ - dir = 4; +/obj/machinery/door/window/survival_pod/left/directional/east{ req_access = list("syndicate_leader") }, -/obj/machinery/door/window/survival_pod{ - dir = 8; +/obj/machinery/door/window/survival_pod/left/directional/west{ heat_proof = 1; req_access = list("syndicate") }, @@ -8566,7 +8548,7 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/bubbers/dauntless/command/vault) "Rk" = ( -/obj/machinery/door/window/survival_pod{ +/obj/machinery/door/window/survival_pod/left/directional/south{ req_access = list("syndicate"); name = "Turbine Access" }, @@ -9020,8 +9002,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/sec/armory) "Tp" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/door/window/survival_pod{ - dir = 8; +/obj/machinery/door/window/survival_pod/left/directional/west{ heat_proof = 1; req_access = list("Syndicate") }, @@ -9077,12 +9058,10 @@ /area/ruin/space/has_grav/bubbers/dauntless/service/freezer) "TC" = ( /obj/structure/table/reinforced/plastitaniumglass, -/obj/machinery/door/window/survival_pod{ - dir = 2; +/obj/machinery/door/window/survival_pod/left/directional/south{ req_access = list("syndicate") }, -/obj/machinery/door/window/survival_pod{ - dir = 1; +/obj/machinery/door/window/survival_pod/left/directional/north{ req_access = list("syndicate_leader") }, /turf/open/floor/iron/dark/smooth_large, @@ -9463,7 +9442,7 @@ /turf/open/floor/wood/tile, /area/ruin/space/has_grav/bubbers/dauntless/service/dorms) "VK" = ( -/obj/machinery/door/window/survival_pod{ +/obj/machinery/door/window/survival_pod/left/directional/south{ name = "Slime Euthanization Chamber"; req_access = list("syndicate") }, @@ -9562,8 +9541,7 @@ /area/ruin/space/has_grav/bubbers/dauntless/sci/rnd) "WC" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, -/obj/machinery/door/window/survival_pod{ - dir = 1; +/obj/machinery/door/window/survival_pod/left/directional/north{ name = "Virology Airlock"; req_access = list("syndicate") }, diff --git a/_maps/bubber/automapper/automapper_config.toml b/_maps/bubber/automapper/automapper_config.toml index 52a7c98634b..2296097a95d 100644 --- a/_maps/bubber/automapper/automapper_config.toml +++ b/_maps/bubber/automapper/automapper_config.toml @@ -138,7 +138,7 @@ trait_name = "Station" map_files = ["Icebox_ntrep_office.dmm"] directory = "_maps/bubber/automapper/templates/IceBoxStation/" required_map = "IceBoxStation.dmm" -coordinates = [88, 128, 3] +coordinates = [87, 128, 3] trait_name = "Station" # Icebox HoP Maint @@ -435,3 +435,12 @@ directory = "_maps/bubber/automapper/templates/generic/" required_map = "CentCom_skyrat_z2.dmm" coordinates = [72, 183, 2] trait_name = "CentCom" + +#Moonstation Ashwalker nest +# Lavaland NE Ashwalker Nest +[templates.lavaland_ashwalker_nenest_moonstation] +map_files = ["lavaland_ashwalker_nenest.dmm"] +directory = "_maps/skyrat/automapper/templates/mining/" +required_map = "moonstation.dmm" +coordinates = [200, 228, 1] +trait_name = "Mining" \ No newline at end of file diff --git a/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm b/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm index 9b651bbf60a..2faa18060f5 100644 --- a/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/IceBoxStation/Icebox_ntrep_office.dmm @@ -1,17 +1,69 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"aa" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"c" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +"ab" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/time_clock/directional/west, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"ag" = ( +/obj/machinery/light/warm/dim/directional/south, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"aj" = ( +/obj/machinery/airalarm/directional/south, +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"ak" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/holopad, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/smooth_large, +/turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"d" = ( +"al" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"am" = ( +/obj/machinery/photocopier, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"an" = ( +/obj/structure/cable, +/obj/effect/landmark/start/nanotrasen_consultant, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"ap" = ( +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"ar" = ( +/obj/structure/chair/comfy/beige{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"as" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"ax" = ( /obj/machinery/door/airlock/corporate{ name = "NT Consultant's Office" }, @@ -24,196 +76,56 @@ dir = 8 }, /obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/nt_rep) -"e" = ( -/obj/effect/turf_decal/bot, -/obj/structure/chair/stool/directional{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) -"f" = ( -/obj/effect/spawner/random/bureaucracy/paper, -/obj/item/toy/crayon/white{ - pixel_y = 10; - pixel_x = 10 - }, -/obj/structure/table/wood, +"az" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"g" = ( -/obj/machinery/light/warm/dim/directional/south, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"h" = ( /obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Nanotrasen Consultant's Office"; - name = "Nanotrasen Consultant's Fax Machine" - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"i" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/brigdoor{ - base_state = "rightsecure"; - icon_state = "rightsecure"; - name = "Consultant's Desk"; - dir = 4; - req_access = list("cent_general") - }, +/obj/effect/spawner/random/bureaucracy/paper, /obj/item/table_clock{ pixel_y = 16 }, -/obj/machinery/door/poddoor/preopen{ - id = "nt_rep_priv"; - name = "Privacy Shutter" - }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/nt_rep) -"k" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"n" = ( -/obj/structure/cable, -/obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"o" = ( -/obj/machinery/vending/boozeomat/all_access, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"p" = ( -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) -"q" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/time_clock/directional/west, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) -"r" = ( -/obj/structure/chair/comfy/beige{ - dir = 1 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"t" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/vending/cigarette, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) -"u" = ( -/obj/machinery/light_switch/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"v" = ( -/obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"w" = ( -/obj/effect/spawner/random/bureaucracy/paper, -/obj/structure/table/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"y" = ( -/obj/structure/sign/flag/nanotrasen/directional/west, -/turf/template_noop, -/area/template_noop) -"A" = ( -/obj/item/kirbyplants/random, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light/warm/dim/directional/west, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"B" = ( +"aB" = ( /obj/structure/chalkboard, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"C" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark/textured_large, -/area/station/command/heads_quarters/nt_rep) -"D" = ( -/obj/structure/bed/double, -/obj/item/bedsheet/centcom/double, -/obj/machinery/light/small/blacklight/directional/east{ - desc = "A small lighting fixture. Why is this here?" - }, -/obj/effect/decal/cleanable/cum, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"E" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/chair/stool/directional{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) -"F" = ( +"aF" = ( /obj/structure/sign/flag/galfed, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"H" = ( -/obj/machinery/modular_computer/preset/command, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"I" = ( -/obj/machinery/airalarm/directional/east{ - pixel_y = -5 +"aG" = ( +/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/button/door/directional/east{ - pixel_y = 10; +/obj/machinery/door/poddoor/shutters/preopen{ id = "nt_rep_priv" }, -/obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/carpet/executive, +/turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"J" = ( -/obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/carpet/executive, +"aK" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"L" = ( +"aL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"M" = ( -/obj/structure/chair/office/tactical{ - dir = 4 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"N" = ( +"aN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -222,7 +134,7 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"O" = ( +"aO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -231,25 +143,148 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"P" = ( -/obj/structure/closet/secure_closet/nanotrasen_consultant/station, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"Q" = ( +"aQ" = ( /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/command/heads_quarters/nt_rep) -"S" = ( +"aR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/command/heads_quarters/nt_rep) +"aS" = ( /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"T" = ( +"aV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/paper, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"aW" = ( +/obj/machinery/light/warm/dim/directional/west, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/textured_large, +/area/station/command/heads_quarters/nt_rep) +"bC" = ( +/obj/structure/bed/double, +/obj/item/bedsheet/centcom/double, +/obj/machinery/light/small/blacklight/directional/east{ + desc = "A small lighting fixture. Why is this here?" + }, +/obj/effect/decal/cleanable/cum, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"bI" = ( +/obj/structure/chair/comfy/lime{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"gQ" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "Consultant's Desk"; + req_access = list("cent_general") + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/nt_rep) +"kw" = ( +/obj/structure/table/reinforced, +/obj/structure/sign/calendar/directional/west, +/obj/machinery/fax{ + fax_name = "Nanotrasen Consultant's Office"; + name = "Nanotrasen Consultant's Fax Machine" + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"lG" = ( +/obj/item/toy/crayon/white{ + pixel_y = -10; + pixel_x = 10 + }, /turf/closed/wall/r_wall, +/area/station/command/heads_quarters/nt_rep) +"os" = ( +/obj/structure/closet/secure_closet/personal/cabinet, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"uj" = ( +/obj/machinery/modular_computer/preset/command, +/obj/machinery/light_switch/directional/east, +/obj/machinery/button/door/directional/east{ + pixel_y = 10; + id = "nt_rep_priv" + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"zI" = ( +/obj/machinery/vending/boozeomat/all_access, +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/nt_rep) +"Fk" = ( +/obj/effect/landmark/start/nanotrasen_consultant, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"KN" = ( +/obj/structure/filingcabinet, +/obj/structure/filingcabinet/medical{ + pixel_x = -10 + }, +/obj/structure/filingcabinet/security{ + pixel_x = 10 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"KT" = ( +/obj/structure/dresser, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"Nh" = ( +/obj/effect/landmark/start/nanotrasen_consultant, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"ND" = ( +/obj/machinery/door/airlock/corporate{ + name = "NT Consultant's Office" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"OJ" = ( +/obj/structure/closet/secure_closet/nanotrasen_consultant/station, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"OY" = ( +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"U" = ( -/turf/template_noop, -/area/template_noop) -"X" = ( +"Qk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/nt_rep) +"TR" = ( +/obj/structure/chair/office/tactical{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) +"WE" = ( /obj/structure/table/reinforced, /obj/item/stamp/centcom{ pixel_x = -6; @@ -270,106 +305,108 @@ pixel_x = 6 }, /obj/machinery/light/warm/dim/directional/west, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"Y" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) -"Z" = ( -/obj/machinery/photocopier, -/obj/structure/table/reinforced, -/obj/structure/sign/calendar/directional/west, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) +"WI" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) +"Zr" = ( +/obj/structure/chair/greyscale{ + dir = 8 + }, +/obj/effect/turf_decal/delivery/white, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) (1,1,1) = {" -a -a -a -a -a -c -a -a +aa +aa +aa +aa +aa +aG +aa +aa "} (2,1,1) = {" -a -Y -J -v -C -L -A -a +aa +OJ +bI +zI +aK +aR +aW +aa "} (3,1,1) = {" -a -P -D -B -n -w -r -a +aa +os +Fk +ND +aQ +aL +as +aa "} (4,1,1) = {" -a -a -F -a -n -f -r -a +aa +KT +bC +aB +an +aV +ar +aa "} (5,1,1) = {" -a -Z -X -o -Q -k -g -a +aa +aa +aF +lG +an +az +aj +aa "} (6,1,1) = {" -a -H -M -I -u -O -h -a +aa +kw +WE +KN +aQ +ak +ag +aa "} (7,1,1) = {" -a -a -i -a -a -d -S -S +aa +uj +TR +Nh +al +aO +am +aa "} (8,1,1) = {" -T -t -E -e -p -N -q -T +aa +aa +gQ +Qk +Qk +ax +aS +aS "} (9,1,1) = {" -U -U -U -U -U -U -U -y +aa +WI +Zr +OY +ap +aN +ab +aa "} diff --git a/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm b/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm index e124fe306da..5c52fea063e 100644 --- a/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/MetaStation/metastation_ntrep_office.dmm @@ -8,35 +8,20 @@ /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "b" = ( -/obj/structure/table/wood, -/obj/item/stamp/centcom{ - pixel_x = 8 - }, -/obj/item/stamp/denied{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/stamp{ - pixel_y = 12; - pixel_x = 8 - }, -/obj/item/paper_bin{ - pixel_y = 4; - pixel_x = -5 - }, -/obj/item/pen/fountain{ - pixel_x = -5 - }, -/turf/open/floor/carpet/executive, +/obj/structure/chair/comfy/beige, +/turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "d" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port) "e" = ( -/obj/effect/turf_decal/siding/wood/corner{ +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "f" = ( /obj/machinery/button/door/directional/west{ @@ -58,11 +43,15 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "h" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/structure/filingcabinet, +/obj/structure/filingcabinet/medical{ + pixel_x = -10 }, -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/wood, +/obj/structure/filingcabinet/security{ + pixel_x = 10 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "i" = ( /obj/structure/bed/dogbed, @@ -76,16 +65,17 @@ "j" = ( /obj/structure/sign/poster/official/random/directional/south, /obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/carpet/executive, +/obj/structure/chair/office/tactical{ + dir = 1 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "k" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "l" = ( /obj/structure/cable, -/obj/structure/chair/comfy/beige, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "p" = ( @@ -115,7 +105,6 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/chair/comfy/beige, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "w" = ( @@ -129,8 +118,11 @@ /area/station/hallway/primary/port) "x" = ( /obj/machinery/light/directional/west, -/obj/machinery/photocopier, -/turf/open/floor/carpet/executive, +/obj/machinery/modular_computer/preset/command{ + dir = 4 + }, +/obj/structure/sign/calendar/directional/west, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "y" = ( /obj/machinery/firealarm/directional/east, @@ -139,7 +131,7 @@ /obj/machinery/light/small/blacklight/directional/east{ desc = "A small lighting fixture. Why is this here?" }, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "z" = ( /obj/machinery/holopad, @@ -147,14 +139,32 @@ /area/station/command/heads_quarters/nt_rep) "A" = ( /obj/structure/closet/secure_closet/nanotrasen_consultant/station, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "B" = ( -/obj/effect/landmark/start/nanotrasen_consultant, -/obj/structure/chair/office/tactical{ +/obj/structure/table/wood, +/obj/item/pen/fountain{ + pixel_x = -5 + }, +/obj/item/paper_bin{ + pixel_y = 4; + pixel_x = -5 + }, +/obj/item/stamp/centcom{ + pixel_x = 8 + }, +/obj/item/stamp/denied{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/stamp{ + pixel_y = 12; + pixel_x = 8 + }, +/obj/effect/turf_decal/siding/wood{ dir = 1 }, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "C" = ( /obj/structure/cable, @@ -170,6 +180,9 @@ /area/template_noop) "E" = ( /obj/machinery/airalarm/directional/south, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "F" = ( @@ -184,14 +197,18 @@ /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "I" = ( -/obj/machinery/modular_computer/preset/command{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/obj/structure/sign/calendar/directional/west, -/turf/open/floor/carpet/executive, +/obj/machinery/fax{ + fax_name = "Nanotrasen Consultant's Office"; + name = "Nanotrasen Consultant's Fax Machine" + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "L" = ( -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "M" = ( /obj/machinery/time_clock/directional/south, @@ -207,10 +224,10 @@ /area/station/command/heads_quarters/nt_rep) "O" = ( /obj/item/radio/intercom/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ +/obj/effect/turf_decal/siding/wood{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "P" = ( /obj/machinery/door/airlock/corporate{ @@ -218,7 +235,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/door/firedoor, -/turf/open/floor/carpet/executive, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Q" = ( /obj/machinery/door/airlock/corporate{ @@ -229,11 +247,14 @@ /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/door/firedoor, /obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "S" = ( /obj/structure/chair/plastic, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "T" = ( /obj/effect/turf_decal/siding/wood{ @@ -246,18 +267,20 @@ /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/siding/wood{ + dir = 7 + }, /turf/open/floor/wood, /area/station/maintenance/port) "Y" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) "Z" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Nanotrasen Consultant's Office"; - name = "Nanotrasen Consultant's Fax Machine" +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/carpet/executive, +/obj/machinery/photocopier, +/turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) (1,1,1) = {" @@ -277,7 +300,7 @@ a f s v -Z +b I x d @@ -311,7 +334,7 @@ Y Y Y H -T +Z u V "} diff --git a/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm b/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm index ccd2cd080ed..af491ccd16e 100644 --- a/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm +++ b/_maps/bubber/automapper/templates/kilostation/kilostation_ert_bay.dmm @@ -11,7 +11,7 @@ /area/station/hallway/primary/fore) "aK" = ( /obj/machinery/newscaster/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "bb" = ( @@ -32,7 +32,6 @@ /obj/machinery/bluespace_vendor/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/public/glass{ name = "Salon Hallway" }, @@ -81,12 +80,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "cm" = ( -/obj/structure/chair/office/tactical{ - dir = 8 - }, /obj/machinery/firealarm/directional/east, -/obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/carpet/executive, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "cW" = ( /obj/structure/fans/tiny/forcefield{ @@ -99,33 +95,25 @@ /turf/open/floor/plating, /area/station/hallway/primary/fore) "cX" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /obj/structure/table/wood, /obj/item/stamp/centcom{ pixel_x = 8; pixel_y = -4 }, +/obj/item/stamp/denied{ + pixel_x = 8 + }, /obj/item/stamp{ pixel_x = 8; pixel_y = 8 }, -/obj/item/stamp/denied{ - pixel_x = 8 - }, -/obj/item/paper_bin/carbon{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/pen/fountain{ - pixel_x = -4; - pixel_y = 6 - }, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "df" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/green{ dir = 1 @@ -136,8 +124,10 @@ }, /area/station/hallway/primary/fore) "ds" = ( -/obj/effect/landmark/start/assistant, /obj/effect/turf_decal/tile/green, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/fore) "dC" = ( @@ -161,7 +151,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -255,9 +244,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "fx" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "fA" = ( /obj/structure/disposalpipe/segment, /obj/structure/window/reinforced/spawner/directional/north, @@ -286,15 +277,12 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "gk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/green{ dir = 1 }, /obj/item/radio/intercom/directional/north, +/obj/structure/closet/firecloset, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -355,8 +343,21 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "gX" = ( -/obj/machinery/holopad, -/turf/open/floor/wood, +/obj/machinery/button/door/directional/north{ + id = "nt_rep_priv"; + name = "Privacy Shutters Control" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/filingcabinet/medical{ + pixel_x = -10 + }, +/obj/structure/filingcabinet, +/obj/structure/filingcabinet/security{ + pixel_x = 10 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "ha" = ( /obj/structure/sign/departments/holy{ @@ -505,15 +506,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "kz" = ( -/obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "kE" = ( @@ -590,12 +586,13 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "mZ" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/chair/comfy/beige{ - dir = 4 +/obj/effect/turf_decal/tile/green, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/sofa/bench/right{ + dir = 1 }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/fore) "nc" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment, @@ -603,8 +600,12 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "ne" = ( -/turf/closed/wall/r_wall, -/area/space/nearstation) +/obj/structure/grandfatherclock{ + pixel_y = 24 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/wood, +/area/station/command/heads_quarters/nt_rep) "nv" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron, @@ -652,9 +653,7 @@ "nS" = ( /obj/effect/turf_decal/tile/green, /obj/machinery/camera/directional/south, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, +/obj/machinery/time_clock/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/fore) "nW" = ( @@ -669,7 +668,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -678,10 +676,9 @@ }, /area/station/hallway/primary/fore) "oR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/grandfatherclock{ - pixel_y = 24 - }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "oZ" = ( @@ -717,7 +714,7 @@ /area/station/maintenance/fore) "qM" = ( /obj/structure/closet/secure_closet/nanotrasen_consultant/station, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "qS" = ( /obj/effect/turf_decal/tile/neutral{ @@ -738,10 +735,9 @@ /area/station/hallway/primary/fore) "qU" = ( /obj/effect/turf_decal/tile/green, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/sofa/bench, -/obj/structure/cable, +/obj/structure/chair/sofa/bench/left{ + dir = 1 + }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/fore) "rk" = ( @@ -772,15 +768,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "rL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/light_switch/directional/south, /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ dir = 1 }, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "rT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -789,7 +781,6 @@ "su" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/green{ dir = 4 }, @@ -839,7 +830,7 @@ /area/station/hallway/primary/fore) "uf" = ( /obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "uj" = ( /obj/structure/lattice, @@ -928,7 +919,7 @@ dir = 4 }, /obj/machinery/light/small/blacklight/directional/west, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "vV" = ( /obj/effect/decal/cleanable/dirt, @@ -984,15 +975,19 @@ }, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/machinery/door/firedoor, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "xV" = ( /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/nt_rep) "yd" = ( -/obj/structure/sign/flag/galfed, -/turf/closed/wall/r_wall, -/area/space/nearstation) +/obj/machinery/modular_computer/preset/command, +/obj/machinery/light/directional/north, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "yC" = ( /turf/closed/wall/rust, /area/station/service/barber) @@ -1014,20 +1009,21 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "zf" = ( -/obj/structure/lattice, /obj/structure/sign/warning/secure_area/directional/south, -/turf/open/space/basic, -/area/space/nearstation) +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/nt_rep) "zu" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /obj/structure/chair/comfy/black{ dir = 8 }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "zF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "zR" = ( @@ -1069,14 +1065,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) -"Bx" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "BU" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -1112,8 +1100,7 @@ /turf/open/misc/asteroid/airless, /area/space/nearstation) "CX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "Da" = ( @@ -1152,12 +1139,19 @@ /turf/open/floor/iron/dark, /area/station/hallway/primary/fore) "DJ" = ( -/obj/structure/table/wood, -/obj/machinery/button/door/directional/north{ - id = "nt_rep_priv"; - name = "Privacy Shutters Control" +/obj/item/pen/fountain{ + pixel_x = -4; + pixel_y = 6 }, -/turf/open/floor/carpet/executive, +/obj/item/paper_bin/carbon{ + pixel_y = 4; + pixel_x = -4 + }, +/obj/structure/table/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Ef" = ( /obj/machinery/light/directional/north, @@ -1203,11 +1197,21 @@ /turf/closed/wall/r_wall/rust, /area/station/command/heads_quarters/nt_rep) "EG" = ( -/obj/machinery/door/poddoor/preopen{ - name = "Privacy Shutter"; +/obj/machinery/door/poddoor/shutters/preopen{ id = "nt_rep_priv" }, -/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/airlock/corporate{ + name = "NT Consultant's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +/obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "EI" = ( @@ -1234,6 +1238,8 @@ /area/station/hallway/primary/fore) "EX" = ( /obj/structure/table/wood, +/obj/effect/spawner/random/bureaucracy/paper, +/obj/effect/spawner/random/bureaucracy/paper, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "Fg" = ( @@ -1263,10 +1269,8 @@ /turf/open/floor/plating, /area/station/maintenance/fore/lesser) "FM" = ( -/obj/structure/disposalpipe/segment, /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, /area/station/hallway/primary/fore) "FQ" = ( @@ -1367,6 +1371,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"HZ" = ( +/obj/structure/sign/flag/galfed, +/turf/closed/wall/r_wall, +/area/station/command/heads_quarters/nt_rep) "Ia" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -1385,8 +1393,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/fore) "IX" = ( -/obj/structure/fireplace, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Ja" = ( /obj/effect/decal/cleanable/dirt, @@ -1406,7 +1413,7 @@ /area/station/hallway/primary/fore) "Jm" = ( /obj/structure/dresser, -/turf/open/floor/wood, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Jn" = ( /obj/structure/chair/sofa/bench{ @@ -1563,25 +1570,22 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "OO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/light/directional/north, -/obj/structure/closet/emcloset, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/green{ dir = 1 }, +/obj/structure/closet/emcloset, /turf/open/floor/iron/dark/corner{ dir = 1 }, /area/station/hallway/primary/fore) "OR" = ( -/obj/machinery/modular_computer/preset/command{ - dir = 3 +/obj/effect/landmark/start/nanotrasen_consultant, +/obj/structure/chair/office/tactical{ + dir = 8 }, -/obj/machinery/light/directional/north, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "OY" = ( /obj/effect/decal/cleanable/dirt, @@ -1598,6 +1602,7 @@ dir = 8 }, /obj/structure/sign/poster/official/random/directional/west, +/obj/structure/cable, /turf/open/floor/iron/dark/corner{ dir = 8 }, @@ -1637,6 +1642,13 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"PQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/nt_rep) "Qy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -1778,6 +1790,13 @@ dir = 4 }, /area/station/hallway/primary/fore) +"Vc" = ( +/obj/machinery/holopad, +/obj/structure/chair/comfy/beige{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/nt_rep) "Vp" = ( /obj/structure/chair/comfy/barber_chair, /obj/effect/turf_decal/siding/white{ @@ -1824,7 +1843,6 @@ /turf/open/floor/iron/dark, /area/station/service/barber) "Xo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/tile/green{ dir = 4 @@ -1892,6 +1910,7 @@ fax_name = "Nanotrasen Consultant's Office"; name = "Nanotrasen Consultant's Fax Machine" }, +/obj/machinery/light_switch/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "Ze" = ( @@ -1900,9 +1919,9 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "Zv" = ( -/obj/structure/disposalpipe/segment, /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, /area/station/hallway/primary/fore) "ZN" = ( @@ -2689,7 +2708,7 @@ NU wL UZ fb -Bx +FM Zv FM Xo @@ -2734,7 +2753,7 @@ Eg Eg Eg OO -wF +fx qU zb xV @@ -2778,8 +2797,8 @@ Dl Dl Mt gk -wF -qU +fx +mZ Ev qM vS @@ -2864,8 +2883,8 @@ Dl Dl Dl Dl -Eg -Mt +zb +PQ EG kz xV @@ -2908,13 +2927,13 @@ Dl Dl Gh XL -XL +zb ne oR KA hx ZN -gX +ZN Zb zb XJ @@ -2952,11 +2971,11 @@ Dl Gh Gh XL -XL -ne -mZ -ca +zb CX +ca +Vc +YD EX SH Cf @@ -2996,14 +3015,14 @@ Gh Gh jY Gh -XL -ne +zb +gX DJ cX YD zF SH -WE +ZN zb jA PD @@ -3040,14 +3059,14 @@ Gh Gh Gh Gh -Gh +HZ yd OR cm aK zu Bs -fx +WE zb eL Nu @@ -3085,7 +3104,7 @@ Me Me Me zf -ne +zb xV zb zb diff --git a/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm b/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm index 5a4581ae2fe..33733c74f36 100644 --- a/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm +++ b/_maps/bubber/automapper/templates/tramstation/tramstation_ntrep_office.dmm @@ -7,7 +7,7 @@ dir = 1 }, /obj/structure/cable, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "c" = ( /obj/structure/table/wood, @@ -31,7 +31,10 @@ id = "nt_rep_priv" }, /obj/item/radio/intercom/command/directional/south, -/turf/open/floor/carpet/executive, +/obj/item/stamp/centcom{ + pixel_y = 10 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "d" = ( /obj/machinery/door/airlock/corporate{ @@ -39,10 +42,14 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "e" = ( -/obj/structure/grandfatherclock, +/obj/machinery/fax{ + fax_name = "Nanotrasen Consultant's Office"; + name = "Nanotrasen Consultant's Fax Machine" + }, +/obj/structure/table/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "f" = ( @@ -52,6 +59,9 @@ name = "Privacy Shutter" }, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "g" = ( @@ -60,7 +70,6 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "h" = ( -/obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, @@ -77,9 +86,6 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "k" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/comfy/beige{ dir = 8 @@ -116,7 +122,17 @@ /area/station/command/heads_quarters/nt_rep) "p" = ( /obj/effect/turf_decal/siding/wood, -/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/filingcabinet/security{ + pixel_x = 10 + }, +/obj/structure/filingcabinet, +/obj/structure/filingcabinet/medical{ + pixel_x = -10 + }, +/obj/machinery/button/door/directional/west{ + name = "Observation Shutters"; + id = "nt_rep_priv_2" + }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "q" = ( @@ -135,17 +151,26 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, /obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "s" = ( -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "t" = ( /obj/structure/table/wood, -/obj/item/stamp/centcom{ - pixel_y = 10 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/turf/open/floor/carpet/executive, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/item/table_clock{ + pixel_y = 16 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "u" = ( /obj/machinery/time_clock, @@ -159,31 +184,21 @@ "w" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, -/obj/machinery/door/poddoor/preopen{ - id = "nt_rep_priv"; - name = "Privacy Shutter" +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv_2" }, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "x" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/comfy/beige{ dir = 8 }, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) -"y" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) "A" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -198,27 +213,16 @@ /area/station/command/heads_quarters/nt_rep) "C" = ( /obj/structure/table/wood, -/obj/item/camera{ - pixel_x = 6; - pixel_y = 3 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, -/obj/item/camera_film{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/camera_film{ - pixel_x = -4; - pixel_y = 7 - }, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "E" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Nanotrasen Consultant's Office"; - name = "Nanotrasen Consultant's Fax Machine" +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "F" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -227,17 +231,19 @@ "G" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "H" = ( /obj/effect/landmark/start/nanotrasen_consultant, /obj/structure/cable, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "I" = ( /obj/structure/cable, -/turf/open/floor/carpet/executive, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "J" = ( /obj/machinery/status_display/evac/directional/north, @@ -246,6 +252,7 @@ /area/station/command/heads_quarters/nt_rep) "K" = ( /obj/machinery/photocopier, +/obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "M" = ( @@ -264,7 +271,10 @@ dir = 4 }, /obj/structure/cable, -/turf/open/floor/carpet/executive, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Q" = ( /obj/structure/cable, @@ -276,12 +286,16 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) "R" = ( -/obj/structure/sign/flag/nanotrasen, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, +/turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) "T" = ( /obj/structure/closet/secure_closet/nanotrasen_consultant/station, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "U" = ( /obj/machinery/status_display/ai/directional/east, @@ -291,10 +305,9 @@ desc = "A small lighting fixture. Why is this here?" }, /obj/structure/sign/calendar/directional/south, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "V" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/siding/wood{ dir = 1 }, @@ -304,7 +317,7 @@ "W" = ( /obj/machinery/newscaster/directional/north, /obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/carpet/executive, +/turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) "Z" = ( /obj/structure/chair/comfy/black{ @@ -321,7 +334,7 @@ a a w w -a +w a "} (2,1,1) = {" @@ -340,12 +353,12 @@ h I O b -f +R "} (4,1,1) = {" a v -y +N q t C @@ -358,7 +371,7 @@ N G x k -a +R "} (6,1,1) = {" a diff --git a/_maps/map_files/Deathmatch/The_Brig.dmm b/_maps/map_files/Deathmatch/The_Brig.dmm index 15048da48e2..6d38a635ef5 100644 --- a/_maps/map_files/Deathmatch/The_Brig.dmm +++ b/_maps/map_files/Deathmatch/The_Brig.dmm @@ -3587,7 +3587,7 @@ /turf/open/floor/iron/white, /area/deathmatch) "Zj" = ( -/obj/machinery/door/window/brigdoor/security/holding{ +/obj/machinery/door/window/brigdoor/security/holding/left/directional/south{ id = "Holding Cell"; name = "Holding Cell" }, diff --git a/_maps/map_files/Deathmatch/mech_madness.dmm b/_maps/map_files/Deathmatch/mech_madness.dmm index d36ccfb16cc..3f804d2ee54 100644 --- a/_maps/map_files/Deathmatch/mech_madness.dmm +++ b/_maps/map_files/Deathmatch/mech_madness.dmm @@ -664,7 +664,7 @@ /area/deathmatch) "ot" = ( /obj/structure/mop_bucket/janitorialcart{ - dir = 4 + dir = 4 }, /turf/open/floor/engine, /area/deathmatch) diff --git a/_maps/map_files/Deathmatch/starwars.dmm b/_maps/map_files/Deathmatch/starwars.dmm index c1f00546107..c7654810360 100644 --- a/_maps/map_files/Deathmatch/starwars.dmm +++ b/_maps/map_files/Deathmatch/starwars.dmm @@ -1142,9 +1142,6 @@ }, /turf/open/indestructible/large, /area/deathmatch) -"US" = ( -/turf/closed/indestructible/reinforced, -/area/deathmatch) "Ve" = ( /obj/effect/turf_decal/tile/red/full, /obj/structure/barricade/security/murderdome, @@ -1320,7 +1317,7 @@ tV tV IC IC -US +KX Vz sZ sZ diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 4d00ec451c5..2448e719277 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -8450,10 +8450,7 @@ /area/station/tcommsat/computer) "cVn" = ( /obj/machinery/firealarm/directional/east, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" - }, +/mob/living/simple_animal/bot/mulebot, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; location = "QM #1" @@ -55045,10 +55042,7 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) "sdJ" = ( -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, +/mob/living/simple_animal/bot/mulebot, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; location = "QM #2" diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 3315942a519..8b1033307f1 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -3777,7 +3777,7 @@ specialfunctions = 4 }, /obj/structure/bed, -/obj/item/bedsheet/dorms, +/obj/effect/spawner/random/bedsheet, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/dorms) @@ -4890,7 +4890,7 @@ /area/station/hallway/primary/starboard) "caG" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/effect/landmark/start/prisoner, /obj/structure/sign/poster/contraband/random/directional/north, /obj/effect/spawner/random/contraband/prison, @@ -5215,7 +5215,7 @@ /area/station/security/prison/safe) "chK" = ( /obj/structure/bed, -/obj/item/bedsheet/dorms, +/obj/effect/spawner/random/bedsheet, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/dorms) @@ -7584,10 +7584,7 @@ /obj/machinery/computer/upload/ai, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - dir = 2; - icon_state = "right"; +/obj/machinery/door/window/left/directional/south{ layer = 3.1; name = "Upload Console Window"; req_access = list("ai_upload") @@ -8120,7 +8117,7 @@ /area/station/engineering/atmos/upper) "dpc" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron/grimy, /area/station/security/prison/safe) @@ -9551,7 +9548,7 @@ /area/station/command/bridge) "dSX" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /turf/open/floor/carpet/black, /area/station/maintenance/starboard/aft) "dTa" = ( @@ -20266,10 +20263,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos/upper) "hVY" = ( -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" - }, +/mob/living/simple_animal/bot/mulebot, /obj/effect/turf_decal/delivery, /obj/machinery/light/directional/south, /obj/machinery/navbeacon{ @@ -29490,8 +29484,7 @@ /obj/machinery/computer/upload/borg, /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/door/window/left/directional/west{ - dir = 2; +/obj/machinery/door/window/left/directional/south{ layer = 3.1; name = "Cyborg Upload Console Window"; req_access = list("ai_upload") @@ -30167,7 +30160,7 @@ /area/station/command/corporate_showroom) "lGt" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/effect/landmark/start/prisoner, /obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron/grimy, @@ -36091,7 +36084,7 @@ specialfunctions = 4 }, /obj/structure/bed, -/obj/item/bedsheet/dorms, +/obj/effect/spawner/random/bedsheet, /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/dorms) @@ -36666,7 +36659,7 @@ /area/station/engineering/main) "nZO" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/structure/sign/poster/contraband/random/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -39931,7 +39924,7 @@ /area/station/service/hydroponics) "piM" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "piN" = ( @@ -40933,10 +40926,7 @@ /turf/open/floor/iron, /area/station/science/xenobiology) "pDY" = ( -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, +/mob/living/simple_animal/bot/mulebot, /obj/effect/turf_decal/delivery, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; @@ -49977,7 +49967,7 @@ /area/station/commons/dorms) "sPq" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/effect/landmark/start/prisoner, /obj/machinery/newscaster/directional/south, /obj/effect/spawner/random/contraband/prison, @@ -52956,7 +52946,7 @@ /area/station/service/library) "tWJ" = ( /obj/structure/bed, -/obj/item/bedsheet/random, +/obj/effect/spawner/random/bedsheet/any, /obj/effect/landmark/start/virologist, /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/showroomfloor, diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 2b98e56af72..b90f92a8473 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -2021,6 +2021,12 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/port/aft) "aDQ" = ( +/obj/structure/rack{ + icon = 'icons/obj/fluff/general.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/storage/fancy/candle_box, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -6351,6 +6357,7 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; + dir = 4; location = "Medbay" }, /obj/effect/turf_decal/delivery/blue, @@ -13688,6 +13695,7 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; + dir = 4; location = "Engineering" }, /turf/open/floor/iron/smooth_large, @@ -15095,6 +15103,7 @@ /obj/effect/turf_decal/box, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; + dir = 4; location = "QM #2" }, /turf/open/floor/iron/smooth_edge, @@ -19188,6 +19197,7 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; + dir = 4; location = "QM #1" }, /obj/effect/turf_decal/box, @@ -20454,7 +20464,6 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, -/obj/item/storage/fancy/candle_box, /turf/open/floor/cult, /area/station/service/library) "fXl" = ( @@ -24447,6 +24456,7 @@ /obj/machinery/firealarm/directional/north, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; + dir = 4; location = "QM #4" }, /obj/effect/turf_decal/box, @@ -37402,6 +37412,7 @@ /obj/effect/turf_decal/box, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=2"; + dir = 4; location = "QM #3" }, /turf/open/floor/iron/smooth_edge, @@ -38547,6 +38558,7 @@ "kTz" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; + dir = 1; location = "Janitor" }, /obj/structure/plasticflaps/opaque{ @@ -38934,6 +38946,7 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; + dir = 4; location = "Robotics" }, /turf/open/floor/iron/dark/smooth_large, @@ -65410,6 +65423,7 @@ }, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; + dir = 4; location = "Medbay" }, /obj/effect/turf_decal/delivery, @@ -84344,18 +84358,6 @@ /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/power_room) "xrS" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/basic/goat/pete, -/obj/effect/turf_decal/weather/snow, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/weather/snow, /mob/living/basic/goat/pete, @@ -87009,6 +87011,7 @@ "yha" = ( /obj/machinery/navbeacon{ codes_txt = "delivery;dir=8"; + dir = 4; location = "Atmospherics" }, /obj/effect/turf_decal/delivery, diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index ab599c16ab0..e0cbc60ad8d 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -1023,6 +1023,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"arg" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/right/directional/north{ + name = "Bridge Delivery"; + req_access = list("command") + }, +/turf/open/floor/wood, +/area/station/biodome/aft) "arh" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -1243,6 +1251,11 @@ /obj/structure/flora/bush/lavendergrass/style_random, /turf/open/floor/grass, /area/station/biodome) +"auX" = ( +/obj/item/fancy_pillow, +/obj/effect/spawner/random/bedsheet/any, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore/greater) "avb" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1709,13 +1722,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/interrogation) -"aDC" = ( -/obj/structure/bed, -/obj/item/pillow/random, -/obj/item/bedsheet/dorms, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/carpet/neon/simple/blue, -/area/station/commons/dorms) "aDG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -2222,26 +2228,6 @@ /obj/machinery/hydroponics/soil, /turf/open/floor/grass, /area/station/service/hydroponics/garden) -"aME" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "robotics"; - name = "Robotics Lab Shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 2; - icon_state = "left"; - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/iron, -/area/station/science/robotics/lab) "aMF" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/closet/crate/engineering/electrical, @@ -2566,6 +2552,14 @@ /obj/item/flashlight/lamp, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) +"aRa" = ( +/obj/machinery/button/door/directional/west{ + id = "nt_rep_priv"; + name = "Privacy Shutters Control"; + pixel_y = 8 + }, +/turf/closed/wall, +/area/station/command/heads_quarters/nt_rep) "aRh" = ( /obj/structure/chair{ dir = 4 @@ -2701,6 +2695,18 @@ dir = 4 }, /area/station/hallway/secondary/service) +"aTX" = ( +/obj/structure/table/wood/fancy/blue, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Core Modules"; + req_access = list("captain") + }, +/obj/effect/spawner/random/aimodule/neutral, +/obj/machinery/flasher/directional/east, +/turf/open/floor/circuit, +/area/station/ai_monitored/turret_protected/ai_upload) "aUm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/large, @@ -2977,12 +2983,6 @@ }, /turf/open/openspace, /area/station/science/xenobiology) -"aZu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/fancy_pillow, -/obj/item/bedsheet/random, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore/greater) "aZw" = ( /obj/machinery/light/directional/west, /obj/machinery/firealarm/directional/west, @@ -3216,16 +3216,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"bdk" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/trimline/red/real_red/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) +"bdn" = ( +/obj/structure/cable, +/obj/effect/landmark/start/nanotrasen_consultant, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "bdu" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, @@ -3429,6 +3424,10 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) +"bio" = ( +/obj/effect/spawner/random/bedsheet/any, +/turf/open/floor/grass, +/area/station/science/genetics) "bip" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix, /turf/open/floor/engine/vacuum, @@ -3762,12 +3761,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) -"bnJ" = ( -/obj/item/fancy_pillow, -/obj/item/bedsheet/random, -/obj/item/book/random, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore/greater) "bnX" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 1 @@ -4196,11 +4189,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"bwC" = ( -/obj/structure/cable, -/obj/effect/landmark/start/nanotrasen_consultant, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/nt_rep) "bwK" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/clothing/gloves/latex/nitrile, @@ -4316,14 +4304,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/research) -"bys" = ( -/obj/structure/bed, -/obj/item/pillow/random, -/obj/item/bedsheet/dorms, -/obj/machinery/airalarm/directional/south, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet/neon/simple/blue, -/area/station/commons/dorms) "byv" = ( /obj/effect/landmark/carpspawn, /turf/open/space/openspace, @@ -4562,29 +4542,6 @@ /obj/effect/spawner/random/food_or_drink/booze, /turf/open/floor/iron/white, /area/station/maintenance/port/greater) -"bCE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 1; - id = "Cell 1"; - name = "Cell 1" - }, -/obj/effect/turf_decal/trimline/red/filled/end{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large, -/area/station/security/brig) "bCH" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/qm, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -4688,19 +4645,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/xenobiology/hallway) -"bFh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/red/real_red/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "bFq" = ( /obj/effect/spawner/random/trash/caution_sign, /turf/open/floor/plating, @@ -6649,15 +6593,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"cqf" = ( -/obj/effect/turf_decal/loading_area/red, -/obj/machinery/door/window/brigdoor{ - dir = 1; - name = "Security Delivery"; - req_access = list("brig") - }, -/turf/open/floor/plating, -/area/station/maintenance/department/security/brig) "cqg" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -6713,6 +6648,16 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +"cqJ" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Research Test Chamber"; + req_access = list("science") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/event_spawn, +/turf/open/floor/engine, +/area/station/science/explab) "cqR" = ( /obj/machinery/chem_master, /turf/open/floor/iron/white/small, @@ -7326,16 +7271,6 @@ "czJ" = ( /turf/closed/wall/r_wall, /area/station/science/research) -"czQ" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Fitness Ring" - }, -/turf/open/floor/iron/dark/smooth_corner, -/area/station/commons/fitness) "czW" = ( /obj/effect/spawner/random/food_or_drink/condiment, /turf/open/floor/glass/reinforced, @@ -7652,6 +7587,28 @@ "cEV" = ( /turf/closed/wall, /area/station/maintenance/department/security) +"cEY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/window/brigdoor/security/cell/left/directional/north{ + id = "Cell 1"; + name = "Cell 1" + }, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/security/brig) "cFb" = ( /obj/structure/transit_tube/curved/flipped{ dir = 4 @@ -7714,13 +7671,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/white/smooth_large, /area/station/service/kitchen) -"cFO" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/item/pillow/random, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/carpet/neon/simple/green, -/area/station/commons/dorms) "cFR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7804,38 +7754,6 @@ /obj/effect/spawner/random/structure/chair_maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"cHH" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom/directional/north{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = 8 - }, -/obj/item/radio/intercom/directional/east{ - freerange = 1; - listening = 0; - name = "Common Channel" - }, -/obj/item/radio/intercom/directional/south{ - freerange = 1; - frequency = 1447; - listening = 0; - name = "Private Channel"; - pixel_x = 8 - }, -/obj/machinery/door/window{ - atom_integrity = 300; - base_state = "leftsecure"; - dir = 8; - icon_state = "leftsecure"; - layer = 4.1; - name = "Tertiary AI Core Access"; - pixel_x = -3; - req_access = list("ai_upload") - }, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "cHN" = ( /obj/machinery/restaurant_portal/bar, /obj/effect/turf_decal/siding/wood{ @@ -8336,17 +8254,6 @@ /obj/machinery/vending/wardrobe/det_wardrobe, /turf/open/floor/carpet, /area/station/security/detectives_office) -"cRp" = ( -/obj/machinery/door/window{ - name = "Gateway Chamber"; - req_access = list("gateway") - }, -/obj/item/toy/plush/lizard_plushie/space/green{ - name = "Goes-To-Explore" - }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/stairs/medium, -/area/station/command/gateway) "cRL" = ( /obj/machinery/status_display/evac/directional/south, /obj/machinery/holopad, @@ -8953,24 +8860,6 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/hallway/primary/central/fore) -"ddI" = ( -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 8"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio8"; - name = "Xenobio Pen 8 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "deo" = ( /obj/structure/sign/warning/gas_mask/directional/north, /turf/open/misc/sandy_dirt, @@ -11235,18 +11124,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/science/xenobiology/hallway) -"dSh" = ( -/obj/machinery/door/window/left/directional/south{ - dir = 4; - name = "Test Chamber"; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/turf/open/floor/iron, -/area/station/science/xenobiology) "dSi" = ( /obj/effect/landmark/start/barber, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -11841,15 +11718,6 @@ /obj/item/toy/beach_ball/baseball, /turf/open/floor/grass, /area/station/science/genetics) -"eci" = ( -/obj/machinery/door/window/right/directional/south{ - dir = 8; - name = "Monkey Pen"; - req_access = list("genetics") - }, -/obj/machinery/duct, -/turf/open/floor/grass, -/area/station/science/genetics) "ecq" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -14140,6 +14008,10 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"eQQ" = ( +/obj/structure/chair/plastic, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "eRd" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 10 @@ -15761,11 +15633,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/herringbone, /area/station/commons/vacant_room/commissary) -"fuh" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) "fuj" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16146,21 +16013,6 @@ }, /turf/open/floor/iron/terracotta, /area/station/hallway/secondary/construction/engineering) -"fAQ" = ( -/obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron, -/area/station/command/heads_quarters/nt_rep) "fAY" = ( /turf/closed/wall/r_wall/fakewood, /area/station/command/heads_quarters/hop) @@ -16508,14 +16360,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /turf/open/floor/plating, /area/station/maintenance/port/central) -"fIX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/preopen{ - id = "nt_rep_priv"; - name = "Privacy Shutter" - }, -/turf/open/floor/plating, -/area/station/command/heads_quarters/nt_rep) "fIZ" = ( /obj/machinery/light/directional/east, /obj/effect/turf_decal/siding/yellow, @@ -16982,29 +16826,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"fPM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 1; - id = "Cell 3"; - name = "Cell 3" - }, -/obj/effect/turf_decal/trimline/red/filled/end{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large, -/area/station/security/brig) "fPN" = ( /obj/structure/fireplace, /obj/item/stack/sheet/mineral/wood, @@ -17079,6 +16900,12 @@ /obj/structure/disposaloutlet, /turf/open/floor/engine, /area/station/science/xenobiology) +"fRg" = ( +/obj/item/bedsheet/centcom/double, +/obj/structure/bed/double, +/obj/machinery/light/small/blacklight/directional/east, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "fRk" = ( /obj/machinery/door/window/left/directional/south{ name = "Brig Infirmary" @@ -17666,13 +17493,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"gak" = ( -/obj/machinery/light_switch/directional/south, -/obj/machinery/modular_computer/preset/command{ - dir = 4 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) "gan" = ( /obj/machinery/door/airlock/public/glass{ name = "Funeral Parlour" @@ -18074,6 +17894,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/engineering/engine_smes) +"ghW" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "nt_rep_priv" + }, +/turf/open/floor/plating, +/area/station/command/heads_quarters/nt_rep) "gif" = ( /obj/structure/cable/layer3, /obj/machinery/door/airlock/engineering/glass{ @@ -18419,6 +18246,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/station/hallway/primary/aft) +"gpp" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Gateway Chamber"; + req_access = list("gateway") + }, +/obj/item/toy/plush/lizard_plushie/space/green{ + name = "Goes-To-Explore" + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/stairs/medium, +/area/station/command/gateway) "gpq" = ( /obj/item/radio/intercom/directional/south, /turf/open/floor/carpet, @@ -18436,6 +18274,21 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/security/brig) +"gqd" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 4"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "Xenobio Pen 4 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "gqe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18607,6 +18460,21 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"gsY" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 1"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "Xenobio Pen 1 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "gtc" = ( /obj/machinery/light/directional/north, /turf/open/floor/stone, @@ -19122,6 +18990,22 @@ }, /turf/open/water/jungle/biodome, /area/station/biodome/aft) +"gBi" = ( +/obj/machinery/door/airlock/corporate{ + name = "NT Consultant's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/poddoor/shutters/preopen, +/turf/open/floor/iron, +/area/station/command/heads_quarters/nt_rep) "gBs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19136,11 +19020,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"gBW" = ( -/obj/item/fancy_pillow, -/obj/item/bedsheet/random, -/turf/open/floor/iron/dark, -/area/station/maintenance/fore/greater) "gCj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -19842,6 +19721,20 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"gQg" = ( +/obj/machinery/door/window/left/directional/north{ + atom_integrity = 300; + base_state = "rightsecure"; + name = "Primary AI Core Access"; + req_access = list("ai_upload") + }, +/obj/machinery/flasher/directional/south{ + id = "AI"; + pixel_x = 20 + }, +/obj/structure/cable/multilayer/connected, +/turf/open/floor/catwalk_floor/titanium, +/area/station/ai_monitored/turret_protected/ai) "gQh" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/box, @@ -20055,6 +19948,22 @@ "gUf" = ( /turf/closed/wall/mineral/wood, /area/station/command/heads_quarters/captain/private) +"gUg" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Containment Pen 6"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "Xenobio Pen 6 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "gUv" = ( /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, @@ -21651,6 +21560,13 @@ }, /turf/open/floor/wood/large, /area/station/service/janitor) +"hAY" = ( +/obj/structure/bed/double, +/obj/item/pillow/random, +/obj/item/pillow/random, +/obj/effect/spawner/random/bedsheet/double, +/turf/open/floor/glass/reinforced, +/area/station/commons/dorms) "hBl" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -21864,6 +21780,20 @@ /obj/item/kirbyplants/photosynthetic, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/ai) +"hFo" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/ai_module/reset/purge{ + pixel_y = 11 + }, +/obj/effect/spawner/random/aimodule/harmful, +/obj/machinery/door/window/brigdoor/left/directional/east{ + name = "High-Risk Modules"; + req_access = list("captain") + }, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/flasher/directional/west, +/turf/open/floor/circuit/red, +/area/station/ai_monitored/turret_protected/ai_upload) "hFt" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/trimline/neutral/filled/warning, @@ -21975,6 +21905,13 @@ }, /turf/open/floor/iron/dark, /area/station/science/circuits) +"hHp" = ( +/obj/effect/spawner/random/bedsheet, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/yellow, +/area/station/commons/dorms) "hHq" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -22001,6 +21938,13 @@ /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating/foam, /area/station/maintenance/aft/upper) +"hHT" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/item/pillow/random, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/carpet/neon/simple/yellow, +/area/station/commons/dorms) "hIo" = ( /obj/item/trash/candle, /turf/open/floor/plating, @@ -22062,22 +22006,6 @@ /obj/effect/spawner/random/food_or_drink/condiment, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"hJs" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Containment Pen 4"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio4"; - name = "Xenobio Pen 4 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "hJB" = ( /obj/machinery/camera/directional/east{ c_tag = "Engineering - Crystallizer" @@ -22242,14 +22170,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"hNq" = ( -/obj/machinery/door/window/brigdoor/right/directional/south{ - dir = 8; - name = "Observation Deck"; - req_access = list("xenobiology") - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "hNy" = ( /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/asteroid) @@ -22630,6 +22550,15 @@ /obj/effect/decal/cleanable/glitter/white, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"hVg" = ( +/obj/machinery/door/window/right/directional/north{ + base_state = "left"; + name = "Library Desk Door"; + req_access = list("library") + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/carpet/royalblack, +/area/station/service/library) "hVo" = ( /obj/machinery/vending/wardrobe/medi_wardrobe, /obj/machinery/camera/directional/north{ @@ -22880,22 +22809,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) -"hZk" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Containment Pen 1"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio1"; - name = "Xenobio Pen 1 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "hZm" = ( /obj/machinery/duct, /obj/effect/spawner/random/trash/graffiti, @@ -23459,24 +23372,6 @@ /obj/structure/marker_beacon/purple, /turf/open/space/openspace, /area/space/nearstation) -"ijq" = ( -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 6"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio6"; - name = "Xenobio Pen 6 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "ijv" = ( /obj/structure/cable, /turf/open/floor/wood, @@ -23687,20 +23582,6 @@ /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, /area/station/maintenance/port/central) -"iod" = ( -/obj/machinery/door/window/left/directional/east{ - dir = 2; - icon_state = "right"; - name = "Incoming Mail"; - req_access = list("shipping") - }, -/obj/machinery/firealarm/directional/east, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/siding/wood, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron, -/area/station/cargo/sorting) "iof" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -23834,6 +23715,14 @@ /obj/structure/cable, /turf/open/floor/grass, /area/station/service/kitchen/diner) +"ipR" = ( +/obj/machinery/door/window/right/directional/west{ + name = "Monkey Pen"; + req_access = list("genetics") + }, +/obj/machinery/duct, +/turf/open/floor/grass, +/area/station/science/genetics) "ipS" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23883,6 +23772,23 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) +"iqH" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/pen, +/obj/machinery/door/poddoor/preopen{ + id = "pharmacy_shutters2"; + name = "Pharmacy Shutter" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "iqP" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -24326,6 +24232,12 @@ }, /turf/open/floor/wood/large, /area/station/biodome) +"izs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/fancy_pillow, +/obj/effect/spawner/random/bedsheet/any, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore/greater) "izy" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -25185,6 +25097,36 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/cargo/sorting) +"iQD" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom/directional/north{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = 8 + }, +/obj/item/radio/intercom/directional/east{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel"; + pixel_x = 8 + }, +/obj/machinery/door/window/left/directional/west{ + atom_integrity = 300; + base_state = "leftsecure"; + layer = 4.1; + name = "Tertiary AI Core Access"; + pixel_x = -3; + req_access = list("ai_upload") + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "iQO" = ( /obj/item/storage/toolbox/drone, /obj/machinery/light/directional/east, @@ -25536,6 +25478,13 @@ /obj/effect/landmark/blobstart, /turf/open/water/jungle/biodome, /area/station/maintenance/starboard/central) +"iYt" = ( +/obj/machinery/door/window/brigdoor/right/directional/west{ + name = "Observation Deck"; + req_access = list("xenobiology") + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "iYy" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/duct, @@ -25564,24 +25513,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) -"iYV" = ( -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 7"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio7"; - name = "Xenobio Pen 7 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "iZe" = ( /obj/structure/reagent_water_basin, /obj/effect/turf_decal/siding/wood{ @@ -26025,6 +25956,13 @@ dir = 1 }, /area/station/maintenance/radshelter/civil) +"jfK" = ( +/obj/machinery/light_switch/directional/south, +/obj/machinery/modular_computer/preset/command{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "jfX" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/trimline/purple/line, @@ -26549,6 +26487,17 @@ /obj/effect/spawner/random/structure/furniture_parts, /turf/open/misc/asteroid/airless, /area/station/asteroid) +"jqZ" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/obj/item/radio/intercom/directional/south, +/obj/effect/landmark/start/nanotrasen_consultant, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "jrc" = ( /obj/structure/table/reinforced, /obj/item/clothing/mask/gas{ @@ -27673,6 +27622,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"jLQ" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/item/pillow/random, +/obj/item/pillow/random, +/obj/machinery/airalarm/directional/north, +/obj/effect/spawner/random/bedsheet/double, +/turf/open/floor/carpet/neon/simple/white, +/area/station/commons/dorms) "jMr" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -27689,6 +27648,18 @@ }, /turf/open/floor/wood, /area/station/cargo/sorting) +"jMy" = ( +/obj/effect/turf_decal/bot, +/mob/living/simple_animal/bot/mulebot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + location = "QM #2" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "jMz" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -27873,6 +27844,25 @@ "jPA" = ( /turf/open/misc/asteroid, /area/station/maintenance/fore/greater) +"jPB" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/public/glass, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 8 + }, +/obj/machinery/button/door/directional/west{ + name = "Observation Shutters"; + id = "nt_rep_priv_2" + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "jQc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28243,12 +28233,6 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) -"jWf" = ( -/obj/item/bedsheet/centcom/double, -/obj/structure/bed/double, -/obj/machinery/light/small/blacklight/directional/east, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/nt_rep) "jWh" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/science) @@ -28265,6 +28249,11 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"jWw" = ( +/obj/item/kirbyplants/random, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "jWH" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -28321,6 +28310,18 @@ /obj/machinery/power/shieldwallgen, /turf/open/floor/iron/dark, /area/station/command/gateway) +"jXI" = ( +/obj/machinery/door/window/left/directional/south{ + name = "Incoming Mail"; + req_access = list("shipping") + }, +/obj/machinery/firealarm/directional/east, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/siding/wood, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron, +/area/station/cargo/sorting) "jXK" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, @@ -28379,11 +28380,6 @@ }, /turf/open/floor/wood/large, /area/station/service/library) -"jYv" = ( -/obj/structure/closet/secure_closet/nanotrasen_consultant/station, -/obj/item/assembly/flash/handheld, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/nt_rep) "jYF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -28959,6 +28955,18 @@ dir = 1 }, /area/station/security/office) +"kip" = ( +/obj/machinery/door/window/left/directional/south{ + base_state = "right"; + name = "Captain's Desk"; + req_access = list("captain") + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/duct, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "kiu" = ( /obj/item/radio/intercom/directional/north, /obj/machinery/holopad, @@ -29339,10 +29347,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) -"knH" = ( -/obj/structure/chair/plastic, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/nt_rep) "knN" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible{ dir = 8 @@ -29386,20 +29390,6 @@ "koq" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/foyer) -"kox" = ( -/obj/machinery/door/poddoor/preopen{ - id = "misclab"; - name = "Test Chamber Blast Door" - }, -/obj/machinery/door/window/left/directional/south{ - dir = 8; - name = "Test Chamber"; - req_access = list("xenobiology") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/science/xenobiology) "koA" = ( /obj/structure/rack, /obj/item/tank/jetpack/carbondioxide{ @@ -30657,20 +30647,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"kJA" = ( -/obj/effect/turf_decal/loading_area/white{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/elevator{ - elevator_mode = 1; - transport_linked_id = "biodome_medbay_lift" - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "kJF" = ( /obj/structure/sign/gym/mirrored/right, /turf/closed/wall, @@ -33002,38 +32978,6 @@ }, /turf/open/space/openspace, /area/space) -"lxy" = ( -/obj/effect/landmark/start/ai/secondary, -/obj/item/radio/intercom/directional/north{ - freerange = 1; - listening = 0; - name = "Custom Channel"; - pixel_x = -6 - }, -/obj/item/radio/intercom/directional/west{ - freerange = 1; - listening = 0; - name = "Common Channel" - }, -/obj/item/radio/intercom/directional/south{ - freerange = 1; - frequency = 1447; - listening = 0; - name = "Private Channel"; - pixel_x = -6 - }, -/obj/machinery/door/window{ - atom_integrity = 300; - base_state = "rightsecure"; - dir = 4; - icon_state = "rightsecure"; - layer = 4.1; - name = "Secondary AI Core Access"; - pixel_x = 4; - req_access = list("ai_upload") - }, -/turf/open/floor/circuit/green, -/area/station/ai_monitored/turret_protected/ai) "lxF" = ( /obj/machinery/light/directional/west, /turf/open/floor/engine, @@ -35011,22 +34955,6 @@ dir = 1 }, /area/station/science/lab) -"mdC" = ( -/obj/machinery/door/window{ - atom_integrity = 300; - base_state = "rightsecure"; - dir = 1; - icon_state = "rightsecure"; - name = "Primary AI Core Access"; - req_access = list("ai_upload") - }, -/obj/machinery/flasher/directional/south{ - id = "AI"; - pixel_x = 20 - }, -/obj/structure/cable/multilayer/connected, -/turf/open/floor/catwalk_floor/titanium, -/area/station/ai_monitored/turret_protected/ai) "mdD" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -35422,29 +35350,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"mjR" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/window/brigdoor/security/cell{ - dir = 1; - id = "Cell 2"; - name = "Cell 2" - }, -/obj/effect/turf_decal/trimline/red/filled/end{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/smooth_large, -/area/station/security/brig) "mjV" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/railing{ @@ -35959,6 +35864,16 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"mth" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window/right/directional/west{ + base_state = "left"; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark/smooth_corner{ + dir = 4 + }, +/area/station/commons/fitness) "mtk" = ( /turf/open/floor/carpet, /area/station/security/detectives_office) @@ -37013,13 +36928,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/escape) -"mNy" = ( -/obj/structure/bed, -/obj/item/bedsheet/dorms, -/obj/item/pillow/random, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/carpet/neon/simple/yellow, -/area/station/commons/dorms) "mNB" = ( /obj/structure/flora/bush/flowers_pp/style_random, /turf/open/floor/grass, @@ -37458,6 +37366,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"mVH" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/door/window/right/directional/west{ + base_state = "left"; + name = "Fitness Ring" + }, +/turf/open/floor/iron/dark/smooth_corner, +/area/station/commons/fitness) "mVJ" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -37477,21 +37393,6 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/carpet/orange, /area/station/security/prison) -"mWw" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - location = "QM #2" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "mWE" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -38193,17 +38094,27 @@ }, /turf/open/floor/eighties/red, /area/station/hallway/secondary/exit/departure_lounge) +"nhe" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 2"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "Xenobio Pen 2 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nhf" = ( /obj/structure/disposalpipe/segment{ dir = 5 }, /turf/open/floor/plating, /area/station/maintenance/port/central) -"nhh" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/filingcabinet/employment, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) "nhj" = ( /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, @@ -38221,17 +38132,6 @@ /obj/structure/cable/multilayer/multiz/cable_2, /turf/open/floor/catwalk_floor/titanium, /area/station/ai_monitored/turret_protected/ai) -"nhT" = ( -/obj/machinery/door/window/right/directional/north{ - dir = 8; - name = "Research Test Chamber"; - req_access = list("science") - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/event_spawn, -/turf/open/floor/engine, -/area/station/science/explab) "nhW" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/structure/reagent_dispensers/plumbed, @@ -39171,6 +39071,22 @@ dir = 1 }, /area/station/service/chapel) +"nzC" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Containment Pen 7"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "Xenobio Pen 7 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nzE" = ( /turf/closed/wall/mineral/wood, /area/station/service/bar/backroom) @@ -39828,6 +39744,18 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/carpet/black, /area/station/security/prison/visit) +"nKP" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/red/real_red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "nKV" = ( /turf/closed/wall, /area/station/medical/storage) @@ -40261,6 +40189,22 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/carpet/lone/star, /area/station/service/chapel) +"nRz" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Containment Pen 8"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio8"; + name = "Xenobio Pen 8 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "nRC" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/holofloor/dark, @@ -40424,13 +40368,6 @@ /obj/machinery/duct, /turf/open/floor/stone, /area/station/biodome/fore) -"nUi" = ( -/obj/structure/bed/double, -/obj/item/pillow/random, -/obj/item/pillow/random, -/obj/item/bedsheet/dorms_double, -/turf/open/floor/glass/reinforced, -/area/station/commons/dorms) "nUj" = ( /obj/vehicle/ridden/secway, /obj/machinery/firealarm/directional/north, @@ -40839,6 +40776,16 @@ }, /turf/open/floor/iron/smooth_half, /area/station/security/lockers) +"obz" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/corporate{ + name = "NT Consultant's Office" + }, +/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, +/obj/effect/turf_decal/siding/yellow, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "obD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -40933,6 +40880,16 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron, /area/station/security/prison/garden) +"odq" = ( +/obj/effect/turf_decal/loading_area/red, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/elevator/left/directional/north{ + elevator_mode = 1; + transport_linked_id = "biodome_brig_lift" + }, +/obj/effect/turf_decal/trimline/red/filled/warning, +/turf/open/floor/iron/smooth_half, +/area/station/security/brig) "ods" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -42031,6 +41988,14 @@ /obj/structure/transit_tube, /turf/open/openspace, /area/station/biodome/aft) +"oxc" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/nt_rep) "oxd" = ( /obj/machinery/door/airlock/security/glass{ name = "Interrogation" @@ -42369,6 +42334,21 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"oCd" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/right/directional/west{ + name = "Pharmacy Desk"; + req_access = list("pharmacy") + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/poddoor/preopen{ + id = "pharmacy_shutters"; + name = "Pharmacy Shutter" + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "oCq" = ( /obj/structure/tank_holder/extinguisher, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -42979,6 +42959,26 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"oNU" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 4 + }, +/obj/item/pen/fountain, +/obj/item/stamp{ + pixel_x = -6 + }, +/obj/item/stamp/centcom{ + pixel_y = 8 + }, +/obj/item/stamp/denied{ + pixel_x = 6 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "oNX" = ( /obj/machinery/power/turbine/turbine_outlet{ dir = 4 @@ -43611,24 +43611,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"paV" = ( -/obj/machinery/door/window/left/directional/north{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Containment Pen 5"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio5"; - name = "Xenobio Pen 5 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "paY" = ( /obj/machinery/electrolyzer, /obj/effect/decal/cleanable/dirt, @@ -43826,15 +43808,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured, /area/station/maintenance/disposal/incinerator) -"pdR" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/corporate{ - name = "NT Consultant's Office" - }, -/obj/effect/mapping_helpers/airlock/access/all/cent_com/rep_door, -/turf/open/floor/carpet/royalblack, -/area/station/command/heads_quarters/nt_rep) "pdW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/stripes/corner{ @@ -44435,6 +44408,13 @@ }, /turf/open/floor/wood, /area/station/cargo/lobby) +"pnO" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/item/pillow/random, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/carpet/neon/simple/green, +/area/station/commons/dorms) "pnT" = ( /obj/machinery/light/directional/west, /turf/open/floor/circuit, @@ -44814,6 +44794,17 @@ /obj/structure/girder, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"pxb" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Mass Driver"; + req_access = list("chapel_office") + }, +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/effect/landmark/start/chaplain, +/turf/open/floor/carpet/black, +/area/station/service/chapel/funeral) "pxk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -45202,6 +45193,20 @@ }, /turf/open/floor/wood/large, /area/station/service/library) +"pEE" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/elevator/left/directional/south{ + elevator_mode = 1; + transport_linked_id = "biodome_medbay_lift" + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "pEL" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/dark{ @@ -46686,29 +46691,6 @@ /obj/effect/turf_decal/trimline/red/arrow_ccw, /turf/open/floor/noslip, /area/station/biodome/fore) -"qgW" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/table/wood, -/obj/item/folder/yellow, -/obj/item/folder/white{ - pixel_y = 3 - }, -/obj/item/folder/red{ - pixel_y = 6 - }, -/obj/item/folder/blue{ - pixel_y = 9 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) "qgY" = ( /obj/machinery/airalarm/directional/south, /obj/effect/decal/cleanable/dirt, @@ -47412,16 +47394,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"qtm" = ( -/obj/machinery/door/window/right/directional/north{ - base_state = "left"; - icon_state = "left"; - name = "Library Desk Door"; - req_access = list("library") - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/carpet/royalblack, -/area/station/service/library) "qtp" = ( /obj/machinery/computer/bank_machine, /turf/open/floor/circuit/green{ @@ -47564,15 +47536,6 @@ }, /turf/open/floor/wood/large, /area/station/biodome) -"qvT" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/right/directional/east{ - dir = 1; - name = "Bridge Delivery"; - req_access = list("command") - }, -/turf/open/floor/wood, -/area/station/biodome/aft) "qwk" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -47594,6 +47557,13 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) +"qwJ" = ( +/obj/structure/bed, +/obj/item/pillow/random, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/carpet/neon/simple/blue, +/area/station/commons/dorms) "qwM" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/left/directional/east{ @@ -49175,22 +49145,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"qWB" = ( -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Containment Pen 2"; - req_access = list("xenobiology") - }, -/obj/machinery/door/poddoor/preopen{ - id = "xenobio2"; - name = "Xenobio Pen 2 Blast Door" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "qWE" = ( /obj/machinery/computer/atmos_control/plasma_tank{ dir = 4 @@ -49367,6 +49321,29 @@ /obj/effect/decal/cleanable/glitter/white, /turf/open/floor/plating, /area/station/maintenance/central/greater) +"qZz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/table/wood, +/obj/item/folder/yellow, +/obj/item/folder/white{ + pixel_y = 3 + }, +/obj/item/folder/red{ + pixel_y = 6 + }, +/obj/item/folder/blue{ + pixel_y = 9 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "qZB" = ( /obj/machinery/camera/directional/west{ c_tag = "Research - Ordnance Incinerator"; @@ -51075,16 +51052,6 @@ }, /turf/open/floor/plating, /area/station/cargo/miningdock) -"rBX" = ( -/obj/structure/bed/double{ - dir = 1 - }, -/obj/item/pillow/random, -/obj/item/pillow/random, -/obj/machinery/airalarm/directional/north, -/obj/item/bedsheet/dorms_double, -/turf/open/floor/carpet/neon/simple/white, -/area/station/commons/dorms) "rCB" = ( /obj/structure/table, /obj/item/folder/blue{ @@ -51309,6 +51276,24 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"rHi" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "robotics"; + name = "Robotics Lab Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/obj/machinery/door/window/right/directional/south{ + base_state = "left"; + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/iron, +/area/station/science/robotics/lab) "rHl" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -52133,6 +52118,17 @@ "rWr" = ( /turf/open/openspace, /area/station/security/brig) +"rWt" = ( +/obj/machinery/door/window/left/directional/east{ + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/turf/open/floor/iron, +/area/station/science/xenobiology) "rWF" = ( /obj/effect/turf_decal/trimline/dark_blue/arrow_ccw{ dir = 4 @@ -53755,6 +53751,14 @@ /obj/machinery/light/warm/directional/east, /turf/open/floor/wood/large, /area/station/biodome) +"sBe" = ( +/obj/effect/turf_decal/loading_area/red, +/obj/machinery/door/window/brigdoor/left/directional/north{ + name = "Security Delivery"; + req_access = list("brig") + }, +/turf/open/floor/plating, +/area/station/maintenance/department/security/brig) "sBf" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -54089,24 +54093,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/checker, /area/station/commons/storage/emergency) -"sIy" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/east{ - dir = 8; - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/item/pen, -/obj/machinery/door/poddoor/preopen{ - id = "pharmacy_shutters2"; - name = "Pharmacy Shutter" - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "sIz" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -54242,6 +54228,17 @@ dir = 1 }, /area/station/science/lab) +"sKq" = ( +/obj/effect/turf_decal/loading_area/white{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/elevator/left/directional/south{ + elevator_mode = 1; + transport_linked_id = "biodome_medbay_lift" + }, +/turf/open/floor/plating, +/area/station/medical/medbay/central) "sKC" = ( /obj/structure/reagent_dispensers/watertank{ pixel_x = -1 @@ -55109,6 +55106,17 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/supply) +"sZS" = ( +/obj/effect/turf_decal/trimline/red/real_red/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 8 + }, +/obj/machinery/time_clock/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "sZX" = ( /turf/closed/wall, /area/station/medical/treatment_center) @@ -55809,21 +55817,6 @@ /obj/effect/turf_decal/stripes/full, /turf/open/floor/iron, /area/station/cargo/storage) -"tlu" = ( -/obj/structure/table/wood/fancy/red, -/obj/item/ai_module/reset/purge{ - pixel_y = 11 - }, -/obj/effect/spawner/random/aimodule/harmful, -/obj/machinery/door/window/brigdoor/left/directional/south{ - dir = 4; - name = "High-Risk Modules"; - req_access = list("captain") - }, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/flasher/directional/west, -/turf/open/floor/circuit/red, -/area/station/ai_monitored/turret_protected/ai_upload) "tlz" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/siding/dark{ @@ -55978,18 +55971,6 @@ /obj/machinery/photocopier, /turf/open/floor/wood, /area/station/service/lawoffice) -"tng" = ( -/obj/effect/turf_decal/loading_area/red{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/elevator{ - dir = 8; - elevator_mode = 1; - transport_linked_id = "biodome_brig_lift" - }, -/turf/open/floor/iron/dark/smooth_half, -/area/station/security/brig) "tnj" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -56459,6 +56440,18 @@ }, /turf/open/floor/iron, /area/station/security/prison/garden) +"txj" = ( +/obj/effect/turf_decal/bot, +/mob/living/simple_animal/bot/mulebot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=2"; + location = "QM #1" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "txp" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -56887,6 +56880,11 @@ }, /turf/open/floor/iron, /area/station/commons/locker) +"tEj" = ( +/obj/structure/closet/secure_closet/nanotrasen_consultant/station, +/obj/item/assembly/flash/handheld, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "tEq" = ( /obj/effect/spawner/random/trash/graffiti{ spawn_loot_chance = 35; @@ -56998,6 +56996,19 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"tGn" = ( +/obj/machinery/door/poddoor/preopen{ + id = "misclab"; + name = "Test Chamber Blast Door" + }, +/obj/machinery/door/window/left/directional/west{ + name = "Test Chamber"; + req_access = list("xenobiology") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/science/xenobiology) "tGr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/cyan/hidden{ @@ -57115,6 +57126,36 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"tIE" = ( +/obj/effect/landmark/start/ai/secondary, +/obj/item/radio/intercom/directional/north{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -6 + }, +/obj/item/radio/intercom/directional/west{ + freerange = 1; + listening = 0; + name = "Common Channel" + }, +/obj/item/radio/intercom/directional/south{ + freerange = 1; + frequency = 1447; + listening = 0; + name = "Private Channel"; + pixel_x = -6 + }, +/obj/machinery/door/window/left/directional/east{ + atom_integrity = 300; + base_state = "rightsecure"; + layer = 4.1; + name = "Secondary AI Core Access"; + pixel_x = 4; + req_access = list("ai_upload") + }, +/turf/open/floor/circuit/green, +/area/station/ai_monitored/turret_protected/ai) "tIG" = ( /obj/structure/railing{ dir = 1 @@ -57201,22 +57242,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/stone, /area/station/maintenance/department/security/brig) -"tKd" = ( -/obj/machinery/door/poddoor/preopen{ - id = "xenobio3"; - name = "Xenobio Pen 3 Blast Door" - }, -/obj/machinery/door/window/left/directional/north{ - dir = 4; - name = "Containment Pen 3"; - req_access = list("xenobiology") - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "tKg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, @@ -57510,21 +57535,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"tQi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/airlock/public/glass, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) "tQk" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -57567,21 +57577,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) -"tQI" = ( -/obj/effect/turf_decal/bot, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=2"; - location = "QM #1" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/storage) "tQK" = ( /obj/structure/bookcase/random/nonfiction, /obj/machinery/door/firedoor/border_only{ @@ -57705,17 +57700,6 @@ /obj/machinery/button/ignition/incinerator/atmos, /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"tUb" = ( -/obj/structure/chair/office{ - dir = 1 - }, -/obj/item/radio/intercom/directional/south, -/obj/effect/landmark/start/nanotrasen_consultant, -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) "tUf" = ( /obj/structure/railing{ dir = 4 @@ -58180,6 +58164,22 @@ /obj/structure/holosign/barrier/atmos/sturdy, /turf/open/floor/plating/plasma, /area/station/maintenance/space_hut/plasmaman) +"ueB" = ( +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Containment Pen 5"; + req_access = list("xenobiology") + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "Xenobio Pen 5 Blast Door" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "ueD" = ( /obj/machinery/duct, /obj/structure/cable, @@ -58279,13 +58279,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"ugc" = ( -/obj/item/bedsheet/dorms, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/turf/open/floor/carpet/neon/simple/yellow, -/area/station/commons/dorms) "ugl" = ( /obj/structure/cable, /obj/item/shard, @@ -59179,16 +59172,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) -"uyW" = ( -/obj/machinery/light/directional/west, -/obj/machinery/button/door/directional/west{ - id = "nt_rep_priv"; - name = "Privacy Shutters Control"; - pixel_y = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/wood, -/area/station/command/heads_quarters/nt_rep) "uyX" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -59517,6 +59500,28 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/lesser) +"uEL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/brigdoor/security/cell/left/directional/north{ + id = "Cell 2"; + name = "Cell 2" + }, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/security/brig) "uES" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -59698,6 +59703,17 @@ dir = 4 }, /area/station/medical/medbay/central) +"uHV" = ( +/obj/structure/filingcabinet, +/obj/structure/filingcabinet/medical{ + pixel_x = -10 + }, +/obj/structure/filingcabinet/security{ + pixel_x = 10 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/carpet/green, +/area/station/command/heads_quarters/nt_rep) "uHX" = ( /turf/open/floor/iron, /area/station/maintenance/starboard/lesser) @@ -59937,6 +59953,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/engineering/atmos) +"uMW" = ( +/obj/effect/turf_decal/loading_area/red{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/elevator/left/directional/west{ + elevator_mode = 1; + transport_linked_id = "biodome_brig_lift" + }, +/turf/open/floor/iron/dark/smooth_half, +/area/station/security/brig) "uNa" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -61216,22 +61243,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) -"vlT" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/right/directional/east{ - dir = 8; - name = "Pharmacy Desk"; - req_access = list("pharmacy") - }, -/obj/structure/desk_bell{ - pixel_x = 7 - }, -/obj/machinery/door/poddoor/preopen{ - id = "pharmacy_shutters"; - name = "Pharmacy Shutter" - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "vmb" = ( /obj/structure/table/reinforced, /obj/item/storage/box, @@ -61514,6 +61525,14 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"vpV" = ( +/obj/structure/bed, +/obj/item/pillow/random, +/obj/effect/spawner/random/bedsheet, +/obj/machinery/airalarm/directional/south, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet/neon/simple/blue, +/area/station/commons/dorms) "vqc" = ( /obj/structure/flora/rock/icy/style_random, /turf/open/misc/asteroid/snow/icemoon, @@ -64164,20 +64183,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) -"wkO" = ( -/obj/structure/table/wood/fancy/blue, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window{ - base_state = "right"; - dir = 8; - icon_state = "right"; - name = "Core Modules"; - req_access = list("captain") - }, -/obj/effect/spawner/random/aimodule/neutral, -/obj/machinery/flasher/directional/east, -/turf/open/floor/circuit, -/area/station/ai_monitored/turret_protected/ai_upload) "wkP" = ( /obj/structure/stone_tile/surrounding, /obj/machinery/holopad, @@ -65098,19 +65103,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white/small, /area/station/maintenance/central/greater) -"wyv" = ( -/obj/machinery/door/window{ - base_state = "right"; - icon_state = "right"; - name = "Captain's Desk"; - req_access = list("captain") - }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/duct, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "wyx" = ( /obj/structure/sign/poster/random/directional/west, /obj/machinery/door/airlock/public/glass, @@ -65997,10 +65989,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"wOe" = ( -/obj/item/bedsheet/random, -/turf/open/floor/grass, -/area/station/science/genetics) "wOk" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -66269,26 +66257,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"wSw" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_y = 4 - }, -/obj/item/pen/fountain, -/obj/item/stamp{ - pixel_x = -6 - }, -/obj/item/stamp/centcom{ - pixel_y = 8 - }, -/obj/item/stamp/denied{ - pixel_x = 6 - }, -/obj/effect/turf_decal/siding/yellow{ - dir = 1 - }, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/nt_rep) "wSx" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -66414,18 +66382,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"wVh" = ( -/obj/machinery/door/window{ - dir = 4; - name = "Mass Driver"; - req_access = list("chapel_office") - }, -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/effect/landmark/start/chaplain, -/turf/open/floor/carpet/black, -/area/station/service/chapel/funeral) "wVk" = ( /obj/machinery/power/terminal{ dir = 4 @@ -67887,6 +67843,21 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/iron/white/smooth_large, /area/station/medical/break_room) +"xvS" = ( +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "Xenobio Pen 3 Blast Door" + }, +/obj/machinery/door/window/left/directional/east{ + name = "Containment Pen 3"; + req_access = list("xenobiology") + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "xvU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68096,6 +68067,28 @@ }, /turf/open/floor/iron/dark, /area/station/medical/storage) +"xzX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/window/brigdoor/security/cell/left/directional/north{ + id = "Cell 3"; + name = "Cell 3" + }, +/obj/effect/turf_decal/trimline/red/filled/end{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/mid_joiner{ + dir = 8 + }, +/turf/open/floor/iron/smooth_large, +/area/station/security/brig) "xzZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -69914,17 +69907,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"yex" = ( -/obj/effect/turf_decal/loading_area/red, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/elevator{ - dir = 1; - elevator_mode = 1; - transport_linked_id = "biodome_brig_lift" - }, -/obj/effect/turf_decal/trimline/red/filled/warning, -/turf/open/floor/iron/smooth_half, -/area/station/security/brig) "yeD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ @@ -69954,17 +69936,6 @@ /obj/machinery/light/warm/directional/west, /turf/open/floor/iron, /area/station/commons/dorms) -"yfd" = ( -/obj/effect/turf_decal/loading_area/white{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/elevator{ - elevator_mode = 1; - transport_linked_id = "biodome_medbay_lift" - }, -/turf/open/floor/plating, -/area/station/medical/medbay/central) "yfs" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -70014,6 +69985,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/fitness) +"yhc" = ( +/obj/item/fancy_pillow, +/obj/effect/spawner/random/bedsheet/any, +/obj/item/book/random, +/turf/open/floor/iron/dark, +/area/station/maintenance/fore/greater) "yhg" = ( /obj/structure/table, /obj/item/stock_parts/subspace/analyzer, @@ -70162,18 +70139,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/command/bridge) -"yjf" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window/right/directional/east{ - base_state = "left"; - dir = 8; - icon_state = "left"; - name = "Fitness Ring" - }, -/turf/open/floor/iron/dark/smooth_corner{ - dir = 4 - }, -/area/station/commons/fitness) "yjg" = ( /turf/closed/wall, /area/station/medical/surgery/fore) @@ -89679,7 +89644,7 @@ xuo xuo xuo xuo -lxy +tIE xuo xuo xuo @@ -90963,7 +90928,7 @@ bJr nhR mqX aFg -mdC +gQg rhL xuo dYS @@ -92249,7 +92214,7 @@ xuo xuo xuo xuo -cHH +iQD xuo xuo xuo @@ -93632,7 +93597,7 @@ myr mld wrB oso -yfd +sKq mWP kty oAe @@ -93889,7 +93854,7 @@ tSJ wSI wSI tlP -yfd +sKq bRw agt oAe @@ -98973,7 +98938,7 @@ mCj hNy rRv sRF -gBW +auX inF vMB vUY @@ -99277,7 +99242,7 @@ nNe nsd kDp mpn -qtm +hVg eUx ylL fdc @@ -99489,7 +99454,7 @@ rRv sRF wZB vMB -bnJ +yhc sBz dYQ dYQ @@ -99718,7 +99683,7 @@ oYs cAp rLZ cPZ -kox +tGn rLZ rLZ cAp @@ -99975,7 +99940,7 @@ oYs hpf ens pdL -dSh +rWt qVP xJH xJH @@ -100002,7 +99967,7 @@ hNy rRv sRF inF -aZu +izs biR sBz dYQ @@ -101246,16 +101211,16 @@ hNy hNy oYs pjo -hJs +gqd iof nDX -tKd +xvS jEd toN -qWB +nhe ljw mEp -hZk +gsY dKh oYs gAc @@ -102017,16 +101982,16 @@ hNy hNy oYs ePP -ddI +nRz hAi nRU -iYV +nzC ptc nWX -ijq +gUg pEs uud -paV +ueB oeQ oYs gAc @@ -109545,7 +109510,7 @@ gHP doI qlZ bwO -cRp +gpp chB sWx dwk @@ -110304,7 +110269,7 @@ rTb qkI rZG dOs -wyv +kip cEf nkE vzt @@ -111823,7 +111788,7 @@ dHw fAe ecf dHw -wOe +bio geE hNy hNy @@ -112080,7 +112045,7 @@ boN dHw dHw fAe -wOe +bio geE hNy hNy @@ -112337,7 +112302,7 @@ fAe fHY jmg dHw -wOe +bio geE hNy hNy @@ -113444,8 +113409,8 @@ mSo sxr kHf kHf -tng -tng +uMW +uMW kHf jBl adL @@ -113696,7 +113661,7 @@ tju tju tju gpM -cqf +sBe mbD sxr mBf @@ -154511,11 +154476,11 @@ kJF wxS vdY ibq -czQ +mVH lkz lkz lkz -yjf +mth fUJ ozR ikk @@ -159168,7 +159133,7 @@ tqQ dVy woD vyL -kJA +pEE bwV bwV jHc @@ -159408,7 +159373,7 @@ aKV qPE wHM hac -sIy +iqH uDX sZX sZX @@ -159425,7 +159390,7 @@ oqe eQf kBw ebY -kJA +pEE bwV bwV jHc @@ -161419,7 +161384,7 @@ hHc jJi lEX jJi -rBX +jLQ ldC phJ htY @@ -161461,7 +161426,7 @@ ikk ikk nRf hmx -vlT +oCd lOc jtS qqV @@ -161688,7 +161653,7 @@ phJ ipc xOr jaU -nUi +hAY phJ xLH bnZ @@ -161939,7 +161904,7 @@ phJ htY sWq phJ -ugc +hHp vqW phJ phJ @@ -162447,7 +162412,7 @@ hHc jJi fun jJi -mNy +hHT mcK phJ pSZ @@ -163475,14 +163440,14 @@ jJi jJi fun jJi -cFO +pnO vld phJ htY sWq phJ cdF -bys +vpV phJ nOx ayc @@ -164757,7 +164722,7 @@ dQH jJi fun jJi -cFO +pnO pjw phJ htY @@ -164997,7 +164962,7 @@ oYs rig vrd tFo -hNq +iYt tFo nfF lps @@ -165785,7 +165750,7 @@ rDI jJi fun jJi -aDC +qwJ nCs phJ pjN @@ -170460,7 +170425,7 @@ rAq rlQ bZr dwG -wVh +pxb gRI gXH bJO @@ -170927,7 +170892,7 @@ ueD bBk jeh kAO -aME +rHi wpu yiC wza @@ -173488,7 +173453,7 @@ cLA urw dJN vsv -nhT +cqJ dNN apS fmR @@ -173845,7 +173810,7 @@ xLQ ltj nlc rSj -bCE +cEY vZK mvG iJB @@ -174616,7 +174581,7 @@ xLQ ltj snV pkL -mjR +uEL gqY mvG iJB @@ -174808,7 +174773,7 @@ aFm gSe meU cFv -tlu +hFo pML sQE vwW @@ -175349,7 +175314,7 @@ olA kgI mnG gbv -qvT +arg xMG gti vaX @@ -175387,7 +175352,7 @@ xLQ ltj xJN tse -fPM +xzX gqY xQo cTv @@ -176350,7 +176315,7 @@ sZD sZD meU cFv -wkO +aTX tGF igh dUV @@ -176841,7 +176806,7 @@ pBb pbc lHe btW -eci +ipR hhw eeJ eeJ @@ -177905,7 +177870,7 @@ aJA nAm mVv bxZ -tQi +jPB tjf tjf gsD @@ -178164,11 +178129,11 @@ nQZ dGl rTY biu -bdk +msd tZb msd -bFh -msd +nKP +sZS grI dPW pYD @@ -178421,10 +178386,10 @@ tiN pmH pGm oHI -ybl -fAQ -fIX -fIX +ghW +gBi +ghW +ghW ybl fvQ jpN @@ -178468,7 +178433,7 @@ vNc kHf rGd rWr -yex +odq nQw plE cEF @@ -178675,13 +178640,13 @@ cjF pGm bGv iAV -bGv +jWw pGm -fuh -uyW +ybl +oxc rwR -wSw -gak +oNU +jfK ybl myK eZB @@ -178725,7 +178690,7 @@ uEl kHf rWr rWr -yex +odq dUY dUY taA @@ -178937,9 +178902,9 @@ lqK ybl xZE rZT -qgW -tUb -ybl +qZz +jqZ +aRa nqU eZB mvF @@ -179192,7 +179157,7 @@ cIh nev xSW ybl -nhh +uHV vMF ehb lUN @@ -179706,9 +179671,9 @@ ieL kfx sVA ybl -knH -bwC -pdR +eQQ +bdn +obz jxU ybl myK @@ -179963,8 +179928,8 @@ dRX kfx kvE ybl -jYv -jWf +tEj +fRg ybl eTN ybl @@ -180729,7 +180694,7 @@ ioC juO lrZ qVD -iod +jXI ckK lqK aJL @@ -182265,7 +182230,7 @@ hNy hNy hNy xvk -tQI +txj jQL sAc kJq @@ -182522,7 +182487,7 @@ hNy hNy hNy xvk -mWw +jMy jQL sAc jGu diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index a1bfdfb7ccd..6f0a355097e 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -125,6 +125,16 @@ dir = 8 }, /area/station/service/chapel) +"acE" = ( +/obj/structure/table/wood/fancy/blue, +/obj/effect/spawner/random/aimodule/harmless, +/obj/machinery/door/window/left/directional/east{ + base_state = "right"; + name = "Core Modules"; + req_access = list("captain") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) "acM" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -230,20 +240,6 @@ /obj/item/relic, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"aeB" = ( -/obj/machinery/button/door/directional/north{ - id = "cafe_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/turf_decal/tile/dark_red/opposingcorners{ - dir = 8 - }, -/obj/machinery/vending/dinnerware, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "aeG" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -331,17 +327,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) -"afI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "afU" = ( /obj/docking_port/stationary/random{ name = "lavaland"; @@ -459,17 +444,6 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/night_club) -"aii" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/engineering/power_station) "aio" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -631,6 +605,17 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"ajZ" = ( +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "aki" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -658,6 +643,20 @@ "akt" = ( /turf/open/floor/iron/dark, /area/station/engineering/break_room) +"akv" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "akB" = ( /obj/structure/spirit_board, /obj/machinery/firealarm/directional/east, @@ -722,13 +721,6 @@ /obj/machinery/suit_storage_unit/engine, /turf/open/floor/plating, /area/station/engineering/rbmk2/chamber) -"alu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/wood/parquet, -/area/station/hallway/primary/central/fore) "alx" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -838,30 +830,6 @@ /obj/item/kitchen/fork, /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) -"anb" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) -"ane" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #3"; - name = "QM #3" - }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #3"; - suffix = "#3" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/cargo/storage) "ant" = ( /obj/machinery/computer/records/medical/laptop{ dir = 8; @@ -880,6 +848,15 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"anG" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "pharm_desk_shutters"; + name = "Desk Shutters"; + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "anI" = ( /obj/machinery/light/warm/directional/east, /obj/effect/turf_decal/siding/purple{ @@ -898,6 +875,22 @@ }, /turf/open/floor/iron/dark, /area/station/common/night_club) +"aoh" = ( +/obj/machinery/computer/communications{ + dir = 4 + }, +/obj/machinery/keycard_auth/directional/west, +/obj/machinery/button/door/directional/west{ + id = "captain_privacy"; + name = "Captain's Privacy Shutters"; + pixel_y = 9; + req_access = list("captain") + }, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "aoq" = ( /obj/structure/window/spawner/directional/east, /obj/effect/turf_decal/weather/dirt{ @@ -1341,6 +1334,15 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/ce) +"auc" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/transport/power_rectifier, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/tram/left) "auh" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 1 @@ -1494,21 +1496,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/security/prison/upper) -"awt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications Lobby" - }, -/obj/effect/landmark/navigate_destination/tcomms, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "awu" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -1604,6 +1591,13 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/waste) +"ayp" = ( +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "ayt" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1611,11 +1605,6 @@ /obj/machinery/light/warm/directional/east, /turf/open/misc/beach/sand, /area/station/common/pool) -"ayu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) "ayH" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/item/radio/intercom/directional/south, @@ -1624,6 +1613,10 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/aft) +"ayT" = ( +/obj/structure/stone_tile/slab, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "ayU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1705,6 +1698,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"aAA" = ( +/obj/structure/bookcase/random/adult{ + name = "Forbidden Knowledge" + }, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "aAE" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -1732,6 +1732,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) +"aBe" = ( +/obj/machinery/door/airlock/security{ + name = "Interrogation" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) "aBp" = ( /obj/structure/cable, /obj/structure/railing{ @@ -2083,18 +2098,6 @@ /obj/machinery/light/floor, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"aFu" = ( -/obj/machinery/firealarm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/computer/monitor, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) "aFw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/dark/filled/warning{ @@ -2137,6 +2140,13 @@ /obj/item/computer_disk/quartermaster, /turf/open/floor/mineral/gold, /area/station/command/heads_quarters/qm) +"aFO" = ( +/obj/structure/stone_tile/slab, +/obj/item/flashlight/lantern/heirloom_moth{ + start_on = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "aFQ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -2337,6 +2347,10 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig/entrance) +"aHM" = ( +/obj/structure/stone_tile/block/cracked, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "aHP" = ( /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/plating, @@ -2415,6 +2429,14 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/asteroid_lobby) +"aJh" = ( +/obj/structure/destructible/cult/item_dispenser/archives/library, +/obj/item/book/codex_gigas, +/obj/machinery/airalarm/directional/north, +/obj/item/storage/photo_album/library, +/obj/effect/mapping_helpers/burnt_floor, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "aJl" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2529,17 +2551,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"aLe" = ( -/obj/machinery/button/door/directional/west{ - id = "rbmk2_shutters_east"; - name = "RB-MK2 Radiation Shutters Control" - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/space_heater{ - anchored = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/rbmk2/chamber) "aLj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate/coffin, @@ -2775,6 +2786,12 @@ "aOC" = ( /turf/open/floor/grass, /area/station/medical/virology) +"aOE" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/spawner/random/vending/snackvend, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "aOF" = ( /obj/structure/transport/linear, /turf/open/floor/plating/elevatorshaft, @@ -2807,15 +2824,6 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/engine, /area/station/medical/morgue) -"aPw" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "aPz" = ( /obj/machinery/light/warm/directional/east, /obj/machinery/vending/drugs, @@ -2979,11 +2987,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) -"aQI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/engineering/power_station) "aQS" = ( /turf/closed/wall/rust, /area/station/command/cc_dock) @@ -3130,17 +3133,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/freezerchamber) -"aTl" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/structure/cable, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - id_tag = "ai_sat_maint_left" - }, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "aTm" = ( /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 4 @@ -3363,26 +3355,24 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/maintenance/aux_eva) -"aWP" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 9 - }, -/obj/machinery/computer/security, -/obj/structure/cable, -/obj/machinery/button/door/directional/west{ - id = "sec_check_shutters"; - name = "Security Checkpoint Shutters"; - pixel_y = -10 - }, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint) -"aXj" = ( +"aXk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/research/glass{ + name = "Circuitry Lab" + }, /obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/circuits) "aXn" = ( /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, @@ -3407,6 +3397,12 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"aXA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "aYg" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 1 @@ -3595,6 +3591,18 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"baZ" = ( +/obj/structure/table/wood, +/obj/item/storage/lockbox/medal/sec, +/obj/item/camera, +/obj/machinery/button/door/directional/east{ + id = "hos_office_external_shutters"; + name = "External Privacy Shutters Control"; + req_access = list("hos") + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "bbh" = ( /obj/machinery/door/poddoor{ id = "enginewasteblast"; @@ -3818,15 +3826,6 @@ }, /turf/open/floor/noslip, /area/station/engineering/atmos) -"beV" = ( -/obj/structure/transport/linear/tram, -/obj/structure/fluff/tram_rail/electric{ - dir = 1 - }, -/obj/machinery/computer/tram_controls/directional/south, -/obj/structure/thermoplastic, -/turf/open/floor/plating, -/area/station/terminal/lobby) "beY" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ dir = 1 @@ -3938,6 +3937,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) +"bhV" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/pharmacy) "bhW" = ( /obj/effect/turf_decal/siding/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -4396,6 +4399,16 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/maintenance/abandon_cafeteria) +"bpa" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) +"bpi" = ( +/obj/structure/stone_tile/slab, +/turf/open/misc/moonstation_rock/cave, +/area/moonstation/underground) "bpq" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/tile/bar/half/contrasted{ @@ -4521,6 +4534,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"brQ" = ( +/obj/structure/fans/tiny/invisible, +/obj/structure/necropolis_arch, +/obj/structure/necropolis_gate, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "brS" = ( /obj/structure/chair/sofa/corp/right{ dir = 8 @@ -4564,6 +4583,17 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/service/chapel) +"btr" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "btu" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light_switch/directional/south, @@ -4588,16 +4618,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/security/prison/upper) -"btG" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/storage) "btH" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -5055,6 +5075,15 @@ /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/station/command/bridge) +"bBY" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/library/private) "bCi" = ( /obj/effect/landmark/start/chemist, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -5075,7 +5104,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"bCr" = ( +"bCl" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "MiniSat Maintenance" }, @@ -5083,7 +5112,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/teleporter) "bCy" = ( @@ -5335,6 +5364,13 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/abandon_office) +"bGW" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "bHg" = ( /obj/structure/dresser, /turf/open/floor/material/meat, @@ -5396,6 +5432,12 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/abandon_cafeteria) +"bJe" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "bJg" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -5410,6 +5452,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron, /area/station/engineering/atmos) +"bJB" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/machinery/airalarm/directional/west, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/tcommsat/computer) "bJH" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -5456,6 +5506,14 @@ dir = 1 }, /area/station/commons/dorms) +"bKn" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "bKr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -5605,6 +5663,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"bML" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/machinery/space_heater, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "bMP" = ( /obj/structure/sign/warning/docking/directional/south, /turf/open/misc/moonstation_sand, @@ -5998,11 +6061,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/brig/entrance) -"bSI" = ( -/obj/structure/sign/flag/usa/directional/north, -/obj/structure/sink/oil_well, -/turf/open/misc/moonstation_sand, -/area/station/maintenance/port) "bSL" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/light/floor, @@ -6146,19 +6204,6 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, /area/station/service/janitor) -"bUX" = ( -/obj/machinery/computer/station_alert{ - dir = 8 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "engineering_desk_shutters"; - name = "Engineering Desk Shutters Control" - }, -/turf/open/floor/iron, -/area/station/engineering/storage_shared) "bVk" = ( /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/circuit/green, @@ -6219,21 +6264,6 @@ "bWh" = ( /turf/closed/wall/rust, /area/station/maintenance/gag_room) -"bWp" = ( -/obj/machinery/computer/communications{ - dir = 4 - }, -/obj/machinery/keycard_auth/directional/west, -/obj/machinery/button/door/directional/west{ - id = "captain_privacy"; - name = "Captain's Privacy Shutters"; - pixel_y = 9 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "bWs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6277,6 +6307,12 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) +"bXc" = ( +/obj/structure/tram, +/obj/structure/transport/linear/tram, +/obj/machinery/transport/tram_controller/moonstation, +/turf/open/floor/plating, +/area/station/terminal/lobby) "bXd" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -6367,6 +6403,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"bYl" = ( +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "bYs" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, /obj/effect/mapping_helpers/airlock/unres, @@ -6468,6 +6512,15 @@ /obj/machinery/light_switch/directional/west, /turf/open/floor/iron/dark, /area/station/common/night_club) +"bZR" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "cae" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red/anticorner/contrasted, @@ -6523,11 +6576,6 @@ /obj/structure/sign/warning/electric_shock/directional/north, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"caK" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "caS" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -6773,15 +6821,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/north, /turf/open/floor/wood, /area/station/service/bar) -"ceX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "cfh" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/mapping_helpers/broken_floor, @@ -6825,15 +6864,6 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/lockers) -"cfE" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/door/window/left/directional/east{ - name = "Atmospherics Deliveries"; - req_access = list("atmospherics") - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/station/engineering/atmos/control_center) "cfL" = ( /obj/structure/bed{ dir = 4 @@ -6875,17 +6905,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos) -"cgb" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/modular_computer/preset/cargochat/science, -/obj/machinery/button/door/directional/north{ - id = "research_shutters"; - name = "Desk Shutters Control" - }, -/turf/open/floor/iron/white, -/area/station/science/lab) "cgc" = ( /obj/machinery/light/small/red/directional/north, /obj/machinery/airalarm/directional/east, @@ -6934,17 +6953,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/hallway) -"cgD" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "cgN" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -7033,6 +7041,15 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"chN" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/lattice/catwalk, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "chV" = ( /obj/structure/table, /obj/item/storage/toolbox/electrical{ @@ -7250,6 +7267,13 @@ }, /turf/open/floor/iron/large, /area/station/cargo/lobby) +"ckB" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "ckQ" = ( /obj/machinery/turretid{ name = "AI Chamber turret control"; @@ -7310,6 +7334,17 @@ /obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron/white, /area/station/security/prison/shower) +"clg" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "clu" = ( /obj/machinery/firealarm/directional/west, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -7319,15 +7354,6 @@ /obj/machinery/camera/autoname/security/directional/west, /turf/open/floor/iron/dark, /area/station/security/brig) -"clw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance" - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/service) "clE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -7476,19 +7502,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"coo" = ( -/obj/machinery/fax{ - fax_name = "Law Office A"; - name = "Law Office A Fax Machine" - }, -/obj/structure/table/wood, -/obj/machinery/button/door/directional/west{ - id = "lawyer_shutters_a"; - name = "Privacy Shutters Control" - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/wood, -/area/station/service/lawoffice) "cop" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7700,15 +7713,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"csw" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/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/security/brig) "csz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/meter, @@ -7838,13 +7842,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"cvv" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "cvT" = ( /obj/item/radio/intercom/directional/south, /obj/structure/disposalpipe/trunk{ @@ -7968,6 +7965,14 @@ /obj/structure/sign/poster/contraband/shamblers_juice/directional/east, /turf/open/floor/iron/dark, /area/station/common/night_club) +"cxW" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "cyf" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Post - Medbay" @@ -7980,12 +7985,6 @@ /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) -"cyk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "cyn" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/air_output{ dir = 1 @@ -8236,13 +8235,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/blueshield) -"cCS" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/chem_heater/withbuffer, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/chemistry) "cCV" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -8356,6 +8348,20 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) +"cEY" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "ai_sat_maint_right"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Door Bolt Control"; + req_access = list("minisat") + }, +/obj/machinery/camera/autoname/minisat/directional/east, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "cFc" = ( /obj/structure/marker_beacon/burgundy, /obj/effect/landmark/atmospheric_sanity/ignore_area, @@ -8371,6 +8377,11 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) +"cFA" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/power_station) "cFM" = ( /obj/structure/table, /obj/structure/towel_bin, @@ -8429,6 +8440,14 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/medical) +"cHh" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/spawner/random/decoration/ornament, +/obj/structure/table/wood, +/turf/open/floor/wood/parquet, +/area/station/hallway/primary/central/fore) "cHj" = ( /obj/effect/spawner/costume/marisawizard, /obj/structure/rack, @@ -8663,15 +8682,6 @@ "cKI" = ( /turf/open/floor/iron/grimy, /area/station/terminal/lobby) -"cLc" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "cLg" = ( /obj/item/grenade/chem_grenade/smart_metal_foam{ pixel_y = 4 @@ -8806,17 +8816,6 @@ "cMM" = ( /turf/closed/wall/material/meat, /area/station/maintenance/dorm_room) -"cMT" = ( -/obj/machinery/button/door/directional/east{ - id = "rbmk2_shutters_west"; - name = "RB-MK2 Radiation Shutters Control" - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/space_heater{ - anchored = 1 - }, -/turf/open/floor/plating, -/area/station/engineering/rbmk2/chamber) "cNa" = ( /turf/open/floor/plating, /area/station/construction/mining/aux_base) @@ -8873,6 +8872,12 @@ /mob/living/basic/pet/bumbles, /turf/open/floor/glass/reinforced, /area/station/service/hydroponics) +"cNR" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "cNU" = ( /obj/structure/table/wood/fancy/royalblack, /obj/structure/window/reinforced/spawner/directional/south, @@ -8888,6 +8893,18 @@ }, /turf/open/floor/plating, /area/station/command/cc_dock) +"cOb" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/underground) "cOe" = ( /obj/machinery/door/window/left/directional/east{ name = "Medical Supplies"; @@ -8899,6 +8916,10 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/storage) +"cOu" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/auxiliary) "cOv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /turf/open/floor/plating, @@ -8918,10 +8939,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"cOL" = ( -/obj/machinery/space_heater, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "cOM" = ( /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) @@ -8993,16 +9010,6 @@ }, /turf/open/floor/iron/checker, /area/station/security/evidence) -"cQI" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/item/assembly/mousetrap/armed{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "cQL" = ( /obj/effect/turf_decal/trimline/white/line, /obj/effect/turf_decal/trimline/white/line{ @@ -9187,13 +9194,6 @@ "cSN" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) -"cSS" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/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/engineering/main) "cSZ" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -9315,15 +9315,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"cUK" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/item/kirbyplants/random, -/obj/structure/sign/warning/pods/directional/north, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/checker, -/area/station/hallway/primary/tram/left) "cUP" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -9500,6 +9491,9 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/engineering/main) +"cWP" = ( +/turf/open/floor/catwalk_floor/rust/moonstation/cave, +/area/moonstation/underground) "cWR" = ( /obj/machinery/light/warm/directional/south, /turf/open/floor/wood, @@ -9847,16 +9841,6 @@ dir = 1 }, /area/station/hallway/secondary/exit) -"dcZ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "dda" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/siding/dark{ @@ -9876,11 +9860,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"ddf" = ( -/obj/machinery/airalarm/directional/north, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "ddl" = ( /obj/machinery/door/poddoor/massdriver_ordnance, /obj/structure/fans/tiny, @@ -10009,6 +9988,13 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/engine, /area/station/science/circuits) +"dfi" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "dfl" = ( /obj/effect/landmark/start/bitrunner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10067,6 +10053,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/storage/gas) +"dfO" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "dfR" = ( /obj/effect/spawner/random/burgerstation/liquid, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -10221,6 +10218,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"dic" = ( +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/ruin/unpowered/ash_walkers) "die" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10253,6 +10255,13 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/glass/reinforced, /area/station/service/library/artgallery) +"dik" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "dis" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -10290,6 +10299,19 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/hos) +"diP" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "djc" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/portable_atmospherics/canister/air, @@ -10420,6 +10442,12 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"dkU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "dkV" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -10430,6 +10458,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"dlg" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "dlh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -11200,6 +11237,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/red, /area/station/service/library/artgallery) +"dxS" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/structure/cable, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance"; + id_tag = "ai_sat_maint_left" + }, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "dxV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11227,22 +11275,11 @@ }, /turf/open/floor/iron/dark/small, /area/station/command/bridge) -"dys" = ( -/obj/machinery/door/airlock/engineering{ - name = "Auxiliary Base Construction" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/construction/mining/aux_base) +"dyu" = ( +/obj/machinery/light/small/directional/west, +/obj/item/radio/intercom/directional/west, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "dyB" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/space_heater, @@ -11325,13 +11362,6 @@ /obj/structure/sign/warning/electric_shock/directional/north, /turf/open/floor/iron, /area/station/security/prison/workout) -"dzD" = ( -/obj/structure/sign/painting/library_private{ - pixel_y = -32 - }, -/obj/structure/displaycase/curator, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "dzF" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -11422,14 +11452,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"dAT" = ( -/obj/machinery/transport/destination_sign/indicator/directional/south, -/obj/machinery/button/transport/tram/directional/south{ - id = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/terminal/lobby) "dAZ" = ( /obj/structure/cable, /obj/machinery/power/solar_control{ @@ -11512,6 +11534,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/bridge) +"dCo" = ( +/obj/structure/stone_tile/slab, +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "dCv" = ( /obj/structure/sign/poster/random/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11557,6 +11586,12 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark, /area/station/science/genetics) +"dCX" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "dDg" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 1 @@ -11621,11 +11656,6 @@ /obj/structure/marker_beacon/burgundy, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) -"dEh" = ( -/obj/structure/sign/warning/electric_shock/directional/south, -/obj/machinery/vending/sustenance, -/turf/open/floor/iron/dark/textured_half, -/area/station/security/prison/upper) "dEo" = ( /obj/effect/turf_decal/caution/stand_clear/blue{ dir = 1 @@ -11745,6 +11775,10 @@ }, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/hallway) +"dFU" = ( +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "dFV" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -11783,22 +11817,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/station/science/ordnance/bomb) -"dGq" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness Room" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/tile/green{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/checker, -/area/station/common/wrestling/arena) "dGw" = ( /obj/structure/sign/poster/random/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11904,6 +11922,13 @@ /obj/effect/mapping_helpers/airlock/access/any/engineering/general, /turf/open/floor/plating, /area/station/maintenance/department/electrical) +"dIo" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/chem_heater/withbuffer, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/chemistry) "dIr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -11944,16 +11969,12 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"dJl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +"dJi" = ( +/obj/structure/stone_tile/surrounding/cracked{ + dir = 6 }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/effect/landmark/start/janitor, -/turf/open/floor/iron, -/area/station/service/janitor) +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "dJn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11972,16 +11993,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/command/cc_dock) -"dJB" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) "dJU" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/structure/flora/ocean/seaweed, @@ -12213,6 +12224,17 @@ dir = 1 }, /area/station/hallway/primary/aft) +"dNo" = ( +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/center/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "dNC" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 @@ -12230,14 +12252,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/aft) -"dNK" = ( -/obj/structure/sign/poster/random/directional/north, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "dNU" = ( /obj/machinery/light/warm/directional/south, /obj/effect/turf_decal/bot{ @@ -12250,11 +12264,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"dOc" = ( -/obj/structure/table/glass, -/obj/item/pillow/clown, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "dOf" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -12323,13 +12332,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/eva_shed) -"dQk" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/machinery/camera/autoname/directional/south, -/obj/structure/closet/emcloset, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron, -/area/station/terminal/lobby) "dQu" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/burgerstation/loot, @@ -12364,6 +12366,16 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"dRe" = ( +/obj/structure/chair/sofa/bench/tram/right{ + dir = 8 + }, +/obj/structure/transport/linear/tram, +/obj/structure/fluff/tram_rail/electric, +/obj/structure/thermoplastic/light, +/obj/machinery/computer/tram_controls/moonstation/directional/north, +/turf/open/floor/plating, +/area/station/terminal/lobby) "dRi" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -12710,6 +12722,22 @@ "dVI" = ( /turf/closed/wall/rust, /area/station/engineering/atmos/control_center) +"dVK" = ( +/obj/machinery/door/airlock/engineering{ + name = "Auxiliary Base Construction" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/autoname, +/turf/open/floor/iron, +/area/station/construction/mining/aux_base) "dVM" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/oven/range, @@ -12728,6 +12756,18 @@ "dWi" = ( /turf/closed/wall, /area/station/hallway/secondary/exit/departure_lounge) +"dWl" = ( +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/table, +/obj/item/stack/sheet/mineral/plasma{ + pixel_y = 10 + }, +/obj/item/toy/figure/chemist, +/turf/open/floor/iron/dark, +/area/station/medical/chemistry) "dWm" = ( /turf/open/floor/iron, /area/station/common/wrestling/arena) @@ -12756,6 +12796,13 @@ }, /turf/open/floor/plating/rust/moonstation, /area/station/cargo/miningelevators) +"dWY" = ( +/obj/structure/ladder, +/obj/effect/turf_decal/stripes/box, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "dXq" = ( /obj/structure/cable, /obj/effect/mapping_helpers/apc/full_charge, @@ -12774,15 +12821,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"dXw" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/main) "dXA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -13110,6 +13148,15 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"edh" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/tram/left) "eds" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark{ @@ -13190,6 +13237,12 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) +"eez" = ( +/obj/structure/fans/tiny/invisible, +/obj/structure/necropolis_gate, +/obj/structure/necropolis_arch, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "eeA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -13333,10 +13386,6 @@ /obj/machinery/requests_console/auto_name/directional/west, /turf/open/floor/iron/dark, /area/station/security/lockers) -"egD" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "egG" = ( /obj/structure/sign/warning/docking/directional/north, /obj/machinery/light/small/directional/north, @@ -13600,6 +13649,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/large, /area/station/hallway/primary/tram/left) +"ekz" = ( +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/atmos/storage/gas) "ekB" = ( /obj/structure/rack, /obj/effect/turf_decal/tile/yellow/half/contrasted, @@ -13707,6 +13764,26 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) +"elt" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/door/window/brigdoor/right/directional/east{ + req_access = list("armory"); + name = "Warden's Desk" + }, +/obj/machinery/door/window/left/directional/west{ + base_state = "right"; + name = "Warden's Desk" + }, +/obj/item/papercutter{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark, +/area/station/security/warden) "elE" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -13714,6 +13791,23 @@ /obj/structure/sign/warning/vacuum/external/directional/west, /turf/open/floor/plating, /area/station/maintenance/port) +"elF" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/engineering/storage/tcomms) "elI" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -13790,13 +13884,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"eml" = ( -/obj/structure/table, -/obj/item/storage/toolbox/emergency, -/obj/item/clipboard, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/cargo/miningdock) "emr" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 @@ -13937,15 +14024,6 @@ /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/white, /area/station/security/prison/mess) -"eoi" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/tram/left) "eov" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -14028,21 +14106,6 @@ /obj/item/wrench, /turf/open/floor/iron, /area/station/cargo/storage) -"epz" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/checker, -/area/station/hallway/primary/central/aft) "epH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -14098,6 +14161,23 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) +"eqB" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) +"eqH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/engineering/power_station) "eqL" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -14108,6 +14188,16 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"eqQ" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "eqR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /obj/machinery/meter, @@ -14265,6 +14355,20 @@ /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor, /area/station/engineering/asteroid_lobby) +"etb" = ( +/obj/machinery/fax{ + fax_name = "Law Office A"; + name = "Law Office A Fax Machine" + }, +/obj/structure/table/wood, +/obj/machinery/button/door/directional/west{ + id = "lawyer_shutters_a"; + name = "Privacy Shutters Control"; + req_access = list("lawyer") + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/wood, +/area/station/service/lawoffice) "etq" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/brown{ @@ -14449,6 +14553,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"ewA" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #1"; + name = "QM #1" + }, +/mob/living/simple_animal/bot/mulebot, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "ewF" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 8 @@ -14632,6 +14749,10 @@ /obj/effect/turf_decal/vg_decals/numbers/one, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"ezj" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "ezI" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/box/red, @@ -15171,6 +15292,34 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/catwalk_floor, /area/station/ai_monitored/turret_protected/aisat/service) +"eHM" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/double{ + dir = 1 + }, +/obj/item/pillow/random{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/pillow/random{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "dorms4"; + name = "Dorms Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/entertainment/plushie_delux, +/turf/open/floor/carpet/royalblack, +/area/station/commons/dorms/room4) "eHO" = ( /obj/structure/table/reinforced/rglass, /obj/item/radio/intercom/command, @@ -15279,11 +15428,6 @@ }, /turf/open/floor/engine, /area/station/engineering/gravity_generator) -"eIX" = ( -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/effect/turf_decal/loading_area, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hallway) "eJf" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15402,6 +15546,16 @@ "eKL" = ( /turf/closed/wall/r_wall/rust, /area/station/security/execution/education) +"eKO" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "eLe" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/flora/bush/fullgrass/style_random, @@ -15625,6 +15779,11 @@ /obj/structure/sign/warning/radiation/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"ePo" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/chair/sofa/corp/right, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "ePt" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 4 @@ -16207,6 +16366,14 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) +"eYP" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/firedoor/heavy, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "eYR" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 8 @@ -16406,6 +16573,16 @@ /obj/item/aicard, /turf/open/floor/iron/dark, /area/station/command/bridge) +"faW" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Fitness Room" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/dark/corner, +/area/station/common/wrestling/arena) "faZ" = ( /turf/closed/wall, /area/station/science/explab) @@ -16495,11 +16672,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"fcR" = ( -/obj/structure/sign/warning/electric_shock/directional/south, -/obj/machinery/recharge_station, -/turf/open/floor/iron/dark/textured_half, -/area/station/security/prison/upper) "fcS" = ( /obj/machinery/light/warm/directional/south, /obj/structure/closet/crate/wooden{ @@ -16596,10 +16768,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) -"fei" = ( -/obj/structure/chair/sofa/corp/right, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "fej" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -17014,6 +17182,18 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/catwalk_floor, /area/station/maintenance/aft) +"flw" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/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/engineering/storage) "flE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/marker_beacon/fuchsia, @@ -17057,6 +17237,9 @@ dir = 1 }, /area/station/commons/dorms) +"fmq" = ( +/turf/closed/mineral/random/labormineral/volcanic, +/area/lavaland/underground) "fmx" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, @@ -17094,27 +17277,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"fmQ" = ( -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Access" - }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/navigate_destination/minisat_access_ai, -/obj/effect/landmark/navigate_destination/aiupload{ - location = "AI Upload Access" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "fmT" = ( /obj/effect/turf_decal/trimline/white/end{ dir = 8 @@ -17148,15 +17310,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"fnv" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "chem_shutters"; - name = "Privacy Shutters" - }, -/turf/open/floor/plating, -/area/station/medical/chemistry) "fnE" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/airalarm/directional/north, @@ -17312,6 +17465,20 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/carpet/red, /area/station/security/courtroom) +"fqi" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/table, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/button/door{ + id = "xenobio3"; + layer = 3.3; + name = "Xenobio Pen 3 Blast Doors"; + pixel_y = 1; + req_access = list("xenobiology") + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/engine, +/area/station/science/xenobiology) "fqv" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/catwalk_floor, @@ -17350,6 +17517,18 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) +"fqJ" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Telecommunications" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "fqL" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/light/warm/directional/south, @@ -17522,20 +17701,6 @@ /obj/structure/rack, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"fsQ" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "rdoffice"; - name = "privacy shutters"; - pixel_y = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/item/computer_disk/ordnance, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "fsV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17841,6 +18006,15 @@ /obj/machinery/igniter/incinerator_ordmix, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"fxl" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "fxo" = ( /obj/docking_port/stationary/random{ dir = 4; @@ -17853,6 +18027,9 @@ "fxt" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/freezerchamber) +"fxz" = ( +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "fxD" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -17864,15 +18041,6 @@ /obj/item/plunger, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"fxF" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "pharm_desk_shutters"; - name = "Desk Shutters"; - dir = 8 - }, -/turf/open/floor/plating, -/area/station/medical/pharmacy) "fxH" = ( /obj/structure/rack, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -18209,6 +18377,15 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/station/engineering/asteroid_lobby) +"fBG" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/firealarm/directional/north, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "fBT" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -18443,6 +18620,18 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"fGr" = ( +/obj/machinery/button/door/directional/east{ + id = "rbmk2_shutters_west"; + name = "RB-MK2 Radiation Shutters Control"; + req_access = list("engineering") + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/space_heater{ + anchored = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/rbmk2/chamber) "fGt" = ( /turf/closed/wall, /area/station/service/chapel/storage) @@ -18459,31 +18648,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"fGN" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/beaker/large, -/obj/item/reagent_containers/cup/bottle/epinephrine{ - pixel_x = -4; - pixel_y = 12 - }, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 7; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "pharm_desk_shutters"; - name = "Desk Shutters Control" - }, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "fGO" = ( /obj/structure/chair/sofa/bench/right{ dir = 4 @@ -18633,20 +18797,6 @@ /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron/large, /area/station/command/cc_dock) -"fIN" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/button/door/directional/north{ - id = "robotics_shutters"; - name = "Desk Shutters Control" - }, -/obj/machinery/modular_computer/preset/civilian{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "fIZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -18750,6 +18900,10 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"fKx" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/central/fore) "fKI" = ( /obj/effect/spawner/random/burgerstation/odd, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -18881,6 +19035,17 @@ /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"fMg" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/center/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "fMh" = ( /obj/structure/table/glass, /obj/effect/mapping_helpers/broken_floor, @@ -18983,6 +19148,34 @@ /obj/effect/spawner/random/decoration/material, /turf/open/floor/catwalk_floor, /area/station/maintenance/pool_maintenance) +"fNF" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/double{ + dir = 1 + }, +/obj/item/pillow/random{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/pillow/random{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "dorms1"; + name = "Dorms Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/entertainment/plushie_delux, +/turf/open/floor/carpet/red, +/area/station/commons/dorms/room1) "fNG" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -19029,6 +19222,19 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/aft) +"fOe" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/turf/open/floor/plating, +/area/station/science/circuits) "fOn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19161,6 +19367,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"fQr" = ( +/obj/structure/stone_tile/block/cracked, +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "fQs" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Foyer" @@ -19211,6 +19424,23 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) +"fQQ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/tram/left) "fRc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -19287,6 +19517,17 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/abandon_cafeteria) +"fSC" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) "fSD" = ( /obj/structure/chair{ dir = 8 @@ -19453,6 +19694,10 @@ /obj/item/stack/sheet/iron/fifty, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"fVB" = ( +/obj/machinery/transport/destination_sign/indicator/moonstation, +/turf/closed/wall, +/area/station/hallway/primary/tram/left) "fVE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -19481,10 +19726,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) -"fWf" = ( -/obj/structure/cable/multilayer/multiz, -/turf/open/openspace, -/area/station/cargo/miningdock) "fWn" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/dark, @@ -19807,14 +20048,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"gbI" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/departments/telecomms/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "gbV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -20668,35 +20901,12 @@ /obj/effect/turf_decal/weather/snow, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) -"gpK" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/research/glass{ - name = "Circuitry Lab" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "gpR" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/science/genetics) -"gpU" = ( -/obj/structure/cable, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "gpW" = ( /obj/effect/spawner/costume/nightowl, /obj/structure/rack, @@ -20726,19 +20936,20 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/lab) -"gqo" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/effect/landmark/event_spawn, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "gqw" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 1 }, /turf/open/misc/moonstation_rock/cave, /area/moonstation/underground) +"gqx" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/burgerstation/loot, +/turf/open/floor/iron/dark, +/area/station/maintenance/port/aft) "gqE" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -20780,6 +20991,10 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/port) +"grp" = ( +/obj/structure/stone_tile/slab, +/turf/closed/indestructible/riveted/boss, +/area/ruin/unpowered/ash_walkers) "grs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20917,6 +21132,39 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating, /area/station/maintenance/port) +"guj" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/double{ + dir = 1 + }, +/obj/item/pillow/random{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/pillow/random{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/disk/nuclear/fake/obvious{ + name = "24TB of gay furry porn"; + pixel_x = 8; + pixel_y = -3 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "dorms2"; + name = "Dorms Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/entertainment/plushie_delux, +/turf/open/floor/carpet/purple, +/area/station/commons/dorms/room2) "gum" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21143,6 +21391,16 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit) +"gxb" = ( +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/block, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "gxW" = ( /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, @@ -21188,18 +21446,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"gyA" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security E.V.A. Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/security/eva) "gyE" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/turf_decal/weather/snow/corner{ @@ -21221,6 +21467,12 @@ "gyW" = ( /turf/closed/wall, /area/station/command/heads_quarters/hop) +"gzb" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "gzf" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -21230,11 +21482,6 @@ dir = 1 }, /area/station/hallway/primary/central/aft) -"gzh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "gzx" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -21529,22 +21776,6 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/central/aft) -"gDH" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/tram/left) "gDI" = ( /turf/closed/wall, /area/station/cargo/sorting) @@ -21578,18 +21809,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) -"gEG" = ( -/obj/structure/table, -/obj/item/stack/sheet/iron/fifty, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "chem_shutters"; - name = "Privacy Shutters Control" - }, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/chemistry) "gEL" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/structure/closet/secure_closet/atmospherics, @@ -21778,13 +21997,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/service/hydroponics) -"gHY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "gIq" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 5 @@ -21875,6 +22087,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) +"gKi" = ( +/obj/machinery/door/airlock/research{ + name = "Ordnance Lab" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, +/obj/machinery/door/firedoor/heavy, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/autoname, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "gKn" = ( /obj/structure/table/wood, /obj/effect/spawner/random/trash/janitor_supplies, @@ -21914,6 +22137,13 @@ /obj/effect/landmark/carpspawn, /turf/open/misc/moonstation_sand, /area/moonstation/surface) +"gKP" = ( +/obj/structure/sign/painting/library_private{ + pixel_y = -32 + }, +/obj/machinery/vending/wardrobe/curator_wardrobe, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "gKV" = ( /obj/machinery/light_switch/directional/east, /obj/machinery/smartfridge/organ, @@ -22088,6 +22318,10 @@ "gOz" = ( /turf/open/floor/engine, /area/station/engineering/main) +"gOA" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/engineering/supermatter/room) "gOE" = ( /obj/machinery/light/floor, /turf/open/floor/iron, @@ -22161,20 +22395,6 @@ /obj/structure/cable, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) -"gPP" = ( -/obj/machinery/light/warm/directional/south, -/obj/machinery/button/door/directional/south{ - id = "bar_kitchen_counter"; - name = "Bar-Kitchen Counter Shutters" - }, -/obj/machinery/vending/wardrobe/chef_wardrobe, -/obj/effect/turf_decal/tile/dark_red/opposingcorners{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "gPQ" = ( /obj/structure/closet/secure_closet/brig/genpop, /obj/item/card/id/advanced/prisoner/two, @@ -22264,6 +22484,19 @@ "gRG" = ( /turf/open/floor/catwalk_floor/iron_smooth, /area/station/terminal/interlink) +"gRK" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/command{ + pixel_y = 4 + }, +/obj/machinery/button/door{ + id = "meetingblast"; + name = "Meeting Room Lockdown Control"; + pixel_y = -3; + req_access = list("command") + }, +/turf/open/floor/carpet/executive, +/area/station/command/meeting_room) "gRN" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -22302,6 +22535,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) +"gSv" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center/cracked, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "gSw" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 4 @@ -22310,16 +22554,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/dark/corner, /area/station/common/pool) -"gSz" = ( -/obj/machinery/door/airlock/atmos/glass{ - name = "Atmospherics HFR Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron, -/area/station/engineering/atmos/hfr_room) "gSE" = ( /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, @@ -22393,6 +22627,15 @@ /obj/machinery/camera/autoname/science/directional/south, /turf/open/floor/iron/white, /area/station/science/genetics) +"gTx" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "gTz" = ( /obj/machinery/light/warm/directional/east, /obj/effect/turf_decal/stripes/line{ @@ -22505,6 +22748,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit) +"gVd" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/tram/left) "gVe" = ( /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/siding/wideplating_new/dark{ @@ -22577,11 +22829,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) -"gWg" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) "gWu" = ( /obj/structure/railing{ dir = 10 @@ -22627,6 +22874,18 @@ /obj/machinery/light/cold/no_nightlight/directional/north, /turf/open/floor/engine, /area/station/science/xenobiology) +"gXh" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/tram/left) "gXi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment, @@ -22670,6 +22929,10 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/secure_bunker) +"gXL" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "gXU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23073,6 +23336,17 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/starboard) +"heE" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/center/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "heO" = ( /obj/structure/table/wood, /obj/effect/spawner/random/decoration/ornament, @@ -23108,11 +23382,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/science/lab) -"hfr" = ( -/obj/machinery/newscaster/directional/west, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/cargo/miningdock) "hft" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -23443,16 +23712,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"hkb" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" - }, -/turf/open/floor/iron/dark, -/area/station/engineering/power_station) "hkd" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /obj/item/kirbyplants/random/fullysynthetic, @@ -23534,6 +23793,19 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) +"hkQ" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "hkT" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ dir = 4 @@ -23659,6 +23931,12 @@ /obj/structure/sign/warning/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) +"hno" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "hnt" = ( /obj/structure/cable, /obj/machinery/recharge_station, @@ -23783,20 +24061,6 @@ }, /turf/open/floor/iron, /area/station/service/service_room) -"hpe" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor{ - initial_gas_mix = "n2=100;TEMP=80" - }, -/area/station/tcommsat/computer) "hpf" = ( /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -23804,6 +24068,18 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"hpp" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/gravity_generator) "hpH" = ( /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, @@ -23903,6 +24179,10 @@ }, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) +"hqK" = ( +/obj/structure/stone_tile/block/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "hrc" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/siding/wood{ @@ -23910,13 +24190,6 @@ }, /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"hrj" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "hrv" = ( /obj/machinery/atmospherics/components/binary/pressure_valve/on{ target_pressure = 3000 @@ -24017,6 +24290,9 @@ /obj/structure/sign/warning/secure_area/directional/west, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"hsI" = ( +/turf/closed/indestructible/riveted/boss, +/area/ruin/unpowered/ash_walkers) "hsJ" = ( /obj/structure/sign/warning/docking/directional/east, /turf/open/misc/moonstation_sand, @@ -24084,6 +24360,17 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) +"htP" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/tram/left) "htR" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/red/line{ @@ -24124,9 +24411,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/security/prison/upper) -"huW" = ( -/turf/open/openspace, -/area/station/cargo/miningelevators) "hvb" = ( /obj/machinery/air_sensor/incinerator_tank{ pixel_y = -14 @@ -24507,6 +24791,15 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/recreation) +"hAz" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance" + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/service) "hAA" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -24745,6 +25038,18 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"hEi" = ( +/obj/machinery/door/window/left/directional/west{ + name = "Command Deliveries"; + req_access = list("command") + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/door/poddoor/preopen{ + id = "commandblast"; + name = "Command Lockdown Blast Door" + }, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "hEj" = ( /obj/effect/mapping_helpers/airlock/access/any/engineering/engie_guard, /obj/machinery/door/airlock/security{ @@ -24819,9 +25124,6 @@ dir = 1 }, /area/station/service/chapel) -"hEK" = ( -/turf/open/floor/iron/dark, -/area/station/service/janitor) "hEM" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 @@ -25110,6 +25412,14 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/science/cytology) +"hIA" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/departments/custodian/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/central/aft) "hIF" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/iron/dark, @@ -25127,6 +25437,22 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/aft) +"hIN" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Fitness Room" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/corner, +/area/station/common/wrestling/arena) "hIV" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -25182,38 +25508,9 @@ /obj/effect/landmark/start/chief_medical_officer, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"hJz" = ( -/obj/effect/turf_decal/siding/dark, -/obj/item/banner/command/mundane, -/obj/machinery/button/door/directional/north{ - id = "teleportershutters"; - name = "Teleporter Shutters Control"; - pixel_x = 8 - }, -/obj/machinery/button/door/directional/north{ - id = "gateshutter"; - name = "Gateway Shutters Control"; - pixel_x = -8 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central/fore) "hJF" = ( /turf/closed/wall/mineral/wood, /area/station/service/hydroponics) -"hJS" = ( -/obj/machinery/door/airlock/security{ - name = "Interrogation" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/security/interrogation) "hJT" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/incident_display/delam/directional/north, @@ -25248,6 +25545,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) +"hLj" = ( +/obj/structure/sign/departments/telecomms/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "hLu" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Foundry" @@ -25288,13 +25589,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, /area/station/construction) -"hLP" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "hLR" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -25356,17 +25650,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"hOl" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "hOs" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -25516,21 +25799,6 @@ /obj/structure/sign/warning/no_smoking/circle/directional/north, /turf/open/floor/iron/dark, /area/station/security/prison/safe) -"hQX" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Permabrig Visitation" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/security/prison/visit) "hRd" = ( /turf/open/floor/iron, /area/station/terminal/interlink) @@ -25838,6 +26106,22 @@ /obj/structure/ore_box, /turf/open/misc/moonstation_rock/cave, /area/moonstation/underground) +"hVQ" = ( +/obj/structure/table, +/obj/machinery/light/warm/directional/west, +/obj/item/stack/cable_coil, +/obj/item/stock_parts/cell/high, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/item/construction/plumbing/mining, +/obj/effect/mapping_helpers/requests_console/ore_update, +/obj/machinery/requests_console/auto_name/directional/west, +/obj/structure/lattice/catwalk, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "hVW" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -25856,15 +26140,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/heads_quarters/nt_rep) -"hWC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "hXe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26400,6 +26675,16 @@ }, /turf/open/floor/plating, /area/station/engineering/asteroid_lobby) +"ify" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "ifT" = ( /obj/item/target, /obj/structure/window/reinforced/spawner/directional/south, @@ -26600,18 +26885,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"ijy" = ( -/obj/machinery/door/airlock/security{ - name = "Evidence Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/landmark/navigate_destination/autoname, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/evidence) "ijE" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, @@ -26811,12 +27084,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/construction/mining/aux_base) -"imk" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "imm" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, @@ -26887,6 +27154,15 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/iron/dark, /area/station/engineering/gravity_generator) +"ioa" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/hallway) "iob" = ( /obj/structure/cable, /obj/machinery/power/smes, @@ -27144,6 +27420,11 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) +"itV" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "itY" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -27295,6 +27576,24 @@ /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, /area/station/maintenance/starboard) +"iwB" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/wood{ + id_tag = "dorms3"; + name = "Dorms 3" + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms/room3) +"iwJ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/main) "iwQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -27315,15 +27614,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"ixa" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/decoration/glowstick, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/aft) "ixd" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -27420,6 +27710,15 @@ "iyh" = ( /turf/open/floor/iron/white, /area/station/hallway/secondary/exit) +"iyl" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/underground) "iym" = ( /obj/structure/sign/warning/vacuum/external/directional/east, /obj/effect/spawner/random/burgerstation/atmos, @@ -27474,6 +27773,17 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/orange, /area/station/engineering/lobby) +"iAj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "iAl" = ( /obj/structure/marker_beacon/lime, /turf/open/floor/catwalk_floor/rust/moonstation, @@ -27624,6 +27934,14 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"iCv" = ( +/obj/machinery/light/warm/directional/west, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/effect/spawner/random/trash/mopbucket, +/turf/open/floor/iron, +/area/station/service/janitor) "iCx" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -27677,6 +27995,21 @@ dir = 1 }, /area/station/hallway/primary/central/fore) +"iDB" = ( +/obj/machinery/light/warm/directional/south, +/obj/machinery/button/door/directional/south{ + id = "bar_kitchen_counter"; + name = "Bar-Kitchen Counter Shutters"; + req_access = list("kitchen") + }, +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/effect/turf_decal/tile/dark_red/opposingcorners{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "iDE" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -27789,6 +28122,18 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) +"iEV" = ( +/obj/machinery/brm, +/obj/machinery/conveyor{ + id = "mining"; + dir = 4 + }, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/pod, +/area/station/cargo/miningfoundry/event_protected) "iEW" = ( /obj/structure/cable, /obj/effect/turf_decal/siding/dark, @@ -27983,10 +28328,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/security/prison/upper) -"iIp" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "iIt" = ( /obj/structure/sign/warning/radiation/directional/south, /obj/effect/turf_decal/stripes/line, @@ -28163,10 +28504,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"iLp" = ( -/obj/structure/cable, -/turf/open/floor/iron/dark/textured_half, -/area/station/security/prison/upper) "iLy" = ( /obj/structure/table/wood, /mob/living/carbon/human/species/monkey/punpun, @@ -28255,6 +28592,22 @@ "iNo" = ( /turf/open/floor/iron, /area/station/terminal/lobby) +"iNq" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "cargo_shutters"; + name = "Cargo Shutters Control"; + pixel_y = 2; + pixel_x = 8; + req_access = list("cargo") + }, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/pen/red, +/turf/open/floor/carpet, +/area/station/cargo/office) "iNy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -28326,12 +28679,6 @@ /mob/living/basic/sloth/paperwork, /turf/open/floor/iron, /area/station/cargo/storage) -"iOl" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/engineering/supermatter/room) "iOr" = ( /obj/machinery/button/door/directional/south{ id = "left_portal_shutter"; @@ -28634,38 +28981,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science/research) -"iSu" = ( -/obj/structure/bed/double{ - dir = 1 - }, -/obj/item/bedsheet/dorms_double{ - dir = 1 - }, -/obj/item/pillow/random{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/pillow/random{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/disk/nuclear/fake/obvious{ - name = "24TB of gay furry porn"; - pixel_x = 8; - pixel_y = -3 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "dorms2"; - name = "Dorms Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/carpet/purple, -/area/station/commons/dorms/room2) "iSG" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/sign/directions/science/directional/east{ @@ -28743,6 +29058,14 @@ dir = 1 }, /area/station/hallway/secondary/exit/departure_lounge) +"iTO" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Space Access Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) "iTR" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -29032,17 +29355,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/service/salon) -"iXk" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/wood{ - id_tag = "dorms3"; - name = "Dorms 3" - }, -/turf/open/floor/wood, -/area/station/commons/dorms/room3) "iXp" = ( /obj/structure/sign/poster/random/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29185,6 +29497,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/visible/layer1, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"iYH" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 1 + }, +/obj/structure/stone_tile/burnt{ + dir = 8 + }, +/obj/structure/stone_tile/burnt, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "iYY" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/item/radio/intercom/directional/north, @@ -29240,6 +29562,15 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/atmos/asteroid) +"iZv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/structure/table/wood, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/wood/parquet, +/area/station/security/brig/entrance) "iZA" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -29553,6 +29884,15 @@ /obj/item/clothing/accessory/anti_sec_pin, /turf/open/floor/plating, /area/station/maintenance/abandon_office) +"jeB" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "jeL" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -29734,6 +30074,11 @@ /obj/machinery/recharge_station, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) +"jhI" = ( +/obj/structure/transport/linear/tram, +/obj/structure/tram/alt/titanium, +/turf/open/floor/plating, +/area/station/terminal/lobby) "jhJ" = ( /obj/structure/dresser, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -29779,6 +30124,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/wood, /area/station/medical/psychology) +"jik" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "jil" = ( /obj/structure/table, /obj/item/paper_bin, @@ -29892,13 +30246,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/prison) -"jjv" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/station/engineering/hallway) "jjz" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -30204,15 +30551,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/terminal/cryo) -"jnv" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/primary/tram/left) "jnD" = ( /obj/structure/railing{ dir = 8 @@ -30356,20 +30694,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"jpf" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/table, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/button/door{ - id = "xenobio3"; - layer = 3.3; - name = "Xenobio Pen 3 Blast Doors"; - pixel_y = 4; - req_access = list("xenobiology") - }, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/engine, -/area/station/science/xenobiology) "jph" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -30440,13 +30764,6 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/plating, /area/station/engineering/supermatter/waste) -"jqj" = ( -/obj/structure/cable, -/obj/structure/sign/warning/cold_temp/directional/south, -/obj/structure/sign/warning/gas_mask/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "jqm" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30470,15 +30787,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/aft) -"jqs" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "jqv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30558,6 +30866,21 @@ /obj/structure/closet/l3closet/security, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) +"jrX" = ( +/obj/structure/table, +/obj/machinery/button/door{ + id = "rdoffice"; + name = "privacy shutters"; + pixel_y = 5; + req_access = list("rd") + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/item/computer_disk/ordnance, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "jsG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30799,23 +31122,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/catwalk_floor, /area/station/engineering/atmos/asteroid) -"jxl" = ( -/obj/structure/table/glass, -/obj/machinery/fax{ - fax_name = "Chief Medical Officer's Office"; - name = "Chief Medical Officer's Fax Machine" - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/keycard_auth/directional/north, -/obj/machinery/button/door/directional/north{ - id = "cmo_officer_shutters"; - name = "Privacy Shutters Control"; - pixel_y = 34 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "jxn" = ( /obj/machinery/light/warm/directional/east, /obj/structure/chair/sofa/bench/left{ @@ -30999,6 +31305,22 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) +"jAB" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/jani_wardrobe, +/obj/machinery/button/door/directional/north{ + id = "custodialshutters"; + name = "Parking Garage Shutters Control"; + pixel_x = -8; + req_access = list("janitor") + }, +/turf/open/floor/iron, +/area/station/service/janitor) "jAO" = ( /turf/open/floor/glass/reinforced, /area/station/cargo/storage) @@ -31236,11 +31558,6 @@ }, /turf/open/floor/iron, /area/station/engineering/break_room) -"jGc" = ( -/obj/machinery/light/warm/directional/north, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/showroomfloor, -/area/station/commons/toilet/locker) "jGd" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/wood/tile, @@ -31522,15 +31839,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"jKl" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "jKA" = ( /turf/closed/wall/r_wall, /area/station/security/detectives_office) -"jKF" = ( -/obj/structure/transport/linear/tram, -/obj/machinery/transport/tram_controller, -/obj/structure/tram/alt/titanium, -/turf/open/floor/plating, -/area/station/terminal/lobby) "jKJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -31581,6 +31899,12 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/carpet/red, /area/station/service/lawoffice) +"jLC" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/decoration/glowstick, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "jLN" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 @@ -31637,6 +31961,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"jMl" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/station/service/janitor) "jMm" = ( /obj/structure/plasticflaps, /obj/machinery/navbeacon{ @@ -31767,6 +32095,19 @@ }, /turf/open/floor/engine, /area/station/engineering/rbmk2) +"jNO" = ( +/obj/structure/displaycase/curator, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/library/private) +"jNR" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "jNS" = ( /obj/effect/turf_decal/weather/snow, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -31789,20 +32130,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) -"jOe" = ( -/obj/structure/table, -/obj/machinery/light/warm/directional/west, -/obj/item/stack/cable_coil, -/obj/item/stock_parts/cell/high, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/item/construction/plumbing/mining, -/obj/effect/mapping_helpers/requests_console/ore_update, -/obj/machinery/requests_console/auto_name/directional/west, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/cargo/miningdock) "jOj" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -31861,18 +32188,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/department/prison) -"jPm" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/engineering/storage/tcomms) "jPr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32229,11 +32544,17 @@ }, /turf/open/floor/iron, /area/station/engineering/asteroid_lobby) -"jUP" = ( -/obj/machinery/light/small/directional/west, -/obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/library/private) +"jUH" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center/cracked, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "jUW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -32354,12 +32675,6 @@ /obj/effect/turf_decal/tile/red/diagonal_centre, /turf/open/floor/iron/dark, /area/station/security/prison) -"jWy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "jWC" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 9 @@ -32515,6 +32830,31 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/common/wrestling/arena) +"jZr" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) +"jZx" = ( +/mob/living/simple_animal/bot/mulebot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #2"; + name = "QM #2" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/cargo/storage) "jZA" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/camera/autoname/directional/north{ @@ -32522,18 +32862,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/asteroid_lobby) -"jZC" = ( -/obj/structure/table/wood/fancy/blue, -/obj/effect/spawner/random/aimodule/harmless, -/obj/machinery/door/window{ - base_state = "right"; - dir = 4; - icon_state = "right"; - name = "Core Modules"; - req_access = list("captain") - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) "jZJ" = ( /obj/effect/mapping_helpers/airlock/access/all/command/captain, /obj/machinery/door/airlock/captain{ @@ -32580,18 +32908,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) -"kaF" = ( -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Law Office B"; - name = "Law Office B Fax Machine" - }, -/obj/machinery/button/door/directional/east{ - id = "lawyer_shutters_b"; - name = "Privacy Shutters Control" - }, -/turf/open/floor/carpet/blue, -/area/station/service/lawoffice) "kaI" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -32905,31 +33221,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"khz" = ( -/obj/machinery/door/window/left/directional/west{ - name = "Command Deliveries"; - req_access = list("command") - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/poddoor/preopen{ - id = "commandblast"; - name = "Command Lockdown Blast Door" - }, -/turf/open/floor/engine, -/area/station/command/bridge) "khL" = ( /obj/structure/weightmachine/weightlifter, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/common/pool) -"khR" = ( -/obj/structure/cable, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "khS" = ( /obj/effect/turf_decal/siding/dark{ dir = 10 @@ -32942,12 +33238,11 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/station/engineering/rbmk2/chamber) -"kii" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, +"kif" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/decoration/glowstick, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, /area/station/maintenance/port/aft) "kij" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -33273,6 +33568,18 @@ /obj/machinery/air_sensor/ordnance_freezer_chamber, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/freezerchamber) +"kmn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/primary/tram/left) "kmr" = ( /obj/structure/sign/warning/gas_mask/directional/east, /turf/open/floor/catwalk_floor, @@ -33390,6 +33697,11 @@ }, /turf/closed/wall/r_wall/rust, /area/station/science/ordnance/bomb) +"koi" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/vending/coffee, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "koj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -33437,6 +33749,15 @@ /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"koW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/maintenance/glass, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port) "kpb" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/o2{ @@ -33699,10 +34020,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/gag_room) -"ktE" = ( -/obj/machinery/vending/wardrobe/cargo_wardrobe, -/turf/open/floor/iron, -/area/station/cargo/storage) "ktG" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -33922,6 +34239,13 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) +"kxC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "kxF" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 8 @@ -34114,6 +34438,12 @@ /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"kzS" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "kzW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34254,6 +34584,15 @@ /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, /area/station/maintenance/starboard) +"kCl" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "kCq" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -34414,6 +34753,21 @@ /obj/structure/chair/stool/bar/directional/north, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"kEo" = ( +/obj/machinery/button/door/directional/north{ + id = "cafe_counter"; + name = "Kitchen Counter Shutters"; + req_access = list("kitchen") + }, +/obj/effect/turf_decal/tile/dark_red/opposingcorners{ + dir = 8 + }, +/obj/machinery/vending/dinnerware, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "kEr" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34518,14 +34872,6 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) -"kGG" = ( -/obj/structure/sign/departments/custodian/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/central/aft) "kGJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34767,21 +35113,6 @@ /obj/structure/kitchenspike, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"kLh" = ( -/obj/structure/table, -/obj/machinery/button/door{ - id = "cargo_shutters"; - name = "Cargo Shutters Control"; - pixel_y = 2; - pixel_x = 8 - }, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/pen/red, -/turf/open/floor/carpet, -/area/station/cargo/office) "kLr" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -34903,12 +35234,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) -"kNj" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "kNn" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/syndicate/general, @@ -35008,20 +35333,13 @@ /obj/machinery/light/no_nightlight/directional/north, /turf/open/floor/engine, /area/station/science/auxlab) -"kOr" = ( -/obj/structure/table/reinforced, -/obj/machinery/fax{ - fax_name = "Chief Engineer's Office"; - name = "Chief Engineer's Fax Machine" - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/button/door/directional/west{ - id = "ce_officer_shutters"; - name = "Privacy Shutters Control" - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, -/area/station/command/heads_quarters/ce) +"kOq" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/power_station) "kOs" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/cable, @@ -35065,6 +35383,13 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/port) +"kPK" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "kPM" = ( /obj/structure/rack, /obj/effect/spawner/costume/highlander, @@ -35212,6 +35537,12 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"kRC" = ( +/obj/machinery/transport/power_rectifier{ + pixel_y = 0 + }, +/turf/closed/wall/r_wall, +/area/station/terminal/lobby) "kRG" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 8 @@ -35237,6 +35568,19 @@ /obj/machinery/smartfridge/food, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"kRN" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "kSm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ @@ -35288,6 +35632,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"kSZ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "kTf" = ( /obj/effect/turf_decal/trimline/white/line, /obj/effect/turf_decal/trimline/dark/filled/warning{ @@ -35297,6 +35650,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/workout) +"kTl" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/storage) "kTm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/effect/turf_decal/siding/blue{ @@ -35307,6 +35667,10 @@ }, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) +"kTt" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "kTu" = ( /obj/structure/table/wood, /obj/structure/towel_bin, @@ -35371,6 +35735,11 @@ }, /turf/open/floor/iron, /area/station/service/janitor) +"kUw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "kUC" = ( /turf/closed/mineral/lunar, /area/moonstation/surface) @@ -35423,6 +35792,17 @@ /obj/machinery/holopad, /turf/open/floor/iron/vaporwave, /area/station/service/salon) +"kVm" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/tram/left) "kVn" = ( /obj/structure/transit_tube/crossing, /turf/open/floor/plating, @@ -35438,13 +35818,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/prison/upper) -"kVv" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "kVw" = ( /obj/structure/training_machine, /obj/item/target/clown, @@ -35462,6 +35835,18 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"kVF" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/wood{ + id_tag = "dorms2"; + name = "Dorms 2" + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms/room2) "kVM" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 @@ -35739,17 +36124,6 @@ }, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"kZD" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, -/obj/item/stack/sheet/mineral/plasma{ - pixel_y = 10 - }, -/obj/item/toy/figure/chemist, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/chemistry) "kZE" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -35855,10 +36229,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/common/wrestling/arena) -"lbl" = ( -/obj/structure/cable/multilayer/multiz, -/turf/open/openspace, -/area/station/cargo/miningelevators) "lbr" = ( /turf/closed/wall/mineral/wood, /area/station/service/service_room) @@ -35869,16 +36239,24 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"lby" = ( -/obj/structure/chair/sofa/bench/tram/right{ - dir = 8 +"lbw" = ( +/obj/structure/table/glass, +/obj/machinery/fax{ + fax_name = "Chief Medical Officer's Office"; + name = "Chief Medical Officer's Fax Machine" }, -/obj/structure/transport/linear/tram, -/obj/structure/fluff/tram_rail/electric, -/obj/machinery/computer/tram_controls/directional/north, -/obj/structure/thermoplastic/light, -/turf/open/floor/plating, -/area/station/terminal/lobby) +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/keycard_auth/directional/north, +/obj/machinery/button/door/directional/north{ + id = "cmo_officer_shutters"; + name = "Privacy Shutters Control"; + pixel_y = 34; + req_access = list("cmo") + }, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "lbH" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -36047,17 +36425,15 @@ /obj/effect/turf_decal/stripes/red/line, /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/aisat_interior) -"lev" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" +"leq" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron, -/area/station/engineering/power_station) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/hallway) "leC" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -36149,6 +36525,13 @@ /obj/item/folder/blue, /turf/open/floor/wood, /area/station/command/meeting_room) +"lge" = ( +/obj/machinery/vending/wardrobe/cargo_wardrobe, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/cargo/storage) "lgh" = ( /obj/machinery/door/window/elevator/right/directional/north{ elevator_mode = 1; @@ -36308,19 +36691,6 @@ }, /turf/open/floor/carpet, /area/station/service/library) -"lhT" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Space Access Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/teleporter) "lik" = ( /turf/closed/wall/rust, /area/station/service/hydroponics/garden) @@ -36336,6 +36706,13 @@ }, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"liv" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/carpet/red, +/area/station/commons/dorms/room1) "lix" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -36354,6 +36731,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison/shower) +"liK" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "liU" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/chair/pew/left, @@ -36489,6 +36873,12 @@ /obj/effect/turf_decal/vg_decals/numbers/one, /turf/open/floor/iron/dark, /area/station/security/lockers) +"lkP" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "lkU" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /mob/living/simple_animal/bot/firebot, @@ -36748,16 +37138,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/carpet/red, /area/station/commons/lounge) -"lpd" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Space Access Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/service) "lpj" = ( /obj/structure/table/reinforced, /obj/machinery/computer/records/medical/laptop, @@ -36809,16 +37189,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/bridge) -"lpK" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Fitness Room" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/checker, -/area/station/common/wrestling/arena) "lpN" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -36827,13 +37197,6 @@ dir = 1 }, /area/station/hallway/primary/aft) -"lpR" = ( -/obj/structure/sign/departments/telecomms/directional/west, -/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, -/area/station/engineering/storage) "lpS" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 4 @@ -37024,13 +37387,6 @@ /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) -"lsz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/table/wood, -/turf/open/floor/wood/parquet, -/area/station/hallway/primary/central/fore) "lsK" = ( /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, @@ -37076,14 +37432,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) -"lts" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/maintenance/port) "ltw" = ( /obj/effect/turf_decal/trimline/yellow/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37117,6 +37465,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) +"lub" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "lui" = ( /turf/closed/wall/r_wall, /area/station/science/xenobiology) @@ -37157,6 +37514,22 @@ /obj/item/dog_bone, /turf/open/floor/carpet/purple, /area/station/command/heads_quarters/hop) +"luF" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Permabrig Visitation" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/prison/visit) "luK" = ( /obj/structure/table/reinforced/rglass, /obj/item/hairbrush, @@ -37243,12 +37616,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"lvr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "lvs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -37273,23 +37640,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/engineering/supermatter/room) -"lvK" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - id = "robotics_science_privacy"; - name = "Privacy Shutters Control"; - pixel_y = -8 - }, -/obj/machinery/vending/wardrobe/robo_wardrobe, -/obj/machinery/light/warm/directional/east, -/obj/machinery/camera/autoname/science/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/robotics/lab) "lwo" = ( /obj/effect/turf_decal/trimline/yellow/corner{ dir = 4 @@ -37334,6 +37684,11 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"lxe" = ( +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark, +/area/station/service/janitor) "lxk" = ( /obj/structure/table, /obj/effect/spawner/random/engineering/tool, @@ -37365,13 +37720,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"lxy" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/purple, -/area/station/commons/dorms/room2) "lxE" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -37762,6 +38110,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"lCP" = ( +/obj/machinery/button/transport/tram/directional/south{ + id = 2; + specific_transport_id = "moon_1" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/tram/left) "lCS" = ( /obj/structure/table/reinforced/plasmarglass, /obj/effect/spawner/random/food_or_drink/booze, @@ -37907,6 +38267,13 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) +"lFb" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/tram/left) "lFd" = ( /obj/item/radio/intercom/directional/north, /obj/effect/spawner/random/trash/moisture_trap, @@ -38146,6 +38513,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/office) +"lIg" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningelevators) "lIx" = ( /obj/effect/turf_decal/tile/brown/fourcorners, /obj/effect/turf_decal/siding/dark{ @@ -38185,10 +38558,6 @@ /obj/structure/sign/warning/no_smoking/circle/directional/east, /turf/open/floor/pod, /area/station/cargo/miningfoundry/event_protected) -"lJc" = ( -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/power_station) "lJe" = ( /obj/machinery/light/warm/directional/north, /obj/structure/cable, @@ -38325,6 +38694,16 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"lKH" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/underground) "lKO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38553,6 +38932,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) +"lOw" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate_loot, +/obj/machinery/button/door/directional/south{ + id = "qm_warehouse"; + name = "Warehouse Shutters Control"; + pixel_x = 8; + req_access = list("shipping") + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "lOE" = ( /obj/machinery/atmospherics/components/binary/tank_compressor{ dir = 4 @@ -38606,6 +38997,10 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/station/engineering/rbmk2/chamber) +"lPG" = ( +/obj/effect/spawner/random/burgerstation/liquid, +/turf/open/floor/plating, +/area/station/maintenance/department/medical) "lPM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38841,6 +39236,11 @@ /obj/machinery/recharge_station, /turf/open/floor/iron, /area/station/cargo/storage) +"lST" = ( +/obj/structure/fluff/drake_statue/falling, +/obj/structure/stone_tile/slab, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "lTa" = ( /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/junction/yjunction{ @@ -38893,6 +39293,17 @@ }, /turf/open/floor/engine, /area/station/construction) +"lUw" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/station/service/lawoffice) "lUL" = ( /turf/open/floor/plating/rust/moonstation/cave, /area/moonstation/underground) @@ -39449,16 +39860,6 @@ }, /turf/open/floor/iron/vaporwave, /area/station/service/salon) -"mcT" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/autoname/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "mcV" = ( /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, @@ -39475,6 +39876,18 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"mdr" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "mdC" = ( /obj/machinery/door/window/right/directional/west{ name = "Jim Norton's Quebecois Coffee" @@ -39602,6 +40015,9 @@ }, /turf/open/floor/mineral/titanium, /area/station/command/gateway) +"mfi" = ( +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "mfw" = ( /obj/structure/railing, /obj/effect/spawner/random/trash/moisture_trap, @@ -39715,6 +40131,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/fore) +"miu" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/obj/structure/stone_tile/burnt, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "miE" = ( /obj/machinery/computer/rdservercontrol{ dir = 4 @@ -39748,6 +40171,10 @@ }, /turf/open/floor/plating, /area/station/common/night_club) +"miS" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/power_station) "miX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -39910,6 +40337,19 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"mkV" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Space Access Airlock" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/teleporter) "mlb" = ( /obj/machinery/computer/atmos_control/mix_tank{ dir = 1; @@ -39938,18 +40378,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"mlr" = ( -/obj/machinery/transport/destination_sign/indicator/directional/south, -/obj/machinery/button/transport/tram/directional/south{ - id = 3 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/tram/left) "mlC" = ( /obj/structure/transit_tube/diagonal/crossing/topleft, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -39960,22 +40388,6 @@ }, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) -"mlH" = ( -/obj/machinery/button/door/directional/north{ - id = "visitation"; - name = "Visitation Shutters"; - req_access = list("brig") - }, -/obj/machinery/holopad, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/flasher{ - id = "visitation_flash"; - pixel_y = 38; - name = "Visitation Flasher" - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/visit) "mlL" = ( /obj/effect/turf_decal/tile/dark_green/anticorner/contrasted, /obj/effect/turf_decal/siding/dark, @@ -40021,16 +40433,9 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/break_room) -"mms" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/computer/atmos_control/plasma_tank{ - dir = 8; - atmos_chambers = list("security_plasma" = "Educational Plasma Supply") - }, -/turf/open/floor/iron/dark, -/area/moonstation/surface) +"mmw" = ( +/turf/open/misc/asteroid/basalt/lava_land_surface/no_ruins, +/area/lavaland/underground) "mmQ" = ( /turf/closed/wall, /area/station/medical/surgery) @@ -40072,6 +40477,10 @@ dir = 1 }, /area/station/common/pool) +"mna" = ( +/obj/structure/fluff/drake_statue/falling, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "mni" = ( /obj/structure/table/wood, /obj/item/papercutter, @@ -40200,6 +40609,15 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/station/commons/lounge) +"mpE" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "mpP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -40470,6 +40888,14 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/central/fore) +"muq" = ( +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "muH" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -40647,6 +41073,34 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/engine) +"mxj" = ( +/obj/structure/bed/double{ + dir = 1 + }, +/obj/effect/spawner/random/bedsheet/double{ + dir = 1 + }, +/obj/item/pillow/random{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/pillow/random{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/effect/landmark/start/hangover, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "dorms3"; + name = "Dorms Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/obj/effect/spawner/random/entertainment/plushie_delux, +/turf/open/floor/carpet/blue, +/area/station/commons/dorms/room3) "mxx" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40764,6 +41218,14 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"mzl" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/iron/cafeteria, +/area/station/hallway/primary/central/fore) "mzq" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -41423,6 +41885,10 @@ /obj/machinery/plumbing/floor_pump/output/on/supply/directional/east, /turf/open/floor/iron/pool, /area/station/common/pool/sauna) +"mKM" = ( +/obj/structure/stone_tile/slab/burnt, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "mKP" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41480,14 +41946,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"mLV" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/item/kirbyplants/random, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood/parquet, -/area/station/security/brig/entrance) "mLX" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -41789,24 +42247,6 @@ /obj/effect/mapping_helpers/requests_console/supplies, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"mQt" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/structure/table, -/obj/effect/spawner/random/engineering/flashlight, -/obj/item/binoculars, -/obj/item/book/manual/wiki/security_space_law, -/obj/machinery/button/flasher{ - id = "isolation_flasher"; - pixel_y = 23; - pixel_x = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/corrections_officer) "mQu" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 @@ -41814,6 +42254,9 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) +"mQv" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/tram/left) "mQJ" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -41990,22 +42433,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/warden) -"mSH" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #1"; - name = "QM #1" - }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #1"; - suffix = "#1" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "mSM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -42165,6 +42592,12 @@ }, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) +"mVb" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "mVi" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -42190,15 +42623,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison/shower) -"mVE" = ( -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/primary/tram/left) "mVM" = ( /obj/structure/table/wood, /obj/item/storage/backpack/meat, @@ -42316,12 +42740,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/mineral/gold, /area/station/command/heads_quarters/qm) -"mWO" = ( -/obj/structure/transport/linear/tram, -/obj/structure/tram/alt/titanium, -/obj/machinery/transport/destination_sign/split/south, -/turf/open/floor/plating, -/area/station/terminal/lobby) "mWT" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -42349,6 +42767,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft) +"mXb" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/ai_module/reset/purge, +/obj/machinery/door/window/brigdoor/left/directional/west{ + name = "High-Risk Modules"; + req_access = list("captain") + }, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/ai_upload) "mXp" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2, /turf/open/floor/catwalk_floor, @@ -42444,6 +42871,21 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/aft) +"mZa" = ( +/obj/structure/table/reinforced, +/obj/machinery/fax{ + fax_name = "Chief Engineer's Office"; + name = "Chief Engineer's Fax Machine" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/button/door/directional/west{ + id = "ce_officer_shutters"; + name = "Privacy Shutters Control"; + req_access = list("ce") + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron, +/area/station/command/heads_quarters/ce) "mZd" = ( /turf/closed/wall, /area/station/maintenance/abandon_holding_cell) @@ -42480,6 +42922,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/meeting_room) +"mZF" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/carpet/purple, +/area/station/commons/dorms/room2) "mZP" = ( /obj/structure/table, /obj/item/paint/paint_remover, @@ -42576,6 +43025,26 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"nby" = ( +/obj/structure/cable, +/obj/structure/rack, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/suit/hooded/wintercoat/engineering, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "nbz" = ( /obj/machinery/suit_storage_unit/hos, /obj/machinery/airalarm/directional/north, @@ -42747,12 +43216,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/maintenance/port) -"ndO" = ( -/obj/structure/transport/linear/tram, -/obj/structure/tram/alt/titanium, -/obj/structure/plaque/static_plaque/tram, -/turf/open/floor/plating, -/area/station/terminal/lobby) "ndQ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -42843,6 +43306,16 @@ "nfc" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/maint) +"nff" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/computer/atmos_control/plasma_tank{ + dir = 8; + atmos_chambers = list("security_plasma" = "Educational Plasma Supply") + }, +/turf/open/floor/iron/dark, +/area/station/security/execution/education) "nfk" = ( /turf/open/floor/iron/stairs/old, /area/station/command/gateway) @@ -42904,6 +43377,15 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/central/fore) +"nfU" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "nfX" = ( /obj/structure/cable, /obj/effect/spawner/random/maintenance, @@ -42932,6 +43414,15 @@ /obj/structure/sign/warning/fire/directional/east, /turf/open/floor/engine, /area/station/engineering/rbmk2) +"ngE" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 4 + }, +/obj/structure/stone_tile/burnt{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "ngF" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -43378,6 +43869,17 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/locker_room) +"noV" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/open/floor/plating, +/area/station/command/bridge) "noW" = ( /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, @@ -43458,13 +43960,6 @@ initial_gas_mix = "n2=100;TEMP=293.15" }, /area/station/maintenance/gag_room) -"nqh" = ( -/obj/machinery/holopad, -/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, -/area/station/engineering/main) "nqp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -43542,6 +44037,17 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics) +"nrk" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, +/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, +/turf/open/floor/plating, +/area/station/commons/vacant_room/office) "nro" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage" @@ -43554,20 +44060,6 @@ "nrr" = ( /turf/open/floor/wood/parquet, /area/station/commons/lounge) -"nru" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 8 - }, -/obj/effect/turf_decal/siding/wood, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/common/pool) "nrA" = ( /obj/machinery/computer/monitor, /obj/effect/turf_decal/tile/dark_blue/fourcorners, @@ -43624,6 +44116,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/brig) +"nsm" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/modular_computer/preset/cargochat/science, +/obj/machinery/button/door/directional/north{ + id = "research_shutters"; + name = "Desk Shutters Control"; + req_access = list("research") + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "nso" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable, @@ -43787,6 +44291,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"nvk" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "nvl" = ( /obj/effect/mapping_helpers/airlock/autoname, /obj/machinery/door/airlock/hatch{ @@ -43933,18 +44443,6 @@ /obj/machinery/light/warm/directional/west, /turf/open/floor/iron/edge, /area/station/hallway/primary/tram/left) -"nxq" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass{ - name = "Telecommunications" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "nxF" = ( /obj/structure/altar_of_gods, /obj/item/book/bible, @@ -44179,6 +44677,16 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/hallway) +"nBt" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "nBv" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/trash/graffiti, @@ -44397,6 +44905,13 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/carpet/red, /area/station/commons/lounge) +"nFG" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/carpet/blue, +/area/station/commons/dorms/room3) "nFM" = ( /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/white, @@ -44502,6 +45017,21 @@ /obj/machinery/holopad, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"nHr" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 9 + }, +/obj/machinery/computer/security, +/obj/structure/cable, +/obj/machinery/button/door/directional/west{ + id = "sec_check_shutters"; + name = "Security Checkpoint Shutters"; + pixel_y = -10; + req_access = list("brig_entrance") + }, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint) "nHA" = ( /obj/structure/filingcabinet/employment, /obj/effect/turf_decal/siding/dark, @@ -44553,6 +45083,18 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +"nIV" = ( +/obj/item/flashlight/lantern/heirloom_moth{ + start_on = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) +"nJi" = ( +/obj/structure/stairs/stone{ + color = "#725947" + }, +/turf/open/indestructible/boss, +/area/ruin/unpowered/ash_walkers) "nJl" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Tech Storage" @@ -44800,6 +45342,16 @@ /obj/effect/mapping_helpers/requests_console/ore_update, /turf/open/floor/iron/white, /area/station/medical/virology) +"nNi" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "nNl" = ( /obj/effect/turf_decal/bot, /turf/open/floor/iron/recharge_floor, @@ -45061,6 +45613,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"nRp" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/corner, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "nRt" = ( /obj/item/wrench, /obj/structure/cable, @@ -45128,11 +45687,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/medical/virology) -"nSj" = ( -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/spawner/random/vending/colavend, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "nSp" = ( /obj/machinery/vending/dorms, /obj/item/radio/intercom/directional/west, @@ -45165,15 +45719,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/cargo/blacksmith) -"nSz" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/effect/turf_decal/trimline/yellow/filled/warning, -/obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "nSC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /turf/open/floor/catwalk_floor{ @@ -45220,6 +45765,24 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"nUi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "robotics_science_privacy"; + name = "Privacy Shutters Control"; + pixel_y = -8; + req_access = list("robotics") + }, +/obj/machinery/vending/wardrobe/robo_wardrobe, +/obj/machinery/light/warm/directional/east, +/obj/machinery/camera/autoname/science/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/robotics/lab) "nUk" = ( /obj/machinery/door/poddoor/shutters/preopen{ id = "AI Core shutters"; @@ -45271,6 +45834,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/cc_dock) +"nVK" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "nVN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/opposingcorners{ @@ -45599,6 +46175,16 @@ /obj/effect/turf_decal/tile/dark, /turf/open/floor/iron, /area/station/security/prison/upper) +"oaO" = ( +/obj/structure/railing{ + dir = 9 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood, +/area/station/commons/lounge) "oaU" = ( /obj/effect/turf_decal/siding/dark/end{ dir = 8 @@ -45629,6 +46215,19 @@ /obj/machinery/camera/autoname/security/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/range) +"obh" = ( +/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "MiniSat Maintenance"; + id_tag = "ai_sat_maint_right" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/obj/machinery/door/firedoor, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "obs" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning{ dir = 4 @@ -45663,6 +46262,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) +"obA" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "obL" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -45723,16 +46328,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"ocp" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/engineering/main) +"ocq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/turf/open/floor/wood/parquet, +/area/station/hallway/primary/central/fore) "ocr" = ( /obj/structure/sign/warning/radiation/rad_area/directional/north, /turf/open/floor/catwalk_floor/rust/moonstation, @@ -45751,15 +46353,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/station/engineering/hallway) -"ocG" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Customs" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/machinery/door/firedoor, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/arrivals) "ocI" = ( /obj/effect/spawner/random/decoration/glowstick, /obj/structure/cable, @@ -45910,13 +46503,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/abandon_office) -"oeO" = ( -/obj/structure/cable, -/obj/machinery/firealarm/directional/east, -/obj/item/kirbyplants/random, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "oeP" = ( /obj/structure/disposalpipe/junction/flip{ dir = 4 @@ -46074,9 +46660,29 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/station/command/bridge) +"ogT" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "ai_sat_maint_left"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Door Bolt Control"; + req_access = list("minisat") + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "ogU" = ( /turf/closed/wall/r_wall/rust, /area/station/cargo/miningelevators) +"ogZ" = ( +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/center/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "ohc" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners{ dir = 8 @@ -46173,6 +46779,15 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"oiP" = ( +/obj/machinery/door/airlock/external{ + name = "Solar Maintenance" + }, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) "ojb" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners{ dir = 8 @@ -46233,10 +46848,6 @@ }, /turf/open/floor/carpet/blue, /area/station/security/courtroom) -"ojS" = ( -/obj/structure/marker_beacon/fuchsia, -/turf/open/floor/catwalk_floor/rust/moonstation, -/area/moonstation/underground) "ojU" = ( /obj/structure/sign/warning/fire/directional/north, /obj/structure/marker_beacon/bronze, @@ -46459,18 +47070,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/station/science/auxlab) -"ono" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom/command{ - pixel_y = 4 - }, -/obj/machinery/button/door{ - id = "meetingblast"; - name = "Meeting Room Lockdown Control"; - pixel_y = -3 - }, -/turf/open/floor/carpet/executive, -/area/station/command/meeting_room) "onw" = ( /obj/machinery/airalarm/directional/east, /obj/structure/sign/poster/random/directional/north, @@ -46487,19 +47086,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/maintenance/aux_eva) -"onD" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/button/door/directional/north{ - id = "ai_sat_maint_right"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Door Bolt Control" - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "onF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -46559,6 +47145,10 @@ initial_gas_mix = "n2=100;TEMP=293.15" }, /area/station/maintenance/gag_room) +"ooF" = ( +/obj/machinery/transport/destination_sign/indicator/moonstation, +/turf/closed/wall, +/area/station/terminal/lobby) "ooN" = ( /obj/machinery/door/airlock{ name = "Law Office A" @@ -46654,17 +47244,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"oqb" = ( -/obj/structure/cable, -/obj/machinery/button/door/directional/north{ - id = "ai_sat_maint_left"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Door Bolt Control" - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "oqg" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -46805,31 +47384,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"osp" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/wood, -/area/station/commons/lounge) "osr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/large, /area/station/commons/storage/tools) -"osv" = ( -/obj/machinery/door/airlock/research{ - name = "Ordnance Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/door/firedoor/heavy, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "osA" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -47109,11 +47669,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark, /area/station/maintenance/abandon_arcade) -"owY" = ( -/obj/structure/fans/tiny/invisible, -/obj/structure/sign/warning/directional/south, -/turf/open/openspace, -/area/moonstation/surface) "oxf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47368,19 +47923,6 @@ /obj/structure/fireaxecabinet/directional/west, /turf/open/floor/iron/dark, /area/station/command/bridge) -"oCT" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/turf/open/floor/iron/dark, -/area/station/science/circuits) "oDh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -47770,17 +48312,6 @@ /obj/effect/spawner/costume/mafia, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) -"oIj" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/wood{ - id_tag = "dorms1"; - name = "Dorms 1" - }, -/turf/open/floor/wood, -/area/station/commons/dorms/room1) "oIk" = ( /turf/open/misc/beach/sand, /area/station/common/pool) @@ -47909,12 +48440,6 @@ /obj/machinery/light_switch/directional/north, /turf/open/floor/engine, /area/station/engineering/storage/eva) -"oKm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "oKn" = ( /obj/structure/table/wood, /obj/effect/spawner/random/clothing/bowler_or_that, @@ -47991,6 +48516,13 @@ }, /turf/open/floor/iron/checker, /area/station/security/evidence) +"oLl" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "oLm" = ( /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/dark, @@ -48186,6 +48718,11 @@ "oOJ" = ( /turf/closed/wall/r_wall, /area/station/engineering/storage/eva) +"oOK" = ( +/obj/structure/tram/alt/titanium, +/obj/structure/transport/linear/tram, +/turf/open/floor/plating, +/area/station/terminal/lobby) "oOO" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -48409,6 +48946,23 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/science/ordnance/storage) +"oSK" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner, +/area/station/common/pool) "oSL" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -48449,6 +49003,15 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/common/night_club) +"oTh" = ( +/obj/machinery/door/airlock/tram{ + transport_linked_id = "moon_1"; + name = "Moon Rover" + }, +/obj/structure/transport/linear/tram, +/obj/structure/thermoplastic/light, +/turf/open/floor/plating, +/area/station/terminal/lobby) "oTu" = ( /obj/machinery/door/airlock/security{ aiControlDisabled = 1; @@ -48492,6 +49055,9 @@ /obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/circuit/telecomms, /area/station/ai_monitored/turret_protected/ai) +"oUi" = ( +/turf/closed/indestructible/riveted/boss, +/area/lavaland/underground) "oUj" = ( /obj/machinery/light/small/directional/south, /obj/item/radio/intercom/directional/east, @@ -48605,6 +49171,18 @@ }, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) +"oVG" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "oVK" = ( /obj/machinery/door/airlock/highsecurity{ name = "Secure Ordnance Storage" @@ -48867,16 +49445,6 @@ /obj/machinery/light/warm/directional/south, /turf/open/floor/iron/white, /area/station/science/research) -"oZm" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/tram/left) "oZt" = ( /turf/closed/wall/rust, /area/station/engineering/atmos) @@ -48965,6 +49533,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft) +"paK" = ( +/obj/structure/necropolis_arch, +/obj/structure/necropolis_gate, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "pbi" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, @@ -48990,10 +49563,6 @@ }, /turf/open/floor/plating, /area/station/hallway/primary/tram/left) -"pbB" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "pbJ" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -49152,13 +49721,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/range) -"pdA" = ( -/obj/structure/bookcase/random/adult{ - name = "Forbidden Knowledge" - }, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "pdE" = ( /obj/machinery/porta_turret/ai, /obj/structure/sign/warning/cold_temp/directional/north, @@ -49452,6 +50014,16 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/eighties, /area/station/maintenance/abandon_arcade) +"pjn" = ( +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "pjo" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -49561,6 +50133,10 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron/checker, /area/station/engineering/atmos/control_center) +"pkQ" = ( +/obj/structure/stone_tile, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "pkR" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -49642,6 +50218,15 @@ /obj/machinery/recharge_station, /turf/open/floor/iron/dark, /area/station/security/brig) +"plJ" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "plT" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/autoname, @@ -49682,6 +50267,20 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/grass, /area/station/security/prison/garden) +"pms" = ( +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + id = "engineering_desk_shutters"; + name = "Engineering Desk Shutters Control"; + req_access = list("engineering") + }, +/turf/open/floor/iron, +/area/station/engineering/storage_shared) "pmw" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -49737,6 +50336,13 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/dark, /area/station/commons/storage/primary) +"pmZ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "pnf" = ( /obj/effect/turf_decal/siding/dark, /obj/structure/table, @@ -49746,6 +50352,10 @@ "pno" = ( /turf/closed/wall/rust, /area/station/terminal/maintenance) +"pnG" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/glass/reinforced, +/area/station/hallway/primary/central/fore) "pnQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -49878,6 +50488,18 @@ /obj/structure/sign/departments/engineering/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/aft) +"pqg" = ( +/obj/structure/sign/poster/contraband/got_wood/directional/north, +/obj/structure/rack{ + icon = 'icons/obj/fluff/general.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/storage/fancy/candle_box, +/obj/item/camera, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/engine/cult, +/area/station/service/library/private) "pqi" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 4 @@ -50448,6 +51070,18 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) +"pzk" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "pzv" = ( /turf/closed/wall, /area/station/security/brig/entrance) @@ -50516,10 +51150,6 @@ }, /turf/open/floor/iron/smooth, /area/station/terminal/interlink) -"pAn" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/pharmacy) "pAp" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 1 @@ -50590,6 +51220,14 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/maintenance/abandon_cafeteria) +"pBY" = ( +/obj/machinery/door/window/left/directional/north{ + name = "Hydroponics Deliveries"; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics) "pBZ" = ( /obj/structure/cable, /obj/item/radio/intercom/directional/east, @@ -50638,6 +51276,13 @@ }, /turf/open/floor/iron, /area/station/service/service_room) +"pCR" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/obj/structure/stone_tile, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "pDp" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/structure/barricade/wooden/crude, @@ -50765,6 +51410,23 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) +"pEQ" = ( +/obj/effect/turf_decal/siding/dark, +/obj/item/banner/command/mundane, +/obj/machinery/button/door/directional/north{ + id = "teleportershutters"; + name = "Teleporter Shutters Control"; + pixel_x = 8; + req_access = list("command") + }, +/obj/machinery/button/door/directional/north{ + id = "gateshutter"; + name = "Gateway Shutters Control"; + pixel_x = -8; + req_access = list("command") + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central/fore) "pET" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 1 @@ -50805,6 +51467,21 @@ "pFD" = ( /turf/closed/wall/r_wall/rust, /area/station/engineering/supermatter/waste) +"pFO" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/button/door/directional/north{ + id = "robotics_shutters"; + name = "Desk Shutters Control"; + req_access = list("robotics") + }, +/obj/machinery/modular_computer/preset/civilian{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "pFT" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -50881,6 +51558,13 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"pGF" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pGJ" = ( /obj/machinery/computer/libraryconsole{ dir = 4; @@ -50939,13 +51623,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/cargo/office) -"pHD" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/blue, -/area/station/commons/dorms/room3) "pHJ" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, @@ -51057,18 +51734,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"pJF" = ( -/obj/structure/transport/linear/tram, -/obj/structure/tram/alt/titanium, -/obj/machinery/transport/destination_sign/split/north, -/turf/open/floor/plating, -/area/station/terminal/lobby) -"pJQ" = ( -/obj/structure/cable, -/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/engineering/main) "pJW" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -51373,11 +52038,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/asteroid_lobby) -"pOt" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/closet/firecloset, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) "pOz" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/curtain/cloth, @@ -51444,14 +52104,6 @@ "pPr" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard) -"pPy" = ( -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "pPC" = ( /obj/effect/spawner/random/trash/bin, /obj/effect/decal/cleanable/dirt/dust, @@ -51485,6 +52137,11 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"pPW" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "pPY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -51498,6 +52155,10 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"pQb" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/aft) "pQk" = ( /obj/effect/turf_decal/siding/dark_green, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -51506,6 +52167,12 @@ /obj/structure/displaycase/captain, /turf/open/floor/carpet/blue, /area/station/command/heads_quarters/captain) +"pQr" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/computer/monitor, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/power_station) "pQs" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -51604,16 +52271,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) -"pSA" = ( -/obj/structure/table/wood/fancy/red, -/obj/item/ai_module/reset/purge, -/obj/machinery/door/window/brigdoor/left/directional/south{ - dir = 8; - name = "High-Risk Modules"; - req_access = list("captain") - }, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/ai_upload) "pSI" = ( /obj/machinery/light/small/red/directional/east, /obj/structure/sign/warning/radiation/directional/east, @@ -51954,18 +52611,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) -"pXn" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/machinery/button/door/directional/north{ - id = "qm_warehouse"; - name = "Warehouse Shutters Control"; - pixel_x = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/engine, -/area/station/cargo/storage) "pXp" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -52127,6 +52772,22 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) +"pZC" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Quartermaster's Office"; + name = "Quartermaster's Fax Machine" + }, +/obj/machinery/button/door/directional/north{ + id = "qm_privacy_shutters"; + name = "Privacy Shutters Control"; + req_access = list("qm") + }, +/turf/open/floor/mineral/gold, +/area/station/command/heads_quarters/qm) "pZH" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/waste) @@ -52395,15 +53056,30 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"qdf" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +"qdj" = ( +/obj/machinery/button/door/directional/north{ + id = "visitation"; + name = "Visitation Shutters"; + req_access = list("brig") + }, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/flasher{ + id = "visitation_flash"; + pixel_y = 38; + name = "Visitation Flasher"; + req_access = list("security") }, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, /turf/open/floor/iron/dark, -/area/station/engineering/storage) +/area/station/security/prison/visit) +"qdk" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/lattice/catwalk, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "qdm" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -52498,13 +53174,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/terminal/maintenance/aft) -"qeJ" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/lattice/catwalk, -/turf/open/openspace, -/area/station/cargo/miningdock) "qeL" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ @@ -52681,6 +53350,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"qgU" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + dir = 4 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron/dark, +/area/station/maintenance/night_club) "qhe" = ( /obj/machinery/door/airlock/public/glass{ name = "Fitness Room" @@ -52711,12 +53390,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/medical/pharmacy) -"qho" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "qhp" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, @@ -52733,6 +53406,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/commons/storage/tools) +"qhv" = ( +/obj/effect/turf_decal/siding/wood, +/obj/structure/table/wood/fancy/black, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/clothing/mask/balaclava/threehole{ + name = "three hole holy balaclava"; + desc = "Triple the holy."; + pixel_y = -6 + }, +/obj/effect/turf_decal/tile/bar/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "qhA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -52796,6 +53483,13 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"qiA" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "qiD" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -52858,15 +53552,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) -"qjw" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/maint) "qjB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -52875,6 +53560,14 @@ /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/engine, /area/station/engineering/atmos/project) +"qjD" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "qjG" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -52908,10 +53601,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron, /area/station/service/janitor) -"qjY" = ( -/obj/effect/turf_decal/box/corners, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "qkc" = ( /obj/structure/closet/crate/engineering, /obj/effect/spawner/random/engineering/material, @@ -53192,6 +53881,13 @@ /obj/effect/turf_decal/tile/red/real_red/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"qpb" = ( +/obj/structure/sign/flag/usa/directional/north, +/obj/structure/sink/oil_well, +/turf/open/misc/moonstation_sand{ + planetary_atmos = 0 + }, +/area/station/maintenance/port) "qpd" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/south, /obj/effect/spawner/liquids_spawner{ @@ -53244,6 +53940,15 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/iron/dark, /area/station/security/prison/work) +"qqx" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/block{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "qqz" = ( /obj/machinery/light/warm/directional/north, /obj/effect/turf_decal/bot{ @@ -53406,6 +54111,22 @@ /obj/machinery/suit_storage_unit/rd, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"qtv" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "qtC" = ( /obj/structure/table, /obj/item/raw_anomaly_core/random{ @@ -53473,6 +54194,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft) +"qup" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/table/wood, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "quq" = ( /turf/closed/wall/r_wall/rust, /area/station/security/prison/mess) @@ -53510,6 +54237,10 @@ "quP" = ( /turf/closed/wall/rust, /area/station/service/chapel/storage) +"qvc" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/chemistry) "qvg" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 @@ -53761,26 +54492,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hallway) -"qyG" = ( -/obj/structure/cable, -/obj/structure/rack, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/suit/hooded/wintercoat/engineering, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = -2 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "qyK" = ( /obj/structure/table/glass, /obj/machinery/microwave, @@ -53862,6 +54573,27 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"qzz" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Access" + }, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/minisat_access_ai, +/obj/effect/landmark/navigate_destination/aiupload{ + location = "AI Upload Access" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "qzA" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -53904,12 +54636,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) -"qAq" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/main) +"qAi" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "qAr" = ( /obj/effect/spawner/random/trash/mess, /obj/effect/decal/cleanable/dirt/dust, @@ -54045,13 +54782,6 @@ dir = 1 }, /area/station/hallway/primary/aft) -"qCs" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/spawner/random/vending/colavend, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) "qCG" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -54099,6 +54829,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"qDn" = ( +/obj/structure/stone_tile/slab/cracked, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "qDr" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -54117,6 +54852,17 @@ /obj/machinery/light/no_nightlight/directional/south, /turf/open/floor/iron/dark, /area/station/science/circuits) +"qDI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) +"qDL" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/chair/sofa/corp/left, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "qDR" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/engine, @@ -54223,6 +54969,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"qFS" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "qFU" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -54417,6 +55170,29 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/service/hydroponics) +"qJH" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Space Access Airlock" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/teleporter) +"qJR" = ( +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "ai_sat_maint_left"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Door Bolt Control"; + req_access = list("minisat") + }, +/obj/machinery/camera/autoname/minisat/directional/west, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "qJW" = ( /obj/machinery/modular_computer/preset/engineering{ dir = 8 @@ -54494,6 +55270,10 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) +"qKS" = ( +/obj/structure/stone_tile/slab, +/turf/open/misc/moonstation_sand, +/area/moonstation/surface) "qKV" = ( /obj/machinery/vending/sustenance, /obj/structure/sign/poster/official/random/directional/north, @@ -54529,12 +55309,6 @@ dir = 1 }, /area/station/hallway/secondary/exit) -"qLp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "qLr" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -54615,14 +55389,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/science/robotics/augments) -"qMP" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/machinery/light_switch/directional/north, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "qNj" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -54734,17 +55500,6 @@ /obj/effect/spawner/random/food_or_drink/donkpockets, /turf/open/floor/iron, /area/station/cargo/storage) -"qPC" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/structure/crate_loot, -/obj/machinery/button/door/directional/south{ - id = "qm_warehouse"; - name = "Warehouse Shutters Control"; - pixel_x = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "qPK" = ( /obj/machinery/power/apc/auto_name/directional/east{ arc_shielded = 1 @@ -54952,10 +55707,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) -"qSE" = ( -/obj/machinery/restaurant_portal/restaurant, -/turf/open/floor/glass/reinforced, -/area/station/hallway/primary/central/fore) "qSI" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -55022,6 +55773,21 @@ }, /turf/open/floor/iron, /area/station/cargo/warehouse) +"qTH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Telecommunications Lobby" + }, +/obj/effect/landmark/navigate_destination/tcomms, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/tcommsat/computer) "qTR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -55216,11 +55982,6 @@ }, /turf/open/floor/plating, /area/station/service/theater) -"qXf" = ( -/obj/effect/landmark/start/station_engineer, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "qXj" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55567,11 +56328,6 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/plating, /area/station/maintenance/abandon_office) -"rcq" = ( -/obj/structure/ladder, -/obj/effect/turf_decal/stripes/box, -/turf/open/openspace, -/area/station/cargo/miningdock) "rcv" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/security/brig, @@ -55602,6 +56358,13 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/command/heads_quarters/nt_rep) +"rcX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "rdc" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ @@ -55675,18 +56438,6 @@ "rdH" = ( /turf/closed/wall, /area/station/maintenance/port/aft) -"rdL" = ( -/obj/machinery/bouldertech/brm, -/obj/machinery/conveyor{ - id = "mining"; - dir = 4 - }, -/obj/structure/railing/corner/end{ - dir = 4 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/pod, -/area/station/cargo/miningfoundry/event_protected) "rdM" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{ dir = 4 @@ -55780,6 +56531,16 @@ /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"reF" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "reK" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55880,6 +56641,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"rfY" = ( +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) +"rga" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "rgk" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/general, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -55993,15 +56766,6 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/lobby) -"rhV" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) "rhX" = ( /obj/machinery/door/firedoor, /turf/open/floor/wood, @@ -56020,6 +56784,15 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningelevators) +"rid" = ( +/obj/structure/table, +/obj/item/storage/toolbox/emergency, +/obj/item/clipboard, +/obj/structure/lattice/catwalk, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "rin" = ( /obj/machinery/atmospherics/components/binary/pump/on/scrubbers/visible{ name = "External Ports to Filter" @@ -56083,33 +56856,6 @@ /obj/machinery/meter, /turf/closed/wall/r_wall, /area/station/engineering/atmos) -"riW" = ( -/obj/structure/bed/double{ - dir = 1 - }, -/obj/item/bedsheet/dorms_double{ - dir = 1 - }, -/obj/item/pillow/random{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/pillow/random{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "dorms1"; - name = "Dorms Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/carpet/red, -/area/station/commons/dorms/room1) "rjc" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -56125,11 +56871,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/engineering/atmos) -"rjo" = ( -/obj/structure/chair/sofa/corp/left, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "rjx" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, @@ -56204,6 +56945,18 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/station/security/courtroom) +"rkW" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass{ + name = "Telecommunications" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "rlf" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Work Room" @@ -56319,17 +57072,6 @@ /obj/item/reagent_containers/dropper, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"rmc" = ( -/obj/structure/table/wood, -/obj/item/storage/lockbox/medal/sec, -/obj/item/camera, -/obj/machinery/button/door/directional/east{ - id = "hos_office_external_shutters"; - name = "External Privacy Shutters Control" - }, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "rmC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56350,6 +57092,14 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark, /area/station/security/brig) +"rmG" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/sign/departments/telecomms/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "rmH" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 10 @@ -56359,6 +57109,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) +"rmL" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Storage" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/autoname, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/side, +/area/station/engineering/storage) "rmR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56447,6 +57210,12 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"rnX" = ( +/obj/structure/stone_tile/block{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "ron" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -56597,14 +57366,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron, /area/station/service/hydroponics) -"rqd" = ( -/obj/machinery/light/warm/directional/west, -/obj/machinery/button/door/directional/west{ - id = "hos_office_shutters"; - name = "Internal Privacy Shutters Control" - }, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hos) "rqg" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 4 @@ -56645,10 +57406,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/grass, /area/station/service/hydroponics) -"rru" = ( -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "rrE" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -56742,10 +57499,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) -"rte" = ( -/obj/effect/spawner/random/trash/graffiti, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "rti" = ( /obj/structure/sign/poster/contraband/random/directional/west, /turf/closed/wall, @@ -56905,6 +57658,13 @@ "rvG" = ( /turf/closed/wall/rust, /area/station/maintenance/clown_chamber) +"rvJ" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/sign/warning/pods/directional/north, +/obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/tram/left) "rvM" = ( /obj/effect/landmark/start/lawyer, /obj/structure/chair/office{ @@ -57162,15 +57922,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"rzg" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Equipment Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/brig, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "rzh" = ( /turf/closed/wall/r_wall, /area/station/science/ordnance/burnchamber) @@ -57682,14 +58433,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/warehouse) -"rHK" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/aft) "rHZ" = ( /turf/closed/wall/mineral/wood, /area/station/service/kitchen) @@ -57931,21 +58674,6 @@ "rKY" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/fore) -"rLc" = ( -/obj/machinery/button/door/directional/north{ - id = "custodialshutters"; - name = "shutters control"; - pixel_x = -8 - }, -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/jani_wardrobe, -/turf/open/floor/iron, -/area/station/service/janitor) "rLg" = ( /obj/structure/closet/crate/grave, /turf/open/misc/moonstation_sand, @@ -57955,23 +58683,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"rLs" = ( -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #2"; - suffix = "#2" - }, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - location = "QM #2"; - name = "QM #2" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/station/cargo/storage) "rLx" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -58067,14 +58778,6 @@ /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"rNc" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "rNi" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/power/apc/auto_name/directional/east, @@ -58235,6 +58938,17 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"rPa" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/box/corners, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "rPb" = ( /obj/machinery/power/terminal{ dir = 8 @@ -58360,15 +59074,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"rRV" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "rRW" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/iron/grimy, @@ -58456,15 +59161,6 @@ }, /turf/open/floor/wood/parquet, /area/station/security/brig/entrance) -"rTg" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Storage" - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "rTn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -58595,6 +59291,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/office) +"rWi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rWk" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -58796,17 +59498,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/virology) -"rZk" = ( -/obj/structure/cable, -/obj/machinery/button/door/directional/north{ - id = "ai_sat_maint_left"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Door Bolt Control" - }, -/obj/machinery/camera/autoname/minisat/directional/west, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "rZm" = ( /obj/machinery/telecomms/server/presets/service, /obj/effect/turf_decal/siding/dark{ @@ -58874,6 +59565,9 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) +"saq" = ( +/turf/open/misc/moonstation_rock, +/area/moonstation/surface) "saL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -59100,17 +59794,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"ses" = ( -/obj/machinery/door/airlock/security{ - name = "Interrogation Monitoring" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/entrance, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/interrogation) "seT" = ( /obj/machinery/light/small/directional/west, /obj/effect/turf_decal/stripes/line{ @@ -59118,17 +59801,29 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) -"seW" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Space Access Airlock" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +"seY" = ( /obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/teleporter) +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/wood{ + id_tag = "dorms1"; + name = "Dorms 1" + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms/room1) +"sfy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/lawoffice) "sfz" = ( /turf/closed/wall, /area/station/commons/dorms/room4) @@ -59182,6 +59877,11 @@ "sfN" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port) +"sfS" = ( +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningelevators) "sfY" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/hidden, /turf/open/floor/catwalk_floor, @@ -59204,6 +59904,16 @@ /obj/structure/cable, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) +"sgf" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "sgl" = ( /obj/effect/turf_decal/trimline/dark/filled/warning, /turf/open/floor/iron, @@ -59302,17 +60012,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) -"shx" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/wood{ - id_tag = "dorms4"; - name = "Dorms 4" - }, -/turf/open/floor/wood, -/area/station/commons/dorms/room4) "shG" = ( /obj/effect/spawner/costume/maid, /obj/structure/rack, @@ -59397,6 +60096,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"sjt" = ( +/obj/structure/transport/linear/tram, +/obj/structure/fluff/tram_rail/electric{ + dir = 1 + }, +/obj/structure/thermoplastic, +/obj/machinery/computer/tram_controls/moonstation/directional/south, +/turf/open/floor/plating, +/area/station/terminal/lobby) "sjA" = ( /obj/machinery/door/airlock/public/glass{ name = "Cargo Lobby" @@ -59518,6 +60226,19 @@ /obj/item/radio/intercom, /turf/open/floor/carpet/purple, /area/station/security/courtroom) +"skB" = ( +/obj/structure/table, +/obj/item/stack/sheet/iron/fifty, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "chem_shutters"; + name = "Privacy Shutters Control"; + req_access = list("plumbing") + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/chemistry) "skG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, @@ -59665,6 +60386,13 @@ }, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"snB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "snF" = ( /obj/structure/table/wood, /obj/machinery/fax{ @@ -59947,6 +60675,13 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/station/science/server) +"srs" = ( +/obj/structure/stone_tile/block/cracked, +/obj/structure/stone_tile/block/cracked{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/underground) "srt" = ( /obj/machinery/light/warm/directional/south, /obj/structure/rack, @@ -60010,21 +60745,6 @@ }, /turf/open/floor/plating, /area/station/cargo/sorting) -"ssl" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/gravity_generator) "ssn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -60055,17 +60775,6 @@ /obj/structure/sign/poster/official/obey/directional/south, /turf/open/floor/iron, /area/station/security/prison/upper) -"ssF" = ( -/obj/structure/table, -/obj/effect/spawner/random/engineering/flashlight, -/obj/item/toy/figure/miner, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/lattice/catwalk, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/station/cargo/miningdock) "ssK" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -60155,6 +60864,19 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"sud" = ( +/obj/structure/table, +/obj/effect/spawner/random/engineering/flashlight, +/obj/item/toy/figure/miner, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/lattice/catwalk, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "suj" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -60429,6 +61151,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"syG" = ( +/obj/structure/marker_beacon/fuchsia, +/turf/open/floor/catwalk_floor/rust/moonstation/cave, +/area/moonstation/underground) "syH" = ( /obj/effect/turf_decal/tile/neutral/tram, /obj/structure/chair/sofa/bench/tram/left{ @@ -60673,14 +61399,6 @@ /obj/machinery/light/dim/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"sDb" = ( -/obj/machinery/door/window/left/directional/north{ - name = "Hydroponics Deliveries"; - req_access = list("hydroponics") - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/service/hydroponics) "sDc" = ( /obj/machinery/nuclearbomb/beer{ flood_reagent = /datum/reagent/lube; @@ -60770,6 +61488,12 @@ /obj/structure/marker_beacon/fuchsia, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) +"sEn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "sEp" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -60806,10 +61530,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage/gas) -"sFx" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/courtroom) +"sFq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "sFE" = ( /obj/machinery/door/airlock/public/glass, /obj/machinery/door/firedoor, @@ -60960,6 +61689,18 @@ }, /turf/open/floor/plating, /area/station/science/robotics/lab) +"sHQ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "sHS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -60981,15 +61722,6 @@ /obj/effect/spawner/random/burgerstation/odd, /turf/open/floor/plating, /area/station/maintenance/central) -"sIr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/security/prison/upper) "sIB" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/disposalpipe/segment, @@ -61022,19 +61754,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"sIR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/button/door/directional/north{ - id = "ai_sat_maint_right"; - normaldoorcontrol = 1; - specialfunctions = 4; - name = "Door Bolt Control" - }, -/obj/machinery/camera/autoname/minisat/directional/east, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "sIU" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -61240,15 +61959,6 @@ /obj/machinery/meter/layer4, /turf/open/floor/plating, /area/station/maintenance/port) -"sME" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "sMG" = ( /obj/machinery/doppler_array{ dir = 4 @@ -61256,6 +61966,11 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"sMI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/power_station) "sMQ" = ( /obj/structure/table/glass, /obj/effect/spawner/random/food_or_drink/cups, @@ -61594,6 +62309,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) +"sSy" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Customs" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/door/firedoor, +/obj/structure/cable, +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/arrivals) "sSM" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -61693,6 +62421,20 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"sUe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/button/door/directional/north{ + id = "ai_sat_maint_right"; + normaldoorcontrol = 1; + specialfunctions = 4; + name = "Door Bolt Control"; + req_access = list("minisat") + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/catwalk_floor, +/area/station/ai_monitored/turret_protected/aisat/maint) "sUi" = ( /obj/machinery/duct/supply, /obj/machinery/duct/waste, @@ -61768,6 +62510,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"sVR" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/door/window/left/directional/east{ + name = "Atmospherics Deliveries"; + req_access = list("atmospherics") + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/control_center) "sVY" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -61823,6 +62574,14 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +"sWK" = ( +/obj/structure/table/glass, +/obj/item/pillow/clown, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/night_club) "sWQ" = ( /obj/machinery/door/airlock/external{ name = "Mining Dock Airlock" @@ -61935,6 +62694,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/aft) +"sYP" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "sYQ" = ( /obj/structure/window/spawner/directional/east, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62064,6 +62834,19 @@ /obj/item/construction/plumbing/engineering, /turf/open/floor/catwalk_floor, /area/station/maintenance/pool_maintenance) +"taT" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/machinery/button/door/directional/north{ + id = "qm_warehouse"; + name = "Warehouse Shutters Control"; + pixel_x = 8; + req_access = list("shipping") + }, +/obj/item/kirbyplants/random, +/turf/open/floor/engine, +/area/station/cargo/storage) "tbd" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -62248,6 +63031,14 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"tdl" = ( +/obj/structure/sign/poster/random/directional/north, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "tds" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -62343,6 +63134,19 @@ dir = 1 }, /area/station/hallway/secondary/command) +"teM" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tfa" = ( /obj/effect/turf_decal/siding/corner, /obj/machinery/light/floor, @@ -62642,6 +63446,14 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) +"tkl" = ( +/obj/structure/transport/linear/tram, +/obj/structure/tram, +/obj/machinery/transport/destination_sign/moonstation{ + pixel_x = 16 + }, +/turf/open/floor/plating, +/area/station/terminal/lobby) "tkE" = ( /obj/machinery/atmospherics/components/binary/valve/on{ dir = 4 @@ -62743,6 +63555,16 @@ /obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/dark, /area/station/security/range) +"tlX" = ( +/obj/structure/stone_tile/block/burnt, +/obj/structure/stone_tile/burnt{ + dir = 1 + }, +/obj/structure/stone_tile/burnt{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tme" = ( /obj/machinery/light/warm/directional/west, /turf/open/floor/engine, @@ -62803,13 +63625,6 @@ /obj/structure/sign/directions/lavaland/directional/east, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/aft) -"tne" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "tnu" = ( /obj/machinery/recycler{ dir = 8 @@ -62966,14 +63781,6 @@ dir = 1 }, /area/station/hallway/secondary/recreation) -"tpG" = ( -/obj/machinery/door/airlock/hatch{ - name = "MiniSat Space Access Airlock" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/turret_protected/aisat/service) "tpI" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63008,6 +63815,11 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos) +"tqB" = ( +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron/checker, +/area/station/engineering/atmos/hallway) "tqH" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -63041,6 +63853,21 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) +"trd" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/central/aft) "trj" = ( /obj/effect/spawner/structure/window, /obj/machinery/door/poddoor/shutters/preopen{ @@ -63188,15 +64015,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/iron/dark, /area/station/command/cc_dock) -"ttA" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/spawner/random/decoration/glowstick, -/obj/effect/turf_decal/delivery, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/maintenance/port/aft) "ttK" = ( /obj/effect/spawner/random/decoration/glowstick, /obj/structure/cable, @@ -63215,6 +64033,17 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/iron/dark, /area/station/security/prison) +"ttS" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/airlock/highsecurity{ + name = "AI Power Station" + }, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/turf/open/floor/plating, +/area/station/ai_monitored/turret_protected/aisat/maint) "ttW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, @@ -63434,6 +64263,19 @@ initial_gas_mix = "n2=100;TEMP=293.15" }, /area/station/maintenance/gag_room) +"txZ" = ( +/obj/structure/table/wood, +/obj/machinery/fax{ + fax_name = "Law Office B"; + name = "Law Office B Fax Machine" + }, +/obj/machinery/button/door/directional/east{ + id = "lawyer_shutters_b"; + name = "Privacy Shutters Control"; + req_access = list("lawyer") + }, +/turf/open/floor/carpet/blue, +/area/station/service/lawoffice) "tys" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/machinery/meter, @@ -63502,19 +64344,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"tzi" = ( -/obj/structure/table/reinforced, -/obj/item/storage/barricade, -/obj/machinery/door/window/brigdoor/right/directional/north{ - req_access = list("armory"); - name = "Warden's Desk" - }, -/obj/machinery/door/window/right/directional/south{ - name = "Warden's Desk" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/warden) "tzp" = ( /obj/effect/turf_decal/loading_area{ dir = 8 @@ -63941,10 +64770,14 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/asteroid_lobby) -"tFC" = ( -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/janitor) +"tFI" = ( +/obj/structure/tram, +/obj/structure/transport/linear/tram, +/obj/structure/plaque/static_plaque/tram{ + specific_transport_id = "moon_1" + }, +/turf/open/floor/plating, +/area/station/terminal/lobby) "tFL" = ( /obj/item/assembly/mousetrap/armed, /turf/open/floor/plating, @@ -64209,6 +65042,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"tJw" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tJx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -64278,11 +65121,22 @@ /obj/effect/turf_decal/tile/yellow/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/storage/eva) +"tKS" = ( +/obj/machinery/firealarm/directional/east, +/obj/item/kirbyplants/random, +/obj/machinery/camera/autoname/engineering/directional/east, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "tKU" = ( /obj/effect/turf_decal/box/corners, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/engine, /area/station/engineering/gravity_generator) +"tKV" = ( +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/station/security/courtroom) "tKX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -64469,6 +65323,10 @@ /obj/item/lightreplacer, /turf/open/floor/iron, /area/station/service/janitor) +"tOi" = ( +/obj/structure/fluff/drake_statue, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tOt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -64675,6 +65533,18 @@ }, /turf/open/floor/iron, /area/station/security/prison/upper) +"tRV" = ( +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock/wood{ + id_tag = "dorms4"; + name = "Dorms 4" + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/station/commons/dorms/room4) "tSb" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -64952,6 +65822,20 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) +"tXc" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tXd" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -64969,6 +65853,16 @@ /obj/effect/landmark/blobstart, /turf/open/floor/catwalk_floor, /area/station/maintenance/aft) +"tXq" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring" + }, +/turf/open/floor/iron/dark/side, +/area/station/engineering/power_station) "tXv" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) @@ -65044,6 +65938,10 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/port) +"tYz" = ( +/obj/structure/stone_tile/slab/burnt, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "tYC" = ( /obj/structure/table/wood, /obj/structure/sign/plaques/kiddie/library{ @@ -65222,6 +66120,18 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/catwalk_floor, /area/station/maintenance/pool_maintenance) +"uaM" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/machinery/light_switch/directional/north, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "uaR" = ( /obj/machinery/computer/cryopod/directional/east, /obj/machinery/time_clock/directional/south, @@ -65264,6 +66174,15 @@ "ubz" = ( /turf/closed/wall/rust, /area/station/maintenance/central) +"ubE" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "ubJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -65278,6 +66197,14 @@ "ubP" = ( /turf/closed/wall/r_wall/rust, /area/station/security/prison/work) +"uca" = ( +/obj/structure/sign/warning/electric_shock/directional/south, +/obj/machinery/vending/sustenance, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "ucn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65292,11 +66219,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"ucW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "udc" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -65416,6 +66338,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/emitter) +"uen" = ( +/obj/effect/turf_decal/box/corners{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison/upper) "ueq" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/camera/autoname/directional/east, @@ -65619,6 +66552,15 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/security/brig) +"uhk" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/wood, +/area/station/service/lawoffice) "uhu" = ( /obj/item/kirbyplants/random/fullysynthetic, /obj/machinery/light/small/red/directional/west, @@ -65748,6 +66690,15 @@ }, /turf/open/floor/iron, /area/station/security/prison/upper) +"uiO" = ( +/obj/machinery/door/airlock/security{ + name = "Interrogation Monitoring" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/entrance, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/interrogation) "uiV" = ( /turf/closed/wall/mineral/wood, /area/station/commons/lounge) @@ -65866,11 +66817,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/security/prison) -"ukM" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/machinery/space_heater, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "ukP" = ( /turf/open/floor/wood, /area/station/service/lawoffice) @@ -65888,6 +66834,18 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) +"uly" = ( +/obj/machinery/newscaster/directional/north, +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/effect/turf_decal/box/corners, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "ulD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -66181,6 +67139,39 @@ /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron, /area/station/service/hydroponics) +"upw" = ( +/obj/structure/cable, +/obj/structure/sign/warning/cold_temp/directional/south, +/obj/structure/sign/warning/gas_mask/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) +"upU" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/cup/beaker{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/beaker/large, +/obj/item/reagent_containers/cup/bottle/epinephrine{ + pixel_x = -4; + pixel_y = 12 + }, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 7; + pixel_y = 12 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "pharm_desk_shutters"; + name = "Desk Shutters Control"; + req_access = list("pharmacy") + }, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "upW" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66244,10 +67235,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"urd" = ( -/obj/effect/spawner/random/trash/moisture, -/turf/open/floor/plating, -/area/station/maintenance/port) "uri" = ( /obj/effect/turf_decal/trimline/dark/filled/warning, /obj/effect/turf_decal/vg_decals/numbers/four{ @@ -66259,6 +67246,13 @@ /obj/effect/turf_decal/vg_decals/atmos/oxygen, /turf/open/floor/engine/o2, /area/station/engineering/atmos) +"urn" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/effect/landmark/start/janitor, +/turf/open/floor/iron, +/area/station/service/janitor) "uro" = ( /obj/effect/spawner/random/trash/moisture_trap, /obj/effect/decal/cleanable/dirt/dust, @@ -66279,14 +67273,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/fore) -"uru" = ( -/obj/structure/disposaloutlet, -/obj/effect/decal/cleanable/cobweb, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/night_club) "urA" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -66451,33 +67437,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) -"uuP" = ( -/obj/structure/bed/double{ - dir = 1 - }, -/obj/item/bedsheet/dorms_double{ - dir = 1 - }, -/obj/item/pillow/random{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/pillow/random{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "dorms4"; - name = "Dorms Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/carpet/royalblack, -/area/station/commons/dorms/room4) "uuR" = ( /obj/effect/turf_decal/weather/snow, /obj/effect/spawner/random/trash/mess, @@ -66767,6 +67726,13 @@ dir = 1 }, /area/station/hallway/primary/aft) +"uzs" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "uzt" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -66848,12 +67814,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"uAB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "uAE" = ( /obj/structure/table/wood, /obj/structure/window/spawner/directional/east, @@ -66977,17 +67937,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/small, /area/station/command/bridge) -"uBO" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/command/bridge) "uCa" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 8 @@ -67227,6 +68176,12 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/port) +"uFR" = ( +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "uGe" = ( /obj/structure/chair/sofa/bench{ dir = 4 @@ -67319,6 +68274,16 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"uHV" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "uHW" = ( /obj/machinery/vending/boozeomat/all_access, /obj/structure/sign/poster/contraband/syndicate_pistol/directional/north, @@ -67429,12 +68394,6 @@ "uJk" = ( /turf/closed/wall, /area/station/maintenance/starboard) -"uJp" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/announcement_system, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "uJO" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 4 @@ -67462,17 +68421,6 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/white, /area/station/medical/virology) -"uKH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/warm/directional/west, -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 1 - }, -/obj/effect/spawner/random/trash/mopbucket, -/turf/open/floor/iron, -/area/station/service/janitor) "uLb" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -67555,11 +68503,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"uMN" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/spawner/random/vending/snackvend, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "uMT" = ( /obj/machinery/ai_slipper, /obj/structure/cable, @@ -67577,10 +68520,6 @@ dir = 1 }, /area/station/hallway/secondary/command) -"uNf" = ( -/obj/structure/fans/tiny/invisible, -/turf/open/openspace, -/area/moonstation/surface) "uNu" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -67602,9 +68541,6 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) -"uNO" = ( -/turf/open/floor/catwalk_floor/rust/moonstation, -/area/moonstation/underground) "uNP" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/glass/reinforced, @@ -67781,6 +68717,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"uQo" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/announcement_system, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "uQp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -67931,12 +68873,6 @@ }, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) -"uTy" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "uTH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -68099,21 +69035,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"uVG" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/obj/structure/table/wood, -/obj/machinery/fax{ - fax_name = "Quartermaster's Office"; - name = "Quartermaster's Fax Machine" - }, -/obj/machinery/button/door/directional/north{ - id = "qm_privacy_shutters"; - name = "Privacy Shutters Control" - }, -/turf/open/floor/mineral/gold, -/area/station/command/heads_quarters/qm) "uVI" = ( /obj/machinery/atmospherics/components/trinary/filter{ dir = 4 @@ -68338,33 +69259,11 @@ "uZb" = ( /turf/open/floor/glass/reinforced, /area/station/security/courtroom) -"uZe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron/checker, -/area/station/hallway/secondary/exit) "uZh" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/aft) -"uZx" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "uZD" = ( /obj/structure/chair/sofa/right/brown{ dir = 1 @@ -68648,6 +69547,21 @@ }, /turf/open/floor/plating, /area/station/construction) +"vfs" = ( +/obj/machinery/door/airlock/security{ + name = "Evidence Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/navigate_destination/autoname, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/evidence) "vfv" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -68779,13 +69693,6 @@ }, /turf/open/indestructible/tram, /area/station/hallway/primary/tram/left) -"vhZ" = ( -/obj/item/radio/intercom/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/hallway/primary/central/fore) "via" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68852,6 +69759,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"vjc" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/vending/coffee, +/turf/open/floor/wood, +/area/station/commons/lounge) "vji" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -68902,6 +69820,15 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"vjw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/prison) "vjy" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -68944,13 +69871,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) -"vkf" = ( -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/medical/chemistry) "vkg" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -69083,18 +70003,6 @@ "vmC" = ( /turf/closed/wall, /area/station/commons/fitness/locker_room) -"vmE" = ( -/obj/machinery/door/airlock/research{ - name = "Ordnance Lab" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/ordnance, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/door/firedoor/heavy, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "vmI" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -69103,30 +70011,9 @@ /obj/machinery/light/warm/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) -"vmK" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/tram/left) "vmO" = ( /turf/open/genturf, /area/moonstation/surface/unexplored) -"vmP" = ( -/obj/machinery/newscaster/directional/north, -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "vmQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69162,12 +70049,6 @@ dir = 1 }, /area/station/hallway/primary/central/aft) -"vmU" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "vmW" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 @@ -69198,17 +70079,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"vnk" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "vnr" = ( /obj/machinery/biogenerator, /obj/machinery/door/firedoor, @@ -69479,12 +70349,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/grass, /area/station/service/hydroponics) -"vqz" = ( -/obj/structure/cable, -/obj/machinery/light/warm/directional/west, -/obj/machinery/power/smes/engineering, -/turf/open/floor/catwalk_floor, -/area/station/tcommsat/computer) "vqC" = ( /obj/structure/railing{ dir = 1 @@ -69527,16 +70391,29 @@ /obj/effect/spawner/random/bureaucracy/briefcase, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) -"vri" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/royalblack, -/area/station/commons/dorms/room4) "vrq" = ( /turf/open/floor/glass/reinforced, /area/station/service/library/artgallery) +"vrH" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/table, +/obj/effect/spawner/random/engineering/flashlight, +/obj/item/binoculars, +/obj/item/book/manual/wiki/security_space_law, +/obj/machinery/button/flasher{ + id = "isolation_flasher"; + pixel_y = 23; + pixel_x = 5; + req_access = list("security"); + name = "Isolation Flasher" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/dark, +/area/station/security/corrections_officer) "vrK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69583,6 +70460,18 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) +"vsm" = ( +/obj/machinery/button/door/directional/west{ + id = "rbmk2_shutters_east"; + name = "RB-MK2 Radiation Shutters Control"; + req_access = list("engineering") + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/space_heater{ + anchored = 1 + }, +/turf/open/floor/plating, +/area/station/engineering/rbmk2/chamber) "vss" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -69700,6 +70589,15 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"vvu" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/lavaland/underground) "vvw" = ( /obj/structure/table/wood, /obj/machinery/requests_console/auto_name/directional/north, @@ -69781,6 +70679,11 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron/pool, /area/station/common/pool) +"vws" = ( +/obj/structure/chair/sofa/corp/right, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) "vwE" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -69793,6 +70696,36 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/hallway/primary/starboard) +"vwO" = ( +/obj/machinery/button/door/directional/west{ + id = "hop"; + name = "Privacy Shutters Control"; + req_access = list("hop") + }, +/obj/machinery/button/door/directional/west{ + id = "hopqueue"; + name = "Line Shutters Control"; + pixel_y = -9; + req_access = list("hop") + }, +/obj/machinery/button/flasher{ + id = "hopflash"; + pixel_x = -32; + pixel_y = 8; + req_access = list("hop"); + name = "Line Flasher" + }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/head_of_personnel, +/obj/machinery/button/ticket_machine{ + pixel_x = -35; + pixel_y = -4; + req_access = list("hop") + }, +/turf/open/floor/carpet/purple, +/area/station/command/heads_quarters/hop) "vwQ" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -69822,13 +70755,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) -"vxJ" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/station/service/lawoffice) "vxT" = ( /obj/machinery/light/dim/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -69841,6 +70767,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) +"vxY" = ( +/obj/structure/stone_tile/slab/cracked, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "vyk" = ( /obj/machinery/door/airlock{ name = "Kitchen" @@ -69922,6 +70852,11 @@ /obj/structure/cable, /turf/open/floor/carpet/executive, /area/station/command/meeting_room) +"vza" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/structure/closet/emcloset, +/turf/open/floor/iron, +/area/station/terminal/lobby) "vzd" = ( /obj/effect/spawner/random/trash/mess, /obj/item/assembly/mousetrap/armed{ @@ -69970,18 +70905,19 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) -"vAa" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 +"vzU" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Power Monitoring" }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/south, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/autoname, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/engineering/power_station) "vAd" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /turf/open/floor/iron/white, @@ -70126,6 +71062,16 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/service/service_room) +"vCb" = ( +/obj/machinery/door/airlock/hatch{ + name = "MiniSat Space Access Airlock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all/command/minisat, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/turret_protected/aisat/service) "vCc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70401,11 +71347,6 @@ "vFG" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/nt_rep) -"vFH" = ( -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) "vFK" = ( /obj/machinery/computer/piratepad_control/civilian{ dir = 8 @@ -70438,11 +71379,6 @@ /obj/item/wrench, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) -"vGq" = ( -/obj/machinery/vending/wardrobe/curator_wardrobe, -/obj/structure/sign/poster/contraband/got_wood/directional/north, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "vGz" = ( /obj/machinery/computer/crew{ dir = 1 @@ -70610,10 +71546,6 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) -"vKe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "vKs" = ( /obj/effect/turf_decal/box/corners{ dir = 4 @@ -70864,6 +71796,19 @@ dir = 1 }, /area/station/hallway/secondary/exit) +"vPL" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/item/flashlight/flare/candle/infinite, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "vPR" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -71093,11 +72038,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) -"vSO" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "vST" = ( /obj/structure/closet/crate/silvercrate, /obj/effect/turf_decal/stripes/line{ @@ -71161,6 +72101,22 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"vTP" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security E.V.A. Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/dark_red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/eva) "vUb" = ( /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, @@ -71281,6 +72237,12 @@ dir = 1 }, /area/station/hallway/secondary/recreation) +"vVS" = ( +/obj/machinery/light/warm/directional/west, +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/catwalk_floor, +/area/station/tcommsat/computer) "vVW" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -71291,6 +72253,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/medical/cryo) +"vVY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "vWf" = ( /obj/structure/transit_tube/crossing, /obj/machinery/camera/autoname/directional/east, @@ -72186,6 +73154,17 @@ /obj/machinery/meter/monitored/waste_loop, /turf/open/floor/iron, /area/station/engineering/atmos/control_center) +"wjv" = ( +/obj/structure/chair/sofa/corp/left, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/starboard) +"wjy" = ( +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/moonstation/surface) "wjz" = ( /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, @@ -72225,19 +73204,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"wjO" = ( -/obj/effect/mapping_helpers/airlock/locked, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "MiniSat Maintenance"; - id_tag = "ai_sat_maint_right" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/machinery/door/firedoor, -/turf/open/floor/catwalk_floor, -/area/station/ai_monitored/turret_protected/aisat/maint) "wjQ" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 1; @@ -72297,6 +73263,12 @@ }, /turf/open/floor/wood/parquet, /area/station/commons/lounge) +"wkJ" = ( +/obj/structure/stone_tile/block{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wkO" = ( /obj/machinery/disposal/delivery_chute, /obj/machinery/light/small/red/directional/north, @@ -72340,6 +73312,17 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"wlf" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wlB" = ( /obj/machinery/photocopier, /obj/effect/decal/cleanable/dirt/dust, @@ -72425,17 +73408,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/common/wrestling/arena) -"woe" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/service/lawyer, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/station/service/lawoffice) "wof" = ( /turf/closed/wall, /area/station/security/detectives_office) @@ -73020,13 +73992,6 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) -"wyp" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "wyq" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -73148,6 +74113,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/surgery) +"wAT" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/recreation) "wAX" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted{ dir = 1 @@ -73175,6 +74147,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"wBA" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/surrounding/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/burnt, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wBB" = ( /obj/effect/turf_decal/bot, /obj/machinery/airalarm/directional/north, @@ -73285,6 +74270,20 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/maintenance/radshelter) +"wDe" = ( +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + location = "QM #3"; + name = "QM #3" + }, +/mob/living/simple_animal/bot/mulebot, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron, +/area/station/cargo/storage) "wDg" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -73504,18 +74503,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"wGq" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "wGw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) +"wGA" = ( +/obj/structure/stone_tile/slab, +/obj/structure/necropolis_arch, +/obj/structure/fans/tiny/invisible, +/obj/structure/necropolis_gate, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wGC" = ( /turf/closed/wall/rust, /area/station/maintenance/department/electrical) @@ -73527,6 +74525,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"wGH" = ( +/obj/machinery/light/warm/directional/west, +/obj/machinery/button/door/directional/west{ + id = "hos_office_shutters"; + name = "Internal Privacy Shutters Control"; + req_access = list("hos") + }, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hos) "wGJ" = ( /obj/structure/table/reinforced/plasmarglass, /obj/effect/spawner/random/entertainment/money_small, @@ -73582,6 +74589,19 @@ /mob/living/simple_animal/bot/floorbot, /turf/open/floor/iron, /area/station/engineering/power_station) +"wHo" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 5 + }, +/obj/structure/stone_tile/surrounding/cracked{ + dir = 1 + }, +/obj/structure/stone_tile/center/burnt, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wHA" = ( /obj/effect/turf_decal/tile/blue/diagonal_centre, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -73606,6 +74626,13 @@ /obj/effect/turf_decal/box/white, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"wHM" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/night_club) "wHW" = ( /obj/effect/turf_decal/tile/brown/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73662,6 +74689,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/bridge) +"wIG" = ( +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wII" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/random/burgerstation/loot, @@ -73692,6 +74732,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/side, /area/station/medical/medbay/lobby) +"wIV" = ( +/obj/structure/sign/warning/directional/south, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/moonstation/surface) "wIW" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -73910,6 +74956,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/checkpoint/arrivals) +"wOe" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 + }, +/obj/structure/stone_tile/cracked, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/lavaland/underground) "wOf" = ( /obj/item/banner/command/mundane, /obj/effect/turf_decal/siding/dark{ @@ -73953,6 +75009,12 @@ /obj/structure/sign/warning/vacuum/external/directional/west, /turf/open/floor/plating, /area/station/engineering/asteroid_lobby) +"wOD" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wOU" = ( /obj/structure/window/reinforced/plasma/spawner/directional/north, /obj/machinery/power/energy_accumulator/tesla_coil/anchored, @@ -74113,6 +75175,12 @@ /obj/structure/transit_tube, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/teleporter) +"wRc" = ( +/obj/item/assembly/mousetrap/armed{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/night_club) "wRu" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/bot, @@ -74134,6 +75202,16 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/library) +"wRL" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wRM" = ( /obj/machinery/status_display/evac/directional/west, /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ @@ -74195,6 +75273,13 @@ /obj/machinery/light/warm/directional/west, /turf/open/floor/catwalk_floor, /area/station/hallway/secondary/exit) +"wSI" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/turf/open/floor/plating, +/area/station/engineering/main) "wSM" = ( /obj/effect/turf_decal/vg_decals/atmos/air{ dir = 8 @@ -74212,6 +75297,17 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/station/engineering/break_room) +"wTa" = ( +/obj/machinery/button/transport/tram/directional/south{ + id = 1; + specific_transport_id = "moon_1" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/camera/autoname/directional/south{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/terminal/lobby) "wTd" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -74259,6 +75355,14 @@ "wTv" = ( /turf/open/floor/iron, /area/station/common/pool) +"wTI" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "wTR" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/costume/nyangirl, @@ -74279,9 +75383,30 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/engine, /area/station/science/xenobiology) +"wTW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "wUf" = ( /turf/closed/wall, /area/station/command/meeting_room) +"wUj" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/brig) "wUs" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/abandon_art_studio) @@ -74363,12 +75488,6 @@ /obj/effect/turf_decal/vg_decals/numbers/six, /turf/open/floor/iron, /area/station/cargo/storage) -"wWk" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable, -/obj/structure/railing, -/turf/open/openspace, -/area/station/cargo/miningdock) "wWr" = ( /obj/structure/chair/sofa/corp/right{ dir = 1 @@ -74379,6 +75498,11 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/command/cc_dock) +"wWs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/tcommsat/computer) "wWt" = ( /obj/machinery/power/solar_control{ id = "aisolar"; @@ -74390,6 +75514,14 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"wWu" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable, +/obj/structure/railing, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningdock) "wWw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/firealarm/directional/east, @@ -74465,6 +75597,13 @@ /obj/machinery/camera/autoname/minisat/directional/south, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"wXG" = ( +/obj/structure/stone_tile/block, +/obj/structure/stone_tile{ + dir = 1 + }, +/turf/open/misc/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "wXK" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/filled/warning, @@ -74516,6 +75655,15 @@ /obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"wYt" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage) "wYv" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, @@ -74586,13 +75734,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"wYQ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/effect/spawner/random/vending/snackvend, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) "wYU" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -74619,14 +75760,6 @@ initial_gas_mix = "n2=100;TEMP=293.15" }, /area/station/maintenance/gag_room) -"wZw" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/recreation) "wZL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -75012,6 +76145,18 @@ "xgq" = ( /turf/closed/wall, /area/station/security/checkpoint/medical) +"xgz" = ( +/obj/structure/stone_tile/surrounding_tile/cracked, +/obj/structure/stone_tile/center, +/obj/structure/stone_tile/surrounding_tile{ + dir = 1 + }, +/obj/structure/stone_tile/surrounding_tile{ + dir = 8 + }, +/obj/structure/stone_tile/surrounding_tile/cracked, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "xgJ" = ( /obj/machinery/door/airlock/research{ name = "Circuit Testing Lab" @@ -75157,6 +76302,15 @@ "xiW" = ( /turf/closed/wall, /area/station/maintenance/abandon_arcade) +"xje" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "xjr" = ( /obj/effect/turf_decal/siding/yellow{ dir = 1 @@ -75164,6 +76318,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"xjA" = ( +/obj/machinery/light/warm/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/effect/spawner/random/structure/table, +/obj/structure/towel_bin, +/turf/open/floor/iron/showroomfloor, +/area/station/commons/toilet/locker) "xjC" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -75196,6 +76357,13 @@ dir = 1 }, /area/station/engineering/atmos/hallway) +"xkn" = ( +/obj/machinery/holopad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "xkB" = ( /obj/effect/turf_decal/stripes/end{ dir = 4 @@ -75403,17 +76571,6 @@ /obj/effect/spawner/random/burgerstation/odd, /turf/open/floor/plating, /area/station/construction) -"xoj" = ( -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/wood{ - id_tag = "dorms2"; - name = "Dorms 2" - }, -/turf/open/floor/wood, -/area/station/commons/dorms/room2) "xor" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75434,6 +76591,19 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) +"xoA" = ( +/obj/machinery/door/airlock/atmos/glass{ + name = "Atmospherics HFR Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos/hfr_room) "xoP" = ( /obj/structure/railing, /turf/open/floor/catwalk_floor/rust/moonstation, @@ -75510,33 +76680,6 @@ /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/iron, /area/station/cargo/warehouse) -"xqx" = ( -/obj/structure/bed/double{ - dir = 1 - }, -/obj/item/bedsheet/dorms_double{ - dir = 1 - }, -/obj/item/pillow/random{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/pillow/random{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/effect/landmark/start/hangover, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/machinery/button/door/directional/south{ - id = "dorms3"; - name = "Dorms Bolt Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/carpet/blue, -/area/station/commons/dorms/room3) "xqE" = ( /obj/machinery/status_display/evac/directional/south, /obj/effect/landmark/secequipment, @@ -75588,6 +76731,18 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/cargo/miningdock) +"xrs" = ( +/obj/structure/stone_tile/block/burnt{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "xrA" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -75677,6 +76832,18 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/corner, /area/station/commons/storage/primary) +"xtg" = ( +/obj/machinery/door/airlock/security/glass{ + name = "Security Equipment Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/brig, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "xti" = ( /obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/holiday/rainbow/half{ @@ -75763,6 +76930,18 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/eva_shed) +"xuM" = ( +/obj/structure/stone_tile/block{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "xuO" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -75916,6 +77095,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) +"xxg" = ( +/obj/structure/table/wood, +/obj/structure/cable, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/decoration/ornament, +/turf/open/floor/carpet/royalblack, +/area/station/commons/dorms/room4) "xxj" = ( /obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron/dark, @@ -75964,6 +77150,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"xxW" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "chem_shutters"; + name = "Privacy Shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/medical/chemistry) "xxX" = ( /obj/structure/reagent_dispensers/foamtank, /obj/effect/turf_decal/tile/yellow/fourcorners, @@ -76036,14 +77231,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/aft) -"xyu" = ( -/obj/structure/destructible/cult/item_dispenser/archives/library, -/obj/item/book/codex_gigas, -/obj/machinery/airalarm/directional/north, -/obj/item/storage/photo_album/library, -/obj/effect/mapping_helpers/burnt_floor, +"xyw" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/vending/cigarette, /turf/open/floor/iron/dark, -/area/station/service/library/private) +/area/station/hallway/primary/tram/left) "xyJ" = ( /obj/item/skub{ name = "nuclear skub"; @@ -76118,6 +77310,20 @@ "xzk" = ( /turf/open/genturf, /area/lavaland/underground/unexplored/danger) +"xzl" = ( +/obj/structure/table/reinforced, +/obj/item/storage/barricade, +/obj/machinery/door/window/brigdoor/right/directional/north{ + req_access = list("armory"); + name = "Warden's Desk" + }, +/obj/machinery/door/window/right/directional/south{ + name = "Warden's Desk" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/warden) "xzo" = ( /obj/effect/landmark/start/clown, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -76341,29 +77547,11 @@ "xCa" = ( /turf/closed/wall, /area/station/maintenance/abandon_cafeteria/hydro) -"xCe" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "xCf" = ( /obj/effect/spawner/random/trash/grime, /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/central) -"xCm" = ( -/obj/machinery/door/airlock/external{ - name = "Solar Maintenance" - }, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/maint) "xCo" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -76383,15 +77571,6 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/dark, /area/station/engineering/atmos/asteroid) -"xCE" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/tcommsat/computer) "xCO" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -76586,6 +77765,12 @@ /obj/structure/rack, /turf/open/floor/plating, /area/station/maintenance/port) +"xEN" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "xEQ" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/firealarm/directional/east, @@ -76751,6 +77936,10 @@ /obj/effect/spawner/random/trash/bacteria, /turf/open/floor/plating, /area/station/maintenance/aft) +"xHe" = ( +/obj/structure/stone_tile/block, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "xHg" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -76917,18 +78106,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/drone_bay) -"xKC" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/airlock/highsecurity{ - name = "AI Power Station" - }, -/obj/effect/landmark/navigate_destination/autoname, -/obj/effect/mapping_helpers/airlock/access/any/command/minisat, -/obj/effect/mapping_helpers/airlock/access/any/engineering/general, -/turf/open/floor/plating, -/area/station/ai_monitored/turret_protected/aisat/maint) "xKI" = ( /obj/machinery/exodrone_launcher, /obj/effect/turf_decal/stripes/line{ @@ -77168,6 +78345,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central) +"xOX" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 1 + }, +/obj/structure/stone_tile/cracked{ + dir = 4 + }, +/obj/structure/stone_tile/surrounding_tile/cracked{ + dir = 8 + }, +/turf/open/lava/smooth/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "xPb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/pink/visible, @@ -77197,31 +78387,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"xPo" = ( -/obj/machinery/button/door/directional/west{ - id = "hop"; - name = "Privacy Shutters Control" - }, -/obj/machinery/button/door/directional/west{ - id = "hopqueue"; - name = "Line Shutters Control"; - pixel_y = -9 - }, -/obj/machinery/button/flasher{ - id = "hopflash"; - pixel_x = -32; - pixel_y = 8 - }, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/effect/landmark/start/head_of_personnel, -/obj/machinery/button/ticket_machine{ - pixel_x = -35; - pixel_y = -4 - }, -/turf/open/floor/carpet/purple, -/area/station/command/heads_quarters/hop) "xPv" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/caution/stand_clear/red, @@ -77304,11 +78469,6 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"xQO" = ( -/obj/structure/lattice/catwalk, -/obj/structure/railing/corner, -/turf/open/openspace, -/area/station/cargo/miningdock) "xQU" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/stripes/line{ @@ -77519,18 +78679,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) -"xTw" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "xTz" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -77689,10 +78837,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/space_hut) -"xVq" = ( -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/station/medical/chemistry) "xVt" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/light/warm/directional/east, @@ -77882,11 +79026,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/terminal/lobby) -"xXX" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/closet/emcloset, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/tram/left) "xXZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -78112,12 +79251,6 @@ /obj/structure/sign/poster/contraband/atmosia_independence/directional/west, /turf/open/floor/engine, /area/station/engineering/atmos/project) -"ybe" = ( -/obj/machinery/door/airlock/tram, -/obj/structure/transport/linear/tram, -/obj/structure/thermoplastic/light, -/turf/open/floor/plating, -/area/station/terminal/lobby) "ybf" = ( /turf/closed/wall/r_wall/rust, /area/station/cargo/miningdock) @@ -78164,27 +79297,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison) -"ybF" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor/right/directional/east{ - req_access = list("armory"); - name = "Warden's Desk" - }, -/obj/machinery/door/window/left/directional/west{ - base_state = "right"; - icon_state = "right"; - name = "Warden's Desk" - }, -/obj/item/papercutter{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/station/security/warden) "ybW" = ( /obj/machinery/portable_atmospherics/pump, /obj/effect/turf_decal/box/blue, @@ -78264,13 +79376,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) -"ycT" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/catwalk_floor, -/area/station/maintenance/port/aft) "ycU" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -78315,6 +79420,13 @@ /obj/item/assembly/mousetrap/armed, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"ydN" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "ydO" = ( /obj/structure/cable, /obj/effect/spawner/random/maintenance, @@ -78385,13 +79497,6 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/plating, /area/station/maintenance/port) -"yeq" = ( -/obj/structure/table/wood, -/obj/effect/spawner/random/entertainment/plushie_delux, -/obj/structure/cable, -/obj/machinery/light/small/directional/north, -/turf/open/floor/carpet/red, -/area/station/commons/dorms/room1) "yeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -78498,21 +79603,6 @@ }, /turf/open/floor/iron, /area/station/cargo/blacksmith) -"ygT" = ( -/obj/effect/turf_decal/siding/wood, -/obj/structure/table/wood/fancy/black, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/item/clothing/mask/balaclava/threehole{ - name = "three hole holy balaclava"; - desc = "Triple the holy."; - pixel_y = -6 - }, -/obj/structure/window/reinforced/spawner/directional/north, -/obj/effect/turf_decal/tile/bar/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/starboard) "ygV" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -78693,15 +79783,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"yjr" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/wood, -/area/station/commons/lounge) "yjD" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -78826,10 +79907,6 @@ /obj/structure/falsewall, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"ylC" = ( -/obj/structure/displaycase/curator, -/turf/open/floor/iron/dark, -/area/station/service/library/private) "ylN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81359,13 +82436,13 @@ iSq iSq iSq iSq -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk iSq iSq iSq @@ -81600,46 +82677,46 @@ iSq iSq iSq iSq -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk iSq iSq iSq @@ -81802,13 +82879,13 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk iSq iSq iSq @@ -81833,65 +82910,65 @@ iSq iSq iSq iSq -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -82059,96 +83136,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -82316,96 +83393,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -82573,96 +83650,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -82830,96 +83907,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -83087,96 +84164,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -83344,96 +84421,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -83601,96 +84678,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -83858,96 +84935,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -84115,96 +85192,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -84372,96 +85449,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -84629,96 +85706,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -84886,96 +85963,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -85143,96 +86220,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -85400,96 +86477,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -85657,96 +86734,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -85914,96 +86991,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -86171,96 +87248,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -86428,96 +87505,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -86685,96 +87762,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -86942,96 +88019,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -87199,96 +88276,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -87456,96 +88533,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -110072,96 +111149,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -110329,96 +111406,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -110586,96 +111663,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -110843,96 +111920,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -111100,96 +112177,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -111357,96 +112434,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -111614,96 +112691,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -111871,96 +112948,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -112128,96 +113205,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -112385,96 +113462,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -112642,96 +113719,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -112899,96 +113976,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -113156,96 +114233,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -113413,96 +114490,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -113670,96 +114747,96 @@ xzk xzk xzk xzk -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM -vfM +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk +xzk xzk xzk xzk @@ -118439,68 +119516,68 @@ iSq iSq "} (155,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -118696,68 +119773,68 @@ iSq iSq "} (156,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -118953,68 +120030,68 @@ iSq iSq "} (157,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -119210,68 +120287,68 @@ iSq iSq "} (158,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -119467,68 +120544,68 @@ iSq iSq "} (159,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -119724,68 +120801,68 @@ iSq iSq "} (160,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -119981,68 +121058,68 @@ iSq iSq "} (161,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -120238,68 +121315,68 @@ iSq iSq "} (162,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -120495,68 +121572,68 @@ iSq iSq "} (163,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -120752,68 +121829,68 @@ iSq iSq "} (164,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -121009,68 +122086,68 @@ iSq iSq "} (165,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -121266,68 +122343,68 @@ iSq iSq "} (166,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -121523,68 +122600,68 @@ iSq iSq "} (167,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -121780,68 +122857,68 @@ iSq iSq "} (168,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -122037,68 +123114,68 @@ iSq iSq "} (169,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -122294,68 +123371,68 @@ iSq iSq "} (170,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -122551,68 +123628,68 @@ iSq iSq "} (171,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -122808,68 +123885,68 @@ iSq iSq "} (172,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -123065,68 +124142,68 @@ iSq iSq "} (173,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -123322,68 +124399,68 @@ iSq iSq "} (174,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -123579,68 +124656,68 @@ iSq iSq "} (175,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -123836,68 +124913,68 @@ iSq iSq "} (176,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -124093,68 +125170,68 @@ iSq iSq "} (177,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -124350,68 +125427,68 @@ iSq iSq "} (178,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -124607,68 +125684,68 @@ iSq iSq "} (179,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -124864,68 +125941,68 @@ iSq iSq "} (180,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -125121,68 +126198,68 @@ iSq iSq "} (181,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -125378,68 +126455,68 @@ iSq iSq "} (182,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +iSq +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -125635,68 +126712,68 @@ iSq iSq "} (183,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -125892,68 +126969,68 @@ iSq iSq "} (184,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -126149,68 +127226,68 @@ iSq iSq "} (185,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -126406,68 +127483,68 @@ iSq iSq "} (186,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -126663,68 +127740,68 @@ iSq iSq "} (187,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -126920,68 +127997,68 @@ iSq iSq "} (188,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -127177,68 +128254,68 @@ iSq iSq "} (189,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -127434,68 +128511,68 @@ iSq iSq "} (190,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -127691,68 +128768,68 @@ iSq iSq "} (191,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -127948,68 +129025,68 @@ iSq iSq "} (192,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -128205,68 +129282,68 @@ iSq iSq "} (193,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -128462,68 +129539,68 @@ iSq iSq "} (194,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -128719,68 +129796,68 @@ iSq iSq "} (195,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -128976,68 +130053,68 @@ iSq iSq "} (196,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -129233,68 +130310,68 @@ iSq iSq "} (197,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -129490,68 +130567,68 @@ iSq iSq "} (198,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -129747,68 +130824,68 @@ iSq iSq "} (199,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -130004,68 +131081,68 @@ iSq iSq "} (200,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -130261,68 +131338,68 @@ iSq iSq "} (201,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -130518,68 +131595,68 @@ iSq iSq "} (202,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -130775,68 +131852,68 @@ iSq iSq "} (203,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -131032,68 +132109,68 @@ iSq iSq "} (204,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -131289,68 +132366,68 @@ iSq iSq "} (205,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -131546,68 +132623,68 @@ iSq iSq "} (206,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -131803,68 +132880,68 @@ iSq iSq "} (207,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -132060,68 +133137,68 @@ iSq iSq "} (208,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -132317,68 +133394,68 @@ iSq iSq "} (209,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -132574,68 +133651,68 @@ iSq iSq "} (210,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -132831,68 +133908,68 @@ iSq iSq "} (211,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -133088,68 +134165,68 @@ iSq iSq "} (212,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -133345,68 +134422,68 @@ iSq iSq "} (213,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -133602,68 +134679,68 @@ iSq iSq "} (214,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -133859,68 +134936,68 @@ iSq iSq "} (215,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -134116,68 +135193,68 @@ iSq iSq "} (216,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -134373,68 +135450,68 @@ iSq iSq "} (217,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -134630,68 +135707,68 @@ iSq iSq "} (218,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -134887,68 +135964,68 @@ iSq iSq "} (219,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -135144,68 +136221,68 @@ iSq iSq "} (220,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -135401,68 +136478,68 @@ iSq iSq "} (221,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -135658,68 +136735,68 @@ iSq iSq "} (222,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -135915,68 +136992,68 @@ iSq iSq "} (223,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -136172,68 +137249,68 @@ iSq iSq "} (224,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -136429,68 +137506,68 @@ iSq iSq "} (225,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -136686,68 +137763,68 @@ iSq iSq "} (226,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -136943,68 +138020,68 @@ iSq iSq "} (227,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -137200,68 +138277,68 @@ iSq iSq "} (228,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -137457,68 +138534,68 @@ iSq iSq "} (229,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -137714,68 +138791,68 @@ iSq iSq "} (230,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -137971,68 +139048,68 @@ iSq iSq "} (231,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -138228,68 +139305,68 @@ iSq iSq "} (232,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -138485,68 +139562,68 @@ iSq iSq "} (233,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -138742,68 +139819,68 @@ iSq iSq "} (234,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -138999,68 +140076,68 @@ iSq iSq "} (235,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +xgz +cNR +gSv +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -139256,68 +140333,68 @@ iSq iSq "} (236,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -139513,68 +140590,68 @@ iSq iSq "} (237,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +paK +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -139770,68 +140847,68 @@ iSq iSq "} (238,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -140027,68 +141104,68 @@ iSq iSq "} (239,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +oVG +oVG +hsI +mfi +mfi +mfi +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -140284,68 +141361,68 @@ iSq iSq "} (240,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +wHo +nBt +dfO +nNi +nvk +mfi +nIV +hsI +hsI +fmq +fmq +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +oUi +iSq +iSq +iSq +iSq +oUi +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -140541,68 +141618,68 @@ iSq iSq "} (241,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +qAi +xgz +cNR +gSv +kPK +mfi +mfi +nJi +hsI +fmq +fmq +fmq +fmq +fmq +mmw +iOs +iOs +iOs +iOs +nfU +cOb +pzk +iyl +cOb +pzk +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -140798,68 +141875,68 @@ iSq iSq "} (242,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +ubE +hqK +lST +rnX +gxb +mfi +mfi +nJi +hsI +fmq +fmq +fmq +fmq +mmw +mmw +iOs +iOs +iOs +iOs +dJi +plJ +srs +vvu +fQr +qqx +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -141055,68 +142132,68 @@ iSq iSq "} (243,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +qAi +sYP +wkJ +wIG +wXG +mfi +mfi +nJi +hsI +fmq +fmq +fmq +mmw +mmw +mmw +iOs +iOs +iOs +iOs +sgf +wOe +wOe +lKH +sgf +liK +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -141312,68 +142389,68 @@ iSq iSq "} (244,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hkQ +oVG +vPL +oVG +pkQ +mfi +nIV +hsI +hsI +fmq +fmq +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +oUi +iSq +iSq +iSq +iSq +oUi +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +iOs +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -141569,68 +142646,68 @@ iSq iSq "} (245,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +nBt +nBt +hsI +mfi +mfi +mfi +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -141826,68 +142903,68 @@ iSq iSq "} (246,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -142083,68 +143160,68 @@ iSq iSq "} (247,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +paK +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -142340,68 +143417,68 @@ iSq iSq "} (248,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -142597,68 +143674,68 @@ iSq iSq "} (249,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +sYP +wkJ +wIG +hsI +hsI +hsI +hsI +mmw +mmw +mmw +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -142854,68 +143931,68 @@ iSq iSq "} (250,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +mmw +fmq +fmq +fmq +mmw +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -143111,68 +144188,68 @@ iSq iSq "} (251,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +mmw +fmq +fmq +fmq +fmq +fmq +mmw +iOs +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -143368,68 +144445,68 @@ iSq iSq "} (252,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +iOs +iOs +iOs +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -143625,68 +144702,68 @@ iSq iSq "} (253,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +iOs +iSq +iSq +iSq +iSq +iOs +iOs +iOs +iOs +iOs +iOs +iOs +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -143882,68 +144959,68 @@ iSq iSq "} (254,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +iSq +iSq +iSq +iSq +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -144139,68 +145216,68 @@ iSq iSq "} (255,1,1) = {" -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk -xzk +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +fmq +iSq +iSq +iSq +iSq +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +jmy +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM +vfM xzk xzk xzk @@ -163575,7 +164652,7 @@ lUL lUL lUL ogU -lbl +lIg dse ogU mHl @@ -164343,10 +165420,10 @@ sSg sSg oGo ogU -huW -huW -huW -huW +sfS +sfS +sfS +sfS itR bbs lUL @@ -164600,10 +165677,10 @@ sSg sSg oGo ogU -huW -huW -huW -huW +sfS +sfS +sfS +sfS ihX kLy lUL @@ -164857,10 +165934,10 @@ sSg sSg oGo ogU -huW -huW -huW -huW +sfS +sfS +sfS +sfS hjR kLy lUL @@ -165114,10 +166191,10 @@ sSg sSg oGo ogU -huW -huW -huW -huW +sfS +sfS +sfS +sfS itR rNm lUL @@ -165377,9 +166454,9 @@ ogU ogU ogU ogU -ojS -uNO -ojS +syG +cWP +syG exa ycu bLJ @@ -166662,7 +167739,7 @@ ltx sSg kJH cmV -rdL +iEV hOs eBs cmV @@ -195283,8 +196360,8 @@ jnN jnN "} (199,1,2) = {" -jnN -jnN +kJH +kJH jnN jnN jnN @@ -195540,8 +196617,8 @@ jnN jnN "} (200,1,2) = {" -jnN -jnN +kJH +kJH jnN jnN jnN @@ -195797,9 +196874,9 @@ jnN jnN "} (201,1,2) = {" -jnN -jnN -jnN +kJH +kJH +kJH jnN jnN jnN @@ -196054,9 +197131,9 @@ jnN jnN "} (202,1,2) = {" -jnN -jnN -jnN +kJH +kJH +kJH jnN jnN jnN @@ -196311,10 +197388,10 @@ jnN jnN "} (203,1,2) = {" -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH jnN jnN jnN @@ -196568,10 +197645,10 @@ jnN jnN "} (204,1,2) = {" -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH jnN jnN jnN @@ -196825,10 +197902,10 @@ jnN jnN "} (205,1,2) = {" -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH jnN jnN jnN @@ -197082,11 +198159,11 @@ jnN jnN "} (206,1,2) = {" -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -197339,11 +198416,11 @@ jnN jnN "} (207,1,2) = {" -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -197596,11 +198673,11 @@ jnN jnN "} (208,1,2) = {" -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -197853,13 +198930,13 @@ jnN jnN "} (209,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -198110,13 +199187,13 @@ jnN jnN "} (210,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -198367,13 +199444,13 @@ jnN jnN "} (211,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -198624,13 +199701,13 @@ jnN jnN "} (212,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -198881,15 +199958,15 @@ jnN jnN "} (213,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -199138,15 +200215,15 @@ jnN jnN "} (214,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -199395,16 +200472,16 @@ jnN jnN "} (215,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -199652,16 +200729,16 @@ jnN jnN "} (216,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -199909,17 +200986,17 @@ jnN jnN "} (217,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -200166,18 +201243,18 @@ jnN jnN "} (218,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -200423,18 +201500,18 @@ jnN jnN "} (219,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -200680,18 +201757,18 @@ jnN jnN "} (220,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -200937,18 +202014,18 @@ jnN jnN "} (221,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -201194,18 +202271,18 @@ jnN jnN "} (222,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -201451,20 +202528,20 @@ jnN jnN "} (223,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -201708,21 +202785,21 @@ jnN jnN "} (224,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -201965,22 +203042,22 @@ jnN jnN "} (225,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -202222,23 +203299,23 @@ jnN jnN "} (226,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -202479,23 +203556,23 @@ jnN jnN "} (227,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -202736,24 +203813,24 @@ jnN jnN "} (228,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -202993,25 +204070,25 @@ jnN jnN "} (229,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -203250,25 +204327,25 @@ jnN jnN "} (230,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -203507,24 +204584,24 @@ jnN jnN "} (231,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -203764,24 +204841,24 @@ jnN jnN "} (232,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +sSg jnN jnN jnN @@ -204021,24 +205098,24 @@ jnN jnN "} (233,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +sSg +sSg jnN jnN jnN @@ -204278,25 +205355,25 @@ jnN jnN "} (234,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kJH +kJH +kJH +kJH +kJH +kJH +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -204535,26 +205612,26 @@ jnN jnN "} (235,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +xgz +cNR +gSv +hsI +hsI +hsI +hsI +kJH +kJH +kJH +kJH +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -204792,26 +205869,26 @@ jnN jnN "} (236,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -205049,26 +206126,26 @@ jnN jnN "} (237,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +brQ +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -205306,27 +206383,27 @@ jnN jnN "} (238,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -205563,27 +206640,27 @@ jnN jnN "} (239,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +hsI +hsI +hsI +hsI +kJH +kJH +kJH +sSg +sSg +sSg +sSg +kJH +kJH +sSg +sSg +sSg jnN jnN jnN @@ -205820,27 +206897,27 @@ jnN jnN "} (240,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +nIV +hsI +hsI +ayT +hsI +hsI +hsI +hsI +bpi +sSg +sSg +sSg +kJH +kJH +kJH +kJH +sSg jnN jnN jnN @@ -206077,27 +207154,27 @@ jnN jnN "} (241,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +xgz +mfi +mfi +mfi +nJi +hsI +dic +dic +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +kJH +kJH +kJH +sSg jnN jnN jnN @@ -206334,27 +207411,27 @@ jnN jnN "} (242,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hqK +mfi +mfi +mfi +nJi +hsI +dic +dic +mfi +mfi +eez +bpi +sSg +sSg +sSg +sSg +kJH +kJH +kJH +sSg jnN jnN jnN @@ -206591,28 +207668,28 @@ jnN jnN "} (243,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +sYP +mfi +mfi +mfi +nJi +hsI +dic +dic +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -206848,28 +207925,28 @@ jnN jnN "} (244,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +nIV +hsI +hsI +ayT +hsI +hsI +hsI +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -207105,28 +208182,28 @@ jnN jnN "} (245,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +hsI +hsI +hsI +hsI +kJH +kJH +kJH +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -207362,28 +208439,28 @@ jnN jnN "} (246,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +kJH +kJH jnN jnN jnN @@ -207619,29 +208696,29 @@ jnN jnN "} (247,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +brQ +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +kJH +kJH +kJH +kJH jnN jnN jnN @@ -207876,29 +208953,29 @@ jnN jnN "} (248,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +mfi +mfi +mfi +mfi +mfi +mfi +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +kJH +kJH +kJH +kJH jnN jnN jnN @@ -208133,29 +209210,29 @@ jnN jnN "} (249,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +sYP +wkJ +wIG +hsI +hsI +hsI +hsI +bpi +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +sSg +kJH +kJH +kJH +kJH jnN jnN jnN @@ -208390,29 +209467,29 @@ jnN jnN "} (250,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kJH +kJH +kJH +kJH +kJH +kJH +sSg +sSg +sSg +sSg +sSg +kJH +kJH +kJH +kJH jnN jnN jnN @@ -208647,28 +209724,28 @@ jnN jnN "} (251,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +sSg +sSg +sSg +sSg +sSg +sSg jnN jnN jnN @@ -208904,28 +209981,28 @@ jnN jnN "} (252,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +sSg +sSg jnN jnN jnN @@ -209161,27 +210238,27 @@ jnN jnN "} (253,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -209418,27 +210495,27 @@ jnN jnN "} (254,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -209675,27 +210752,27 @@ jnN jnN "} (255,1,2) = {" -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN -jnN +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH +kJH jnN jnN jnN @@ -210851,7 +211928,7 @@ kUC stM stM stM -stM +gUE stM vmO vmO @@ -211108,7 +212185,7 @@ stM stM stM stM -stM +gUE stM vmO vmO @@ -211365,7 +212442,7 @@ stM stM stM stM -stM +gUE vmO vmO vmO @@ -211622,7 +212699,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -211879,7 +212956,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -212114,7 +213191,7 @@ sDL tjZ eUc geh -sDL +bXc tHD bGx kxs @@ -212136,7 +213213,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -212367,11 +213444,11 @@ nVl voO iNo yhM -jKF +jhI fil uiv geh -ndO +jhI tHD pQX fux @@ -212393,7 +213470,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -212624,11 +213701,11 @@ fhy iNo iNo yhM -pJF -lby +tkl +gZD syH -beV -mWO +sjt +tkl tHD eii fux @@ -212650,7 +213727,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -212882,7 +213959,7 @@ crT iNo yhM mdG -gZD +dRe fwM geh mdG @@ -212907,7 +213984,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -213138,11 +214215,11 @@ fhy iNo iNo mCd -ybe +oTh iWG kBx iMX -sDL +oOK tHD asy sfL @@ -213164,7 +214241,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -213399,7 +214476,7 @@ sqG iWG eNL iMX -sDL +tFI tHD asy wpy @@ -213421,7 +214498,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -213678,7 +214755,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -213907,8 +214984,8 @@ idX idX lLr cOG -dAT -idX +wTa +ooF ocT dmG vzC @@ -213935,7 +215012,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -214192,7 +215269,7 @@ lzN lzN lzN stM -vmO +gUE vmO vmO vmO @@ -214421,8 +215498,8 @@ ahL ahL ahL ahL -dQk -idX +vza +kRC scN gEj cHz @@ -214449,7 +215526,7 @@ stM stM stM stM -vmO +gUE vmO vmO vmO @@ -214705,8 +215782,8 @@ wBG stM stM stM -vmO -vmO +stM +gUE vmO vmO vmO @@ -214945,7 +216022,7 @@ pNG agV lnY oYE -kUC +eQn stM stM stM @@ -214961,9 +216038,9 @@ wBG wBG stM stM -vmO -vmO -vmO +stM +stM +gUE vmO vmO vmO @@ -215210,17 +216287,17 @@ stM stM stM stM -vmO -vmO stM stM stM stM stM -vmO -vmO -vmO -vmO +stM +stM +stM +stM +stM +gUE vmO vmO vmO @@ -215459,25 +216536,25 @@ pNG stM stM stM -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +eQn +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE +gUE vmO vmO vmO @@ -227783,8 +228860,8 @@ stM stM stM rWd -qCs -wYQ +dfi +pmZ kWj hZv rgE @@ -228299,7 +229376,7 @@ stM rWd hdn dBn -avW +gVd hZv fzs wuM @@ -229067,8 +230144,8 @@ stM jWC eYR mAX -vQx -jhQ +mQv +auc eEv avW aWa @@ -229111,7 +230188,7 @@ lWk lWk lWk wUs -lbl +lIg fAe ogU flE @@ -229325,7 +230402,7 @@ iJZ wxh iJZ iJZ -hdn +jhQ eEv avW aWa @@ -229596,7 +230673,7 @@ ckk dKC dly iGQ -lts +koW oHP oHP oHP @@ -229608,7 +230685,7 @@ oHP oHP oHP oHP -lts +koW lcL dKC tCA @@ -229879,10 +230956,10 @@ trl tAw tCA caW -huW -huW -huW -huW +sfS +sfS +sfS +sfS itR dWW wBG @@ -230095,7 +231172,7 @@ nhR uuM cTt uuM -xXX +ePo hdn eEv avW @@ -230136,10 +231213,10 @@ ckk tAw tCA caW -huW -huW -huW -huW +sfS +sfS +sfS +sfS hFd jIr wBG @@ -230352,7 +231429,7 @@ rDA uuM fPP uuM -xXX +qDL hdn eEv avW @@ -230380,7 +231457,7 @@ fVM tqS tqS tqS -nru +oSK hFm tVd jdz @@ -230393,10 +231470,10 @@ ckk tAw nWw caW -huW -huW -huW -huW +sfS +sfS +sfS +sfS lgh jIr wBG @@ -230609,11 +231686,11 @@ oeP uuM pGB uuM -pOt +qup hdn eEv -mlr -hZv +lCP +fVB fzs wuM eWR @@ -230650,10 +231727,10 @@ ckk hYX bHS caW -huW -huW -huW -huW +sfS +sfS +sfS +sfS itR qpx wBG @@ -230866,10 +231943,10 @@ szg uuM umj uuM -pOt +xyw hdn ekx -eoi +htP hZv ddm jok @@ -231120,13 +232197,13 @@ uuM kir gzO iXX -kNj +qgU umj uuM -uuM -jnv +koi +hdn dXC -oZm +kVm hZv mNe mNe @@ -231377,13 +232454,13 @@ uuM uuM gfv uuM -uru +sWK umj -dOc uuM +hZv fbx ufI -gDH +fQQ hZv hZv rWd @@ -231391,7 +232468,7 @@ rWd rWd hZv ckk -tCA +ckk tCA lay ckk @@ -231431,9 +232508,9 @@ xZh dDw hvS wLw -jOe -hfr -eml +hVQ +qdk +rid ugD eYR ntT @@ -231634,22 +232711,22 @@ vgK tZX sZK iod -rru +wRc umj -rru uuM -mVE +fBG +hdn hvA -cgD +kmn rCe oFB rCe rCe rCe -vAa +edh +clg ckk gxW -ckk lay ckk iFm @@ -231688,9 +232765,9 @@ vBQ vxW smP wLw -rcq -xQO -ssF +dWY +nRp +sud ugD jDn wBG @@ -231890,12 +232967,12 @@ vNc aYn wvI ofD -cQI +wHM vgK bKr -dER fal -vmK +qtv +gXh qyw oLF qyw @@ -231903,10 +232980,10 @@ qBQ ggO qvS qvS +qvS myt tSC mMA -mMA lxt ckk xsF @@ -231945,9 +233022,9 @@ wLw sWQ wLw wLw -qeJ -wWk -fWf +chN +wWu +mVb ugD hhT mSM @@ -232150,9 +233227,9 @@ dER gvN dER slJ -cOL uuM -cUK +rvJ +lFb cYb bQp vZt @@ -232160,10 +233237,10 @@ hvA qsC ndQ ndQ -rhV +ndQ +bKn ckk tCA -urd hCu toB iXA @@ -232408,7 +233485,7 @@ uuM uuM uuM uuM -uuM +raW raW raW raW @@ -232667,7 +233744,7 @@ cMM cMM raW sTm -riW +fNF raW qTx rko @@ -232923,9 +234000,9 @@ bHg rEd cMM raW -yeq +liv lyz -oIj +seY qTx pNH omV @@ -232993,7 +234070,7 @@ lYr kCN nLM fAd -uVG +pZC aAE hsu bno @@ -233450,7 +234527,7 @@ skT skT jLS hpb -wZw +wAT azl azl azl @@ -233695,7 +234772,7 @@ eTE cMM jfE rCy -iSu +guj jfE uOC rfj @@ -233950,10 +235027,10 @@ jYF jYF jzL jYF -jfE -lxy +jYF +mZF jdf -xoj +kVF xpG iJI rfj @@ -234207,7 +235284,7 @@ dGP bFc bFc gSE -jfE +jYF rAT ddp jfE @@ -234259,9 +235336,9 @@ qqt diK hta uzQ -qPC +lOw mXD -pXn +taT bjf jAO ith @@ -234464,7 +235541,7 @@ jYF jYF bNe jYF -kKy +jYF kKy kKy kKy @@ -234489,9 +235566,9 @@ cAq fQB cAq fQB -lpK +faW cAq -dGq +hIN hCV hCV hCV @@ -234723,7 +235800,7 @@ tAQ tQo kKy mYf -xqx +mxj kKy qTx dqZ @@ -234812,7 +235889,7 @@ tRl sKH sKH sKH -eDQ +qDI qBf wYP stM @@ -234979,9 +236056,9 @@ jjH jMq tQo kKy -pHD +nFG mWj -iXk +iwB qTx pNH dlD @@ -235069,7 +236146,7 @@ xyd uVn lxU iZb -eDQ +qDI qBf qBf qBf @@ -235326,7 +236403,7 @@ itb itb itb itb -dNK +tdl rdH vZH qBf @@ -235548,12 +236625,12 @@ raZ mXD xJp lSO -ktE +lge kiY qPv -ane -rLs -mSH +wDe +jZx +ewA wXW cDl biq @@ -235583,8 +236660,8 @@ clF soY cPE itb -eDQ -hLP +qDI +jKl tRw kAk ujT @@ -235751,7 +236828,7 @@ mid sCW tqb pdG -uuP +eHM sfz qTx pNH @@ -235841,14 +236918,14 @@ qQe pPG itb lnh -kVv +ydN qvC rdH mJD lxU hwS hpU -hHm +gqx rdH vOp cZX @@ -236007,9 +237084,9 @@ kBG egN kBG tqb -vri +xxg cjg -shx +tRV qTx pNH fqL @@ -236090,7 +237167,7 @@ itb pQk mnR mZQ -hEm +hPo aGH hPo mza @@ -236098,7 +237175,7 @@ xEw sBY itb aFl -kVv +ydN rdH rdH rdH @@ -236355,7 +237432,7 @@ pge sBY itb lLc -eDQ +qDI mYj rdH uLd @@ -236551,7 +237628,7 @@ mWk xRX wgJ bAf -jGc +xjA omT fKK cnc @@ -236567,7 +237644,7 @@ tYn tXC eIq sfN -bSI +qpb kQA jgF nWw @@ -236612,7 +237689,7 @@ dsK nGf itb rdH -rNc +cxW rdH rdH afE @@ -236862,14 +237939,14 @@ vHp ilD vML lNl -hpe +fqJ lNl lTP rZm xcm itb -hLP -eDQ +jKl +qDI rdH fTI pyR @@ -237075,9 +238152,9 @@ thX ckk gYW bXl -vGq -jUP -pdA +pqg +dyu +aAA bXl gug kxh @@ -237119,13 +238196,13 @@ hJa rKl wnp lPu -jqj +upw lPu aGq rKl aBy itb -eDQ +qDI iZb rdH qSN @@ -237332,9 +238409,9 @@ rhM ckk bSC bXl -xyu -imk -dzD +aJh +obA +gKP bXl bXl bXl @@ -237355,7 +238432,7 @@ epR oVZ gDI wPN -kLh +iNq tgc feM wXW @@ -237376,13 +238453,13 @@ lPu lPu lNl lNl -nxq +rkW lNl lNl lPu lPu itb -gbI +rmG sVs rdH wPp @@ -237393,9 +238470,9 @@ kJT xzV xzV rdH -ukM -rte -qho +bML +jfS +eDQ rFv lzB htx @@ -237557,8 +238634,8 @@ fnH pDK tYP bAP -qSE -nEY +fKx +pnG bSL nEY nEY @@ -237590,8 +238667,8 @@ ckk ncv bXl jQN -vmU -ylC +bBY +jNO jQN bXH cif @@ -237633,13 +238710,13 @@ czh wMc tlH pmQ -oKm -gzh -qyG -vqz -gpU +dCX +wWs +nby +vVS +bJB xvD -wGq +muq vqk rdH kyH @@ -237652,7 +238729,7 @@ rdH rdH rdH iZb -qho +eDQ rdH rdH rdH @@ -237844,7 +238921,7 @@ dMP kUn oIt nFk -epz +trd jxN jQN fKM @@ -237889,27 +238966,27 @@ itb pol lir xEo -ucW -gqo +itV +ckB cMo rnF klh -khR +qjD itb -eDQ +qDI rdH rdH rdH gcM rdH rdH -kii -qho -ycT -qho -gHY -qho -qho +pGF +dkU +uzs +dkU +pGF +dkU +eDQ iZb cxD tqY @@ -238149,24 +239226,24 @@ cIB cAz maI lqM -xCE -oeO -uJp +sFq +tKS +uQo itb -gHY -qho -ycT -qho -kii -qho -qho -qho +jKl +qDI +ydN +qDI +pGF +dkU +dkU +dkU itb itb itb itb itb -ttA +jLC itb itb itb @@ -238406,24 +239483,24 @@ lPu lPu lNl lPu -awt +qTH lPu lNl itb -uAB +xoR iZb rdH lxU lxU xci iZb -ixa +kif itb qmv uSM oHf itb -dJB +qiA itb rBK rBK @@ -238590,7 +239667,7 @@ kOS kOS kOS kOS -vhZ +mzl pjQ pjQ pjQ @@ -238660,27 +239737,27 @@ clb guy wCP tEU -anb +rPa oLm -lpR -rRV -aXj -nSz -btG -rHK +hLj +mpE +snQ +xEN +kTl +pPW xci rdH rdH rdH rdH rdH -ocp +wSI itb sWu sWu sWu fqv -iOl +gOA txl sWu sWu @@ -238830,7 +239907,7 @@ fKe bGa xDz gcI -bWp +aoh mfG nIv mbO @@ -238917,10 +239994,10 @@ ntF mRp fHR tEU -vmP -qXf -aXj -qLp +uly +oLm +gXL +mpE bXC tEU rdH @@ -238931,13 +240008,13 @@ deg jDI pQs eOF -dXw +iwJ ujG uoK tJx qUh qUh -cLc +kxC qUh qUh qUh @@ -239171,13 +240248,13 @@ vAC tOR rdH xmM -jPm +elF xmM tEU gcc snQ -aXj -qLp +dFU +mpE jmo tEU rHy @@ -239186,14 +240263,14 @@ cLy onm jFa cLy -cLy hDi +cLy dje -wyp -wtd -vKe -vKe -vKe +ify +bQG +rWi +rWi +rWi bQG bQG bQG @@ -239355,7 +240432,7 @@ bLh nEY htI rHZ -aeB +kEo vbS kCP rVp @@ -239431,20 +240508,20 @@ wyU roW emr tEU -qMP +uaM oLm -uZx -uTy -caK -rTg -egD -qAq -qAq -hrj -sME -pJQ -cSS -pJQ +kSZ +bZR +wTI +flw +dik +snB +snB +oLl +xje +aXA +aXA +aXA tiB ujG xFg @@ -239632,8 +240709,8 @@ iDX wsb cMt vfJ -yjr -osp +oaO +vjc tEm uuf lUc @@ -239688,9 +240765,9 @@ nQK gfE gWY tEU -qdf -vFH -jqs +diP +oLm +jik snQ pND tEU @@ -239700,7 +240777,7 @@ oXq oXq oXq oXq -vpw +eRR oXq ioc tlq @@ -239876,7 +240953,7 @@ xtC ehM lAu jjt -gPP +iDB rHZ wZn bHw @@ -239935,7 +241012,7 @@ rdH rdH mjM rdH -kOr +mZa nWj nch wyd @@ -239943,11 +241020,11 @@ lHC atY usy ecN -cvv -hOl -aPw -pbB -ceX +leq +rmL +wYt +qFS +gTx bAu xzw tEU @@ -240086,7 +241163,7 @@ wte ovy ovy ovy -clw +hAz ovy ovy mMM @@ -240837,7 +241914,7 @@ wBG stM stM lEK -rZk +qJR iAs uUJ uUJ @@ -241094,7 +242171,7 @@ wBG stM stM lEK -aTl +dxS uUJ uUJ uUJ @@ -241118,9 +242195,9 @@ ovy ovy fLe ydw -tpG +iTO pdy -lpd +vCb agd stM stM @@ -241351,7 +242428,7 @@ wBG stM lEK lEK -oqb +ogT uUJ ilu uUJ @@ -241370,7 +242447,7 @@ kMM wte wte caf -jZC +acE dxz syq syq @@ -241984,7 +243061,7 @@ lAm mII gpA eba -bUX +pms hYH tRv dlr @@ -242114,13 +243191,13 @@ uFC uFC wBG uFC -qjw +oiP pED -xCm +fSC jml vYQ xXl -xKC +ttS sym qqS uUJ @@ -242167,7 +243244,7 @@ wUf nkH pFj wCr -ono +gRK xcK tRu ggl @@ -242691,7 +243768,7 @@ uuB vib btu hCK -hJz +pEQ poc eBJ vgd @@ -242784,7 +243861,7 @@ kYg npK okA oXq -vpw +eRR oXq ioc tlq @@ -242893,7 +243970,7 @@ wBG stM lEK lEK -onD +sUe uUJ ffk uUJ @@ -242912,7 +243989,7 @@ wNe wte wte vBw -pSA +mXb oQq syq syq @@ -243031,18 +244108,18 @@ bKL edN gGh rzQ -aQI -gWg -ayu -hkb -iIp -tne -jWy +sMI +cFA +miS +tXq +ezj +xkn +sEn rMJ -jWy -lvr -nqh -vSO +sEn +hno +bpa +kUw kXv ujG xaE @@ -243150,7 +244227,7 @@ wBG stM stM lEK -wjO +obh uUJ uUJ uUJ @@ -243174,9 +244251,9 @@ syq syq yaS fTH -seW +qJH tVp -lhT +mkV jAs nhl stM @@ -243286,8 +244363,8 @@ eAg dFQ bKL xlo -aFu -ycG +pQr +dtY ycG jiF iIt @@ -243298,8 +244375,8 @@ sSt npK vkY nYS -vkY eLh +vkY ukp cnP jyZ @@ -243407,7 +244484,7 @@ wBG stM stM lEK -sIR +cEY lqq uUJ uUJ @@ -243476,7 +244553,7 @@ kDT tTn lHW pzB -sDb +pBY lgw xFp qde @@ -243541,11 +244618,11 @@ mRq fRt fbY dFQ -jjv -lev -aii +ioa +vzU +kOq poT -lJc +eqH ktG mXF xlo @@ -244198,7 +245275,7 @@ wte eEW eEW eEW -bCr +bCl eEW eEW gil @@ -244270,7 +245347,7 @@ hpH qzk kgI rkT -wPD +hIA crh crh crh @@ -244473,10 +245550,10 @@ xoP sSp tmy eEr -fmQ +qzz eEr eEr -khz +hEi rzN aYs pJo @@ -244486,13 +245563,13 @@ mni rlA xeL oQH -xPo +vwO lha uwQ lRY oSL bLh -nEY +pOh tHl vgo kqk @@ -244530,8 +245607,8 @@ rkT wPD eMH mjW -tFC -uKH +lxe +iCv aYP kUu uUg @@ -244787,8 +245864,8 @@ rkT wPD eMH mjW -hEK -dJl +jMl +urn fNx aLo qjX @@ -244829,7 +245906,7 @@ pUe ktO xCq eZN -ssl +hpp kGT vDi mhK @@ -244981,7 +246058,7 @@ bok bok ulH ulH -stM +qQf feT agd rtH @@ -244989,7 +246066,7 @@ tIV bFT the uBJ -uBO +noV bxI bsQ gyW @@ -245041,9 +246118,9 @@ xHg lIM kAg rkT -kGG +wPD naw -rLc +jAB jmm kwN fNx @@ -245238,7 +246315,7 @@ eGx cQv fNv ulH -stM +wYP feT agd rKY @@ -245495,7 +246572,7 @@ pcu pcu vnR bok -stM +wYP feT pXD rKY @@ -245601,7 +246678,7 @@ eMz eMz eMz eMz -lsK +aHP dyQ eVI xCq @@ -245752,7 +246829,7 @@ nkw mlc nKP bok -stM +wYP feT jAs mir @@ -246009,7 +247086,7 @@ eJG xPg xiD iBA -stM +wYP trv nOM rKY @@ -246261,7 +247338,7 @@ jSp qTp clE jSp -mQt +vrH eSr oIS shs @@ -246781,7 +247858,7 @@ iQr lTt eoU tKl -vDH +vjw pUk jWv ath @@ -246810,10 +247887,10 @@ eqv eWe tYP wMM -lsz +ocq cbB wEJ -alu +cHh cbB aZY bQv @@ -247076,7 +248153,7 @@ wof bSs nxX bSs -coo +etb jLt wbI xdi @@ -247380,9 +248457,9 @@ bDf nBr fXs uSe -eIX +tqB fae -cfE +sVR uXm qWv ujV @@ -247588,13 +248665,13 @@ rkK kff aCN hDL -dcZ -woe -hWC +fzc +bSs +rcX aAO uWn wrD -xCe +ukP ooN vWS qTR @@ -247845,9 +248922,9 @@ oOH kZx ids bSs -vfG +iWg bSs -mcT +sfy kuc qXj bQf @@ -248102,13 +249179,13 @@ loJ mMW loJ ycI -afI -vxJ -cyk +iAj +lUw +uhk uva ygE uOJ -ukP +vVY tfI vWS gzH @@ -248606,7 +249683,7 @@ mUy vmb rlH aup -mLV +iZv wof kza aSf @@ -248621,7 +249698,7 @@ bSs xgm guv rvM -kaF +txZ ejO rpt fet @@ -249127,7 +250204,7 @@ kyY eeB fmG loJ -ijy +vfs loJ ycI gZL @@ -249137,7 +250214,7 @@ iLk iLk xDR bSs -uMN +aOE vWS gzH xUZ @@ -249374,7 +250451,7 @@ jxx uRy kIi odw -aWP +nHr dSd uWy sZY @@ -249394,7 +250471,7 @@ ycI lnH vYv bSs -nSj +rfY vWS gzH ugc @@ -249651,7 +250728,7 @@ ycI ptE vfG bSs -ddf +kzS vWS gzH cZx @@ -249662,7 +250739,7 @@ rZy rIf cUf cUf -pAn +bhV cUf neH jXJ @@ -249900,7 +250977,7 @@ fmG ruo qKd sHu -hJS +aBe uzt cpS xae @@ -249908,14 +250985,14 @@ ycI nyc vfG bSs -fei +vws vWS gzH nZf cUf qhh kJS -fxF +anG cUf cUf xGN @@ -250126,10 +251203,10 @@ uWJ imB imB imB -mlH +qdj kas -hQX -csw +luF +wUj hjP gqE gAS @@ -250165,12 +251242,12 @@ ycI hFJ iID bSs -rjo +wjv vWS gzH bhp cUf -fGN +upU bCi nrO lvq @@ -250891,7 +251968,7 @@ smH uXu ayU sgl -fcR +bYl eTm stM stM @@ -250908,7 +251985,7 @@ tCM gjr axH gjr -ybF +elt tCM tCM oOu @@ -251148,7 +252225,7 @@ aWi mhA abM rxc -iLp +bGW oSS stM stM @@ -251156,7 +252233,7 @@ luw hAr lrH vOu -gyA +vTP kst dYw ogw @@ -251185,7 +252262,7 @@ bPo hvJ fyJ wUV -ses +uiO slm ozL ixj @@ -251405,7 +252482,7 @@ aFw uLA bCZ pcN -dEh +uca eTm stM stM @@ -251458,11 +252535,11 @@ hPq hPq hPq ehW -xVq +qvc hPq iRf bQL -pAn +bhV fgf qnS vvh @@ -251659,9 +252736,9 @@ hkg dqU hkg hkg -pPy -sIr -qjY +uen +sHQ +ayp doE ibq ibq @@ -251681,7 +252758,7 @@ cjw non fhu bCU -tzi +xzl gXu ocm uZU @@ -252025,7 +253102,7 @@ xZm czX pLS abX -gSz +xoA aoP yfI cUP @@ -252482,7 +253559,7 @@ bSs seb gzH ksU -fnv +xxW qcn mBU sqL @@ -252739,7 +253816,7 @@ jnc lxZ gzH ksU -fnv +xxW tDq lxI lxI @@ -252989,14 +254066,14 @@ cpE iEW fpZ dHl -sFx +tKV ilU oed eJO lxZ gzH ksU -fnv +xxW fxD lxI lxI @@ -253246,14 +254323,14 @@ jgz fBp dSM dHl -sFx +tKV ilU qZk lwR lxZ gzH ksU -fnv +xxW fVk fks pIm @@ -253487,7 +254564,7 @@ oUn fyl gmD ipk -rzg +xtg pzd drt dQz @@ -253503,7 +254580,7 @@ mkH jGk uZb uZb -sFx +tKV ilU ngU lwR @@ -253511,7 +254588,7 @@ lxZ gzH ksU hPq -gEG +skB uer nHq dej @@ -253715,7 +254792,7 @@ cRz eKL eKL fSM -mms +nff kJl rfO rBr @@ -253767,7 +254844,7 @@ bEG lxZ gzH ksU -fnv +xxW aUE gdM dix @@ -253808,7 +254885,7 @@ jvi jvi jvi jvi -jvi +ekz xlH xUV oQZ @@ -254017,14 +255094,14 @@ sPI tOt uZb uZb -sFx +tKV qKt ngU lwR lxZ gzH ksU -fnv +xxW rlX lxI lxI @@ -254037,7 +255114,7 @@ jDL lzw nnt lzw -jxl +lbw txR elY cET @@ -254065,7 +255142,7 @@ oxu aQh oxu hDh -iGh +pQb xlH xlH xlH @@ -254274,14 +255351,14 @@ iJX fBp gDm ojO -sFx +tKV rMU ngU lwR lxZ gzH ksU -fnv +xxW ekq lxI lxI @@ -254531,17 +255608,17 @@ nyt fBp oNZ ojO -sFx +tKV rMU gab lmz lxZ gzH ksU -fnv -kZD +xxW +dIo +lNY lNY -cCS lNY lNY lNY @@ -254799,7 +255876,7 @@ hPq eAS mLq sbQ -vkf +dWl mLX snV cjp @@ -255025,7 +256102,7 @@ kLH gKq lVN lIe -xTw +wTW dis kTR xzi @@ -255794,7 +256871,7 @@ stM stM okZ rOV -rqd +wGH pTA xAJ pTA @@ -256084,7 +257161,7 @@ lzw lzw aOh tfO -aOh +lPG lzw jaR irO @@ -256121,7 +257198,7 @@ cKG cKG cKG cKG -oCT +fOe cKG cKG cKG @@ -256341,7 +257418,7 @@ lzw mqJ oVS tfO -aOh +lPG lzw wgg dMA @@ -256569,7 +257646,7 @@ cYH lLg lLg lLg -rmc +baZ eSx stM stM @@ -257921,7 +258998,7 @@ tRH tRH tRH hCm -gpK +aXk hCm vLw rRa @@ -258414,7 +259491,7 @@ uAk vPK dRA arL -uZe +kGm kNJ ncb cqg @@ -258928,7 +260005,7 @@ rXb ylN mZR pGl -uZe +kGm bdk weH bvW @@ -259674,7 +260751,7 @@ haS xUJ kYa nFY -ygT +qhv lhj gzH sjU @@ -259702,13 +260779,13 @@ soU cxI bFM cCA -fIN +pFO ksf cUr sic tJY bEg -lvK +nUi pCE bAS xeA @@ -260441,8 +261518,8 @@ tnD rWo hyx rWo +cOu gOM -sUa mSm uKl iPQ @@ -261771,7 +262848,7 @@ rEo dFx vcA dsU -fsQ +jrX nVN ppr hBv @@ -261784,7 +262861,7 @@ qch gIy qch jHc -jpf +fqi rIR lWf hxk @@ -262033,7 +263110,7 @@ jYl pMA dHE wDl -vmE +gKi wDl lui lui @@ -262547,7 +263624,7 @@ fxt fxt fxt wDl -osv +eYP wDl cBB cBB @@ -263299,7 +264376,7 @@ lJi ldq vFY iBD -cgb +nsm rZN qmL quB @@ -263537,7 +264614,7 @@ vLR vLR vLR vLR -dys +dVK vLR vLR awM @@ -264059,7 +265136,7 @@ qSC wCV pSw tel -ocG +sSy srC kxF kxF @@ -264417,7 +265494,7 @@ vmO vmO "} (213,1,3) = {" -vmO +kUC vmO vmO vmO @@ -264674,8 +265751,8 @@ vmO vmO "} (214,1,3) = {" -vmO -vmO +kUC +kUC vmO vmO vmO @@ -264931,8 +266008,8 @@ vmO vmO "} (215,1,3) = {" -vmO -vmO +kUC +kUC vmO vmO vmO @@ -265103,7 +266180,7 @@ pIp jvz lSc maD -vnk +nrk xyq sno mLm @@ -265188,8 +266265,8 @@ vmO vmO "} (216,1,3) = {" -vmO -vmO +kUC +kUC vmO vmO vmO @@ -265445,22 +266522,22 @@ vmO vmO "} (217,1,3) = {" +kUC +kUC vmO vmO vmO vmO vmO vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -265702,24 +266779,24 @@ vmO vmO "} (218,1,3) = {" +kUC +kUC +kUC +kUC vmO vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -265959,25 +267036,25 @@ vmO vmO "} (219,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -266216,28 +267293,28 @@ vmO vmO "} (220,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -266473,28 +267550,28 @@ vmO vmO "} (221,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -266714,7 +267791,7 @@ wgw sin stM stM -uNf +wjy kUC kUC kUC @@ -266730,30 +267807,30 @@ vmO vmO "} (222,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM vmO vmO vmO @@ -266970,10 +268047,10 @@ rlV rlV iPC stM -uNf -uNf -uNf -uNf +wjy +wjy +wjy +wjy kUC kUC kUC @@ -266987,32 +268064,32 @@ vmO vmO "} (223,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -267095,7 +268172,7 @@ all nVB cgc xhm -cMT +fGr nVB mDB fBh @@ -267226,11 +268303,11 @@ bQS oGW oGW stM -uNf -uNf -uNf -uNf -owY +wjy +wjy +wjy +wjy +wIV uUT kUC kUC @@ -267244,35 +268321,35 @@ vmO vmO "} (224,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM +stM vmO vmO vmO @@ -267484,10 +268561,10 @@ vys vys iry stM -uNf -uNf -uNf -uNf +wjy +wjy +wjy +wjy kUC kUC kUC @@ -267501,36 +268578,36 @@ vmO vmO "} (225,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -267742,8 +268819,8 @@ wgw sin stM stM -uNf -uNf +wjy +wjy kUC kUC kUC @@ -267758,37 +268835,37 @@ vmO vmO "} (226,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -268015,37 +269092,37 @@ vmO vmO "} (227,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +saq +saq +saq +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -268272,38 +269349,38 @@ vmO vmO "} (228,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +kUC +kUC +kUC +kUC +kUC +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +saq +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -268529,38 +269606,38 @@ vmO vmO "} (229,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC vmO vmO vmO @@ -268786,38 +269863,38 @@ vmO vmO "} (230,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC vmO vmO vmO @@ -269043,38 +270120,38 @@ vmO vmO "} (231,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC vmO vmO vmO @@ -269300,40 +270377,40 @@ vmO vmO "} (232,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM vmO vmO vmO @@ -269557,41 +270634,41 @@ vmO vmO "} (233,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM +stM vmO vmO vmO @@ -269665,7 +270742,7 @@ yhL nVB nny tRQ -aLe +vsm nVB efG iZp @@ -269814,42 +270891,42 @@ vmO vmO "} (234,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM +stM +stM vmO vmO vmO @@ -270071,43 +271148,43 @@ vmO vmO "} (235,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM +stM +stM +stM vmO vmO vmO @@ -270328,44 +271405,44 @@ vmO vmO "} (236,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM +stM +stM +stM +stM vmO vmO vmO @@ -270585,44 +271662,44 @@ vmO vmO "} (237,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +stM +kUC +kUC +kUC +stM vmO vmO vmO @@ -270842,45 +271919,45 @@ vmO vmO "} (238,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +fxz +fxz +fxz +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +stM +stM +stM +stM +kUC +kUC +kUC +kUC vmO vmO vmO @@ -271099,46 +272176,46 @@ vmO vmO "} (239,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +aFO +ayT +aFO +hsI +hsI +hsI +dNo +jNR +ogZ +bJe +kCl +wRL +pCR +bJe +uFR +fxz +hsI +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +stM +kUC +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +kUC vmO vmO vmO @@ -271356,46 +272433,46 @@ vmO vmO "} (240,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +dic +dic +dic +hsI +mfi +mfi +xHe +tOi +rnX +wBA +uHV +jZr +reF +tXc +miu +bJe +hsI +bJe +bJe +bJe +bJe +bJe +hsI +hsI +hsI +qKS +stM +stM +stM +stM +stM +stM +stM +stM +kUC +kUC +kUC +kUC vmO vmO vmO @@ -271613,45 +272690,45 @@ vmO vmO "} (241,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +dic +dic +dic +dic +mfi +mfi +fMg +wkJ +nVK +eqB +mdr +lkP +jUH +pjn +tlX +iYH +ayT +dCo +ayT +ayT +ayT +vxY +ayT +ayT +grp +qKS +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -271870,45 +272947,45 @@ vmO vmO "} (242,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +dic +dic +dic +dic +mfi +mfi +eqQ +lub +lub +dlg +aHM +mfi +gzb +qDn +mKM +tYz +ayT +vxY +vxY +vxY +vxY +vxY +ayT +ayT +wGA +qKS +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -272127,45 +273204,45 @@ vmO vmO "} (243,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +dic +dic +dic +dic +mfi +mfi +ajZ +jNR +btr +eqB +wlf +rga +teM +eKO +tlX +iYH +ayT +ayT +ayT +ayT +ayT +ayT +ayT +ayT +grp +qKS +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -272384,45 +273461,45 @@ vmO vmO "} (244,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +dic +dic +dic +hsI +mfi +mfi +xHe +mna +rnX +xOX +xuM +kRN +xuM +akv +ngE +wOD +hsI +wOD +wOD +wOD +wOD +wOD +hsI +hsI +hsI +qKS +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -272641,45 +273718,45 @@ vmO vmO "} (245,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +aFO +ayT +aFO +hsI +hsI +hsI +heE +wkJ +tJw +wOD +jeB +xrs +fxl +wOD +kTt +fxz +hsI +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +kUC +kUC +stM +stM +stM +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -272898,44 +273975,44 @@ vmO vmO "} (246,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +fxz +fxz +fxz +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +stM +stM +stM +stM +stM +stM +stM vmO vmO vmO @@ -273155,46 +274232,46 @@ vmO vmO "} (247,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +stM +stM +kUC +kUC +kUC vmO vmO vmO @@ -273412,46 +274489,46 @@ vmO vmO "} (248,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -273669,46 +274746,46 @@ vmO vmO "} (249,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -273926,44 +275003,44 @@ vmO vmO "} (250,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +fxz +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +stM +stM vmO vmO vmO @@ -274183,44 +275260,44 @@ vmO vmO "} (251,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM vmO vmO vmO @@ -274440,44 +275517,44 @@ vmO vmO "} (252,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +stM vmO vmO vmO @@ -274697,44 +275774,44 @@ vmO vmO "} (253,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -274954,50 +276031,50 @@ vmO vmO "} (254,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO @@ -275211,55 +276288,55 @@ vmO vmO "} (255,1,3) = {" -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO -vmO +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +hsI +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC +kUC vmO vmO vmO diff --git a/_maps/moonstation.json b/_maps/moonstation.json index 976f40329f0..00271971cf2 100644 --- a/_maps/moonstation.json +++ b/_maps/moonstation.json @@ -28,7 +28,7 @@ "Mining": true, "Linkage": null, "Gravity": true, - "Baseturf": "/turf/open/misc/moonstation_rock", + "Baseturf": "/turf/open/misc/moonstation_rock/cave", "No Parallax": true }, { diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 650ebae7a1b..da2a701c1de 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -1106,28 +1106,6 @@ /turf/open/floor/plating, /area/shuttle/abandoned/cargo) "Wz" = ( -/obj/machinery/door/window/survival_pod{ - dir = 4 - }, -/obj/effect/turf_decal/stripes{ - dir = 4 - }, -/obj/structure/bed/pod{ - dir = 1 - }, -/obj/effect/spawner/random/bedsheet{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/obj/merge_conflict_marker{ - name = "---Merge Conflict Marker---"; - - desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete." - }, /obj/machinery/door/window/survival_pod/left/directional/east, /obj/effect/turf_decal/stripes{ dir = 4 diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 55b5b12b531..2b9a1884704 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -55,6 +55,11 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// Yes I know this is a stupid flag, no you can't take him from me #define DECAL_INIT_UPDATE_EXPERIENCED_1 (1<<17) +//BUBBER EDIT START - Flags +//Does item send log notices to admin log when consumed by supermatter? +#define SUPERMATTER_NOLOGS_1 (1<<20) + +//BUBBER EDIT END // Update flags for [/atom/proc/update_appearance] /// Update the atom's name #define UPDATE_NAME (1<<0) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index c4bd9fb7c9f..bf5b5c9e9bd 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -137,6 +137,7 @@ #define ROLE_VAMPIRICACCIDENT "Bloodsucker (Midround)" #define ROLE_BLOODSUCKERBREAKOUT "Bloodsucker (Latejoin)" #define ROLE_MONSTERHUNTER "Monster Hunter" +#define ROLE_VASSAL "Vassal" //BUBBER EDIT END /// This defines the antagonists you can operate with in the settings. diff --git a/code/__DEFINES/~~bubber_defines/transport.dm b/code/__DEFINES/~~bubber_defines/transport.dm new file mode 100644 index 00000000000..51f81a714e6 --- /dev/null +++ b/code/__DEFINES/~~bubber_defines/transport.dm @@ -0,0 +1,6 @@ +// Tram lines +#define MOONSTATION_LINE_1 "moon_1" + +// Destinations/platforms +#define MOONSTATION_TERMINAL 1 +#define MOONSTATION_MAIN_STATION 2 diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 7c563a2bb05..31e86401d9a 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -130,6 +130,7 @@ DEFINE_BITFIELD(flags_1, list( "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1, "SUPERMATTER_IGNORES_1" = SUPERMATTER_IGNORES_1, "UNPAINTABLE_1" = UNPAINTABLE_1, + "SUPERMATTER_NOLOGS_1" = SUPERMATTER_NOLOGS_1, //Bubber addition )) DEFINE_BITFIELD(flags_ricochet, list( diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm index 4a58660992a..99e3165fb4b 100644 --- a/code/datums/components/phylactery.dm +++ b/code/datums/components/phylactery.dm @@ -213,6 +213,10 @@ if(wheres_wizdo) corpse.visible_message(span_warning("Suddenly, [corpse.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!")) body_turf.Beam(parent_turf, icon_state = "lichbeam", time = 1 SECONDS * (num_resurrections + 1)) + //BUBBERSTATION CHANGE START: MORE PRECISE LOCATION AFTER 3 REVIVES. + if(body_turf && num_resurrections >= 3) + priority_announce("Unusual anomalous energy fluctuations detected in: [body_turf.loc].", "Anomaly Alert") + //BUBBERSTATION CHANGE END: MORE PRECISE LOCATION AFTER 3 REVIVES. corpse.dust(drop_items = TRUE) diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 122cc021fab..2b7ac44110f 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -315,7 +315,7 @@ else if(consumed_object.flags_1 & SUPERMATTER_IGNORES_1) return else if(isobj(consumed_object)) - if(!iseffect(consumed_object)) + if(!iseffect(consumed_object) && !(consumed_object.flags_1 & SUPERMATTER_NOLOGS_1)) //BUBBER EDIT | NOLOGS flag Addition to ignore items engineers like to feed the SM :3 var/suspicion = "" if(consumed_object.fingerprintslast) suspicion = "last touched by [consumed_object.fingerprintslast]" diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm index 4368750b45b..a4a22cc7542 100644 --- a/code/game/machinery/computer/arcade/arcade.dm +++ b/code/game/machinery/computer/arcade/arcade.dm @@ -155,9 +155,11 @@ BUBBERSTATION CHANGE END. */ return . var/obj/item/stack/arcadeticket/tickets = tool - if(!tickets.use(2)) - balloon_alert(user, "need 2 tickets!") + // BUBBER EDIT START - MAKES MACHINES USE 1 TICKET + if(!tickets.use(1)) + balloon_alert(user, "need 1 tickets!") return ITEM_INTERACT_BLOCKING + //BUBBER EDIT END prizevend(user) balloon_alert(user, "prize claimed") diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 648f007434c..f80042f5679 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -399,106 +399,6 @@ LINEN BINS light_power = 2 light_range = 1.4 -// BUBBER EDIT START: KEEPS OLD BEDSHEET SPAWNERS -// BUBBER TODO: REMOVE THESE - -#define BEDSHEET_ABSTRACT "abstract" -/obj/item/bedsheet/random - icon_state = "random_bedsheet" - name = "random bedsheet" - desc = "If you're reading this description ingame, something has gone wrong! Honk!" - bedsheet_type = BEDSHEET_ABSTRACT - item_flags = ABSTRACT - var/static/list/bedsheet_list - var/spawn_type = BEDSHEET_SINGLE - -/obj/item/bedsheet/random/Initialize(mapload) - ..() - if(!LAZYACCESS(bedsheet_list, spawn_type)) - var/list/spawn_list = list() - var/list/possible_types = typesof(/obj/item/bedsheet) - for(var/obj/item/bedsheet/sheet as anything in possible_types) - if(initial(sheet.bedsheet_type) == spawn_type) - spawn_list += sheet - LAZYSET(bedsheet_list, spawn_type, spawn_list) - var/chosen_type = pick(bedsheet_list[spawn_type]) - new chosen_type(loc) - return INITIALIZE_HINT_QDEL - -/obj/item/bedsheet/random/double - icon_state = "random_bedsheet" - spawn_type = BEDSHEET_DOUBLE - -/obj/item/bedsheet/dorms - icon_state = "random_bedsheet" - name = "random dorms bedsheet" - desc = "If you're reading this description ingame, something has gone wrong! Honk!" - bedsheet_type = BEDSHEET_DOUBLE - item_flags = ABSTRACT - slot_flags = null - -/obj/item/bedsheet/dorms/Initialize(mapload) - ..() - var/type = pick_weight(list("Colors" = 80, "Special" = 20)) - switch(type) - if("Colors") - type = pick(list(/obj/item/bedsheet, - /obj/item/bedsheet/blue, - /obj/item/bedsheet/green, - /obj/item/bedsheet/grey, - /obj/item/bedsheet/orange, - /obj/item/bedsheet/purple, - /obj/item/bedsheet/red, - /obj/item/bedsheet/yellow, - /obj/item/bedsheet/brown, - /obj/item/bedsheet/black)) - if("Special") - type = pick(list(/obj/item/bedsheet/patriot, - /obj/item/bedsheet/rainbow, - /obj/item/bedsheet/ian, - /obj/item/bedsheet/cosmos, - /obj/item/bedsheet/nanotrasen)) - var/obj/item/bedsheet = new type(loc) - bedsheet.dir = dir - return INITIALIZE_HINT_QDEL - -/obj/item/bedsheet/dorms_double - icon_state = "random_bedsheet" - item_flags = ABSTRACT - bedsheet_type = BEDSHEET_ABSTRACT - -/obj/item/bedsheet/dorms_double/Initialize(mapload) - ..() - var/type = pick_weight(list("Colors" = 80, "Special" = 20)) - switch(type) - if("Colors") - type = pick(list( - /obj/item/bedsheet/double, - /obj/item/bedsheet/blue/double, - /obj/item/bedsheet/green/double, - /obj/item/bedsheet/grey/double, - /obj/item/bedsheet/orange/double, - /obj/item/bedsheet/purple/double, - /obj/item/bedsheet/red/double, - /obj/item/bedsheet/yellow/double, - /obj/item/bedsheet/brown/double, - /obj/item/bedsheet/black/double, - )) - if("Special") - type = pick(list( - /obj/item/bedsheet/patriot/double, - /obj/item/bedsheet/rainbow/double, - /obj/item/bedsheet/ian/double, - /obj/item/bedsheet/cosmos/double, - /obj/item/bedsheet/nanotrasen/double, - )) - var/obj/item/bedsheet = new type(loc) - bedsheet.dir = dir - return INITIALIZE_HINT_QDEL - -#undef BEDSHEET_ABSTRACT -//BUBBER EDIT END - /obj/item/bedsheet/double icon_state = "double_sheetwhite" worn_icon_state = "sheetwhite" diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm index e5b3756cfd4..a57f29b3150 100644 --- a/code/modules/admin/sql_ban_system.dm +++ b/code/modules/admin/sql_ban_system.dm @@ -433,6 +433,8 @@ ROLE_WIZARD, ROLE_BORER, //SKYRAT EDIT ROLE_ASSAULT_OPERATIVE, //SKYRAT EDIT + ROLE_BLOODSUCKER,// BUBBER EDIT, + ROLE_VASSAL, // BUBBER EDIT ), "Skyrat Ban Options" = list( BAN_PACIFICATION, diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index c73f3669f5a..223ccda8086 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -314,6 +314,14 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) webhook_sent = WEBHOOK_URGENT //send it to TGS if nobody is on and tell us how many were on var/admin_number_present = send2tgs_adminless_only(initiator_ckey, "Ticket #[id]: [message_to_send]") + // BUBBER EDIT BEGIN + var/list/adm = get_admin_counts(R_BAN) + var/list/afkmins = adm["afk"] + var/list/stealthmins = adm["stealth"] + var/list/powerlessmins = adm["noflags"] + var/list/allmins = adm["total"] + send2adminchat("Ticket #[id]","[message_to_send] || Online Admins : \[[english_list(allmins)]\] : All admins stealthed\[[english_list(stealthmins)]\], AFK\[[english_list(afkmins)]\], or lacks +BAN\[[english_list(powerlessmins)]\]!") // BUBBER EDIT ADDITION + // BUBBER EDIT END log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) to_chat(initiator, span_notice("No active admins are online, your adminhelp was sent to admins who are available through IRC or Discord."), confidential = TRUE) @@ -469,7 +477,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) closed_at = null if(initiator) initiator.current_ticket = src - + send2adminchat("Ticket #[id]:", "Reopened!") // BUBBER EDIT - LOG ALL AHELPS TO DISCORD AddInteraction("Reopened by [key_name_admin(usr)]", player_message = "Ticket reopened!") var/msg = span_adminhelp("Ticket [TicketHref("#[id]")] reopened by [key_name_admin(usr)].") message_admins(msg) @@ -504,6 +512,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) state = AHELP_CLOSED GLOB.ahelp_tickets.ListInsert(src) AddInteraction("Closed by [key_name].", player_message = "Ticket closed!") + send2adminchat("Ticket #[id]:", "Marked as closed by [key_name]") // BUBBER EDIT - LOG ALL AHELPS TO DISCORD if(!silent) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "closed") var/msg = "Ticket [TicketHref("#[id]")] closed by [key_name]." @@ -526,7 +535,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) GLOB.ahelp_tickets.ListInsert(src) addtimer(CALLBACK(initiator, TYPE_PROC_REF(/client, giveadminhelpverb)), 50) - + send2adminchat("Ticket #[id]:", "Marked as resolved by [key_name]") // BUBBER EDIT - LOG ALL AHELPS TO DISCORD AddInteraction("Resolved by [key_name].", player_message = "Ticket resolved!") to_chat(initiator, span_adminhelp("Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly."), confidential = TRUE) if(!silent) @@ -548,7 +557,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) //SKYRAT EDIT ADDITION END if(initiator) initiator.giveadminhelpverb() - + send2adminchat("[key_name]", "Rejected Adminhelp: [id]") // BUBBER EDIT - LOG ALL AHELPS TO DISCORD SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg')) to_chat(initiator, "- AdminHelp Rejected! -", confidential = TRUE) @@ -578,7 +587,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(initiator) to_chat(initiator, msg, confidential = TRUE) - + send2adminchat("Ticket #[id]:", "Marked as IC issue by [key_name]") // BUBBER EDIT - LOG ALL AHELPS TO DISCORD SSblackbox.record_feedback("tally", "ahelp_stats", 1, "IC") msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]" message_admins(msg) @@ -906,6 +915,7 @@ GLOBAL_DATUM_INIT(admin_help_ui_handler, /datum/admin_help_ui_handler, new) SSblackbox.LogAhelp(mob_client.current_ticket.id, "Interaction", message, mob_client.ckey, usr.ckey) return mob_client.current_ticket if(istext(what)) //ckey + send2adminchat("[what]", message) // BUBBER EDIT - LOG ALL AHELPS TO DISCORD var/datum/admin_help/active_admin_help = GLOB.ahelp_tickets.CKey2ActiveTicket(what) if(active_admin_help) if (isnull(player_message)) diff --git a/code/modules/mob/living/brain/brain_say.dm b/code/modules/mob/living/brain/brain_say.dm index 79e8e1d3079..c9109795271 100644 --- a/code/modules/mob/living/brain/brain_say.dm +++ b/code/modules/mob/living/brain/brain_say.dm @@ -1,4 +1,16 @@ /mob/living/brain/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null, filterpoof = null, message_range = 7, datum/saymode/saymode = null) + // BUBBER CHANGE: funny talking head + if(stat == DEAD) // lets you talk in deadchat + return ..() + var/datum/antagonist/bloodsucker/spooky_vampire_head = mind?.has_antag_datum(/datum/antagonist/bloodsucker) + if(!container && spooky_vampire_head) + var/obj/head = spooky_vampire_head.is_head(src) + if(!head) + return + var/animation_time = max(2, length_char(message) * 0.5) + head.Shake(duration = animation_time) + ..() + // BUBBER CHANGE END if(!(container && istype(container, /obj/item/mmi))) return //No MMI, can't speak, bucko./N else diff --git a/code/modules/spells/spell_types/self/lichdom.dm b/code/modules/spells/spell_types/self/lichdom.dm index 19ad55d9eee..8a23b65ec46 100644 --- a/code/modules/spells/spell_types/self/lichdom.dm +++ b/code/modules/spells/spell_types/self/lichdom.dm @@ -44,6 +44,16 @@ to_chat(cast_on, span_warning("[marked_item] is not suitable for emplacement of your fragile soul.")) return + //BUBBERSTATION CHANGE START: NERFS LICHDOM + if(marked_item.w_class < WEIGHT_CLASS_BULKY) //Can't cast on small items. + to_chat(cast_on, span_warning("[marked_item] is too small to contain your huge ego soul.")) + return + + if(marked_item.resistance_flags & (INDESTRUCTIBLE|LAVA_PROOF|FIRE_PROOF)) //Can't cast on items that are indestructable and/or fire proof. + to_chat(cast_on, span_warning("[marked_item] is too resistant to your magic. Perhaps try on something that isn't fireproof?")) + return + //BUBBERSTATION CHANGE END: NERFS LICHDOM + . = ..() playsound(cast_on, 'sound/effects/pope_entry.ogg', 100) diff --git a/code/modules/transport/tram/tram_displays.dm b/code/modules/transport/tram/tram_displays.dm index 5043be46c6a..47fe21f2ff1 100644 --- a/code/modules/transport/tram/tram_displays.dm +++ b/code/modules/transport/tram/tram_displays.dm @@ -120,13 +120,6 @@ update_appearance() return - //BUBBERSTATION CHANGE START: FIXES 2-DESTINATION TRAMS - if(travel_direction == NONE) - sign_face = null - update_appearance() - return - //BUBBERSTATION CHANGE END: FIXES 2-DESTINATION TRAMS - sign_face = "" sign_face += "[base_icon_state]_" if(!LAZYFIND(available_faces, controller.specific_transport_id)) diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png index e9251e73cc5..565db47c1bf 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png differ diff --git a/html/changelogs/AutoChangeLog-pr-1061.yml b/html/changelogs/AutoChangeLog-pr-1061.yml new file mode 100644 index 00000000000..71884387bf5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1061.yml @@ -0,0 +1,34 @@ +author: "Arturlang" +delete-after: True +changes: + - rscadd: "Decapacitated bloodsuckers can now talk!" + - rscadd: "The stat bar will show you the threshold for exiting frenzy now too when you are frenzying." + - rscadd: "Bloodsucker abilities now will show their level when you hover over them. Trust me, this was really neccessary." + - rscadd: "Tremere now also get informed of how much blood they need to pay for level ups." + - rscadd: "At level 3, haste will now remove stuns and do a non-stunning dash" + - rscadd: "Bloodsucker blood display now always updates when a bloodsucker's blood level is changed" + - rscadd: "Bloodsuckers can now examine hearts to see if they are valid for the heart thief objective" + - rscadd: "Bloodsucker vassals now clean up any traits gained from their tenure as a vampire's minion." + - rscadd: "Favorite vassals now properly clean up their effects once the antag datum is lost." + - rscadd: "Bloodsucker synths will be able to heal their prosthetic limbs, but normal bloodsuckers still cannot." + - rscadd: "When you exiit torpor as a bloodsucker, you will completely heal any toxin and oxygen damage, as you should already be immune to it. This is a safety feature." + - rscadd: "Entering a coffin will normalize your temperature and extinguish you if you're on fire, if you are a bloodsucker." + - bugfix: "bloodsucker vampire bats will no longer /list you when attacking" + - bugfix: "Hopefully fixes some torpor loops related to frenzy" + - bugfix: "Hopefully fixes bloodsuckers cryoing not removing vassal datums" + - bugfix: "Bloodsuckers can no longer use veil of many faces while unconcious" + - bugfix: "lizard bloodsuckers will no longer suffer from heat for a long time" + - bugfix: "The ventrue objective now properly succeeds if you have sired a vampire" + - bugfix: "Livers are no longer required for bloodsuckers to live, as it caused them toxin damage which overrode the trait that made them immune to toxins." + - bugfix: "Entering torpor now accounts for all damage types, even when you should be immune to them. This is to ensure you enter torpor to heal those damage types in the case of odd behaviour." + - balance: "coffins should now set your temperature to normal and extinguish you." + - balance: "bloodsucker level up cost is now 15% of max blood, down from 20%" + - balance: "Caps humantiy loss at 50 humanity/500 blood to frenzy, and makes it remove your masquerade ability." + - balance: "Bloodsucker bats now have human runspeed" + - balance: "Blood cost for vassalizing was almost completely removed, now only taking tiny amounts of blood to do so." + - balance: "Fortitude now gives you burn resistance, just 20% less than brute resistance" + - balance: "Can no longer gut bloodsuckers" + - balance: "Bloodsuckers loosing their heart will make the vampire unable to use their abilities or even regenerateor revive via torpor, you can however regain your heart if you sleep in a coffin with a heart." + - balance: "Stakes now have different properties, the normal stake is fast to stick in someone, but can fall out on it's own, the burnt one takes longer to be put in, but doesn't fall out, the silver stake is the slowest to be stuffed in someone's heart, and is the only stake to be able to cause a Final Death to a sleeping or dead bloodsucker" + - rscdel: "Dullahans can't be bloodsuckers since... their head isn't attached" + - admin: "Bloodsuckers and vassals can now be banned like other antags." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1078.yml b/html/changelogs/AutoChangeLog-pr-1078.yml new file mode 100644 index 00000000000..445eeb3fabd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1078.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - balance: "After 3 Lichdom resurrections, announcements will be made about your general phylactery location (the area) when you die. Phylactery binding now requires the object to be at least bulky in size, and it cannot be fireproof, lava proof, or indestructible." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1116.yml b/html/changelogs/AutoChangeLog-pr-1116.yml new file mode 100644 index 00000000000..af8f93a76b5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1116.yml @@ -0,0 +1,4 @@ +author: "Swiftfeather" +delete-after: True +changes: + - admin: "Will no longer receive supermatter ate a pipe spam in the log." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1188.yml b/html/changelogs/AutoChangeLog-pr-1188.yml new file mode 100644 index 00000000000..6d6702eaefc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1188.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Fixes some Moon Station bugs, such as the funny engineering bridge access bug and a lack of cigarette/coffee vendors." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1217.yml b/html/changelogs/AutoChangeLog-pr-1217.yml new file mode 100644 index 00000000000..b9909a6a7c0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1217.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender (code)" +delete-after: True +changes: + - rscadd: "F-list headshots are now accepted" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1219.yml b/html/changelogs/AutoChangeLog-pr-1219.yml new file mode 100644 index 00000000000..02e4e5cbb17 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1219.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscdel: "Limits Powersinks + Crab-17 purchases to once each per traitor per round." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1224.yml b/html/changelogs/AutoChangeLog-pr-1224.yml new file mode 100644 index 00000000000..c3d5f406e75 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1224.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - rscadd: "Adds Ashwalkers to Moonstation" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1225.yml b/html/changelogs/AutoChangeLog-pr-1225.yml new file mode 100644 index 00000000000..ab0b6dc4914 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1225.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender" +delete-after: True +changes: + - rscdel: "Donors' graceful trenchcoat" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1226.yml b/html/changelogs/AutoChangeLog-pr-1226.yml new file mode 100644 index 00000000000..ae65e7e3fab --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1226.yml @@ -0,0 +1,4 @@ +author: "ReturnToZender" +delete-after: True +changes: + - rscadd: "NTC offices have had their carpet changed out to something less over-the-top. The windows have been expanded as well." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1229.yml b/html/changelogs/AutoChangeLog-pr-1229.yml new file mode 100644 index 00000000000..79411bd20c9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1229.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Fixes traitor announcer double-sanitizing." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1238.yml b/html/changelogs/AutoChangeLog-pr-1238.yml new file mode 100644 index 00000000000..41ae7a67f39 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1238.yml @@ -0,0 +1,7 @@ +author: "pixelkitty286" +delete-after: True +changes: + - rscadd: "+Peacekeeper cat borg sprites, Spider clan cat borg sprites, Engineer cat borg refreshed sprites" + - bugfix: "Cat cyborg panels not working" + - image: "+Peacekeeper cat borg sprites, Spider clan cat borg sprites, Engineer cat borg refreshed sprites" + - code_imp: "-Duplicate code" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1245.yml b/html/changelogs/AutoChangeLog-pr-1245.yml new file mode 100644 index 00000000000..72525d7cce2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1245.yml @@ -0,0 +1,4 @@ +author: "BurgerBB" +delete-after: True +changes: + - bugfix: "Fixes missing telecomms wire in Moonstation" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1246.yml b/html/changelogs/AutoChangeLog-pr-1246.yml new file mode 100644 index 00000000000..296e85bbf61 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1246.yml @@ -0,0 +1,5 @@ +author: "LT3" +delete-after: True +changes: + - image: "Added Moonstation specific tram sprites" + - bugfix: "Fixed Moonstation references to Tramstation's tram" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1248.yml b/html/changelogs/AutoChangeLog-pr-1248.yml new file mode 100644 index 00000000000..65dfa950447 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1248.yml @@ -0,0 +1,4 @@ +author: "EspeciallyStrange" +delete-after: True +changes: + - bugfix: "IDMA donor clothing being improperly offsetted and not correctly" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-625.yml b/html/changelogs/AutoChangeLog-pr-625.yml new file mode 100644 index 00000000000..f6d46666ae3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-625.yml @@ -0,0 +1,4 @@ +author: "nevimer" +delete-after: True +changes: + - balance: "contractor and ninja modsuits have DNA locked microbombs" \ No newline at end of file diff --git a/modular_skyrat/master_files/code/modules/client/preferences/headshot.dm b/modular_skyrat/master_files/code/modules/client/preferences/headshot.dm index 116e684093a..40a7105eea9 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/headshot.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/headshot.dm @@ -7,7 +7,7 @@ maximum_value_length = MAX_MESSAGE_LEN /// Assoc list of ckeys and their link, used to cut down on chat spam var/list/stored_link = list() - var/static/link_regex = regex("i.gyazo.com|media.discordapp.net|cdn.discordapp.com|a.l3n.co|b.l3n.co|c.l3n.co") //gyazo, discord, lensdump + var/static/link_regex = regex("i.gyazo.com|media.discordapp.net|cdn.discordapp.com|a.l3n.co|b.l3n.co|c.l3n.co|static.f-list.net/images/") //gyazo, discord, lensdump //BUBBER ADDITION: F-list var/static/list/valid_extensions = list("jpg", "png", "jpeg") // Regex works fine, if you know how it works /datum/preference/text/headshot/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences) @@ -36,7 +36,7 @@ find_index = findtext(value, link_regex) if(find_index != 9) - to_chat(usr, span_warning("The image must be hosted on one of the following sites: 'Gyazo, Discord'")) + to_chat(usr, span_warning("The image must be hosted on one of the following sites: 'Gyazo, Discord, Lensdump, F-List'")) return apply_headshot(value) diff --git a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm index e1dd641ea3b..f411bee7e2f 100644 --- a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm +++ b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm @@ -7,7 +7,7 @@ starting_frequency = MODLINK_FREQ_SYNDICATE applied_cell = /obj/item/stock_parts/cell/hyper applied_modules = list( - /obj/item/mod/module/dna_lock, + /obj/item/mod/module/dna_lock/reinforced, // BUBBER EDIT -> REINFORCED /obj/item/mod/module/emp_shield, /obj/item/mod/module/flashlight, /obj/item/mod/module/magnetic_harness, @@ -23,7 +23,7 @@ applied_cell = /obj/item/stock_parts/cell/bluespace applied_modules = list( /obj/item/mod/module/baton_holster/preloaded, - /obj/item/mod/module/dna_lock, + /obj/item/mod/module/dna_lock/reinforced, // BUBBER EDIT -> REINFORCED /obj/item/mod/module/emp_shield, /obj/item/mod/module/jetpack, /obj/item/mod/module/magnetic_harness, diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 2610109388a..48c5934ea9b 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -754,7 +754,7 @@ /datum/loadout_item/neck/trenchcoat name = "Graceful Trenchcoat" item_path = /obj/item/clothing/neck/trenchcoat - //ckeywhitelist = list("Smol42", "Awers855") + ckeywhitelist = list("Smol42", "Awers855") /datum/loadout_item/under/jumpsuit/old_qm_jumpskirt name = "Old Quartermaster's Jumpskirt" diff --git a/modular_skyrat/modules/moretraitoritems/code/traitor_announcer.dm b/modular_skyrat/modules/moretraitoritems/code/traitor_announcer.dm index 83a3f13913c..1392eba70ec 100644 --- a/modular_skyrat/modules/moretraitoritems/code/traitor_announcer.dm +++ b/modular_skyrat/modules/moretraitoritems/code/traitor_announcer.dm @@ -21,7 +21,7 @@ balloon_alert(user, "no uses left!") return //build our announcement - var/origin = sanitize_text(reject_bad_text(tgui_input_text(user, "Who is announcing, or where is the announcement coming from?", "Announcement Origin", get_area_name(user), max_length = 28))) + var/origin = reject_bad_text(tgui_input_text(user, "Who is announcing, or where is the announcement coming from?", "Announcement Origin", get_area_name(user), max_length = 28)) //BUBBERSTATION CHANGE if(!origin) balloon_alert(user, "bad origin!") return @@ -33,11 +33,11 @@ if(!color) balloon_alert(user, "bad color!") return - var/title = sanitize_text(reject_bad_text(tgui_input_text(user, "Choose the title of the announcement.", "Announcement Title", max_length = 42))) + var/title = reject_bad_text(tgui_input_text(user, "Choose the title of the announcement.", "Announcement Title", max_length = 42)) //BUBBERSTATION CHANGE if(!title) balloon_alert(user, "bad title!") return - var/input = sanitize_text(reject_bad_text(tgui_input_text(user, "Choose the bodytext of the announcement.", "Announcement Text", max_length = 512, multiline = TRUE))) + var/input = reject_bad_text(tgui_input_text(user, "Choose the bodytext of the announcement.", "Announcement Text", max_length = 512, multiline = TRUE)) //BUBBERSTATION CHANGE if(!input) balloon_alert(user, "bad text!") return @@ -51,6 +51,8 @@ has_important_message = TRUE, sender_override = origin, color_override = color, + encode_text = FALSE, //BUBBERSTATION CHANGE + encode_title = FALSE //BUBBERSTATION CHANGE ) if(uses != INFINITE_CHARGES) uses-- diff --git a/modular_zubbers/code/__DEFINES/bloodsucker.dm b/modular_zubbers/code/__DEFINES/bloodsucker_defines.dm similarity index 87% rename from modular_zubbers/code/__DEFINES/bloodsucker.dm rename to modular_zubbers/code/__DEFINES/bloodsucker_defines.dm index 62f465116ff..822c903c8ca 100644 --- a/modular_zubbers/code/__DEFINES/bloodsucker.dm +++ b/modular_zubbers/code/__DEFINES/bloodsucker_defines.dm @@ -4,22 +4,29 @@ /// You have special interactions with Bloodsuckers #define TRAIT_BLOODSUCKER_HUNTER "bloodsucker_hunter" +// how much to multiply the coffin size by mob_size +#define COFFIN_ENLARGE_MULT 0.5 /** * Blood-level defines */ /// Determines Bloodsucker regeneration rate #define BS_BLOOD_VOLUME_MAX_REGEN 700 /// Cost to torture someone halfway, in blood. Called twice for full cost -#define TORTURE_BLOOD_HALF_COST 8 +#define TORTURE_BLOOD_HALF_COST 4 /// Cost to convert someone after successful torture, in blood -#define TORTURE_CONVERSION_COST 50 +#define TORTURE_CONVERSION_COST 10 +/// How much blood it costs you to make a vassal into a special vassal +#define SPECIAL_VASSAL_COST 150 /// Once blood is this low, will enter Frenzy #define FRENZY_THRESHOLD_ENTER 25 /// Once blood is this high, will exit Frenzy #define FRENZY_THRESHOLD_EXIT 250 +/// a bloodsucker can't loose more humanity than this, and looses the masquerade ability when reaching it +#define HUMANITY_LOST_MAXIMUM 50 + /// Level up blood cost define, max_blood * this = blood cost -#define BLOODSUCKER_LEVELUP_PERCENTAGE 0.2 +#define BLOODSUCKER_LEVELUP_PERCENTAGE 0.15 ///The level when at a bloodsucker becomes snobby about who they drink from and gain their non-fledling reputation #define BLOODSUCKER_HIGH_LEVEL 4 @@ -73,7 +80,7 @@ /// This Power can't be used in Frenzy. #define BP_CANT_USE_IN_FRENZY (1<<2) /// This Power can't be used with a stake in you -#define BP_CANT_USE_WHILE_STAKED (1<<3) +#define BP_CAN_USE_WHILE_STAKED (1<<3) /// This Power can't be used while incapacitated #define BP_CANT_USE_WHILE_INCAPACITATED (1<<4) /// This Power can't be used while unconscious @@ -97,6 +104,13 @@ /// This Power doesn't cost bloot to run while unconscious #define BP_AM_COSTLESS_UNCONSCIOUS (1<<3) +/** + * Torpor check bitflags + */ +#define TORPOR_SKIP_CHECK_ALL (1<<0) +#define TORPOR_SKIP_CHECK_FRENZY (1<<1) +#define TORPOR_SKIP_CHECK_DAMAGE (1<<2) + /** * Bloodsucker Signals */ @@ -106,6 +120,8 @@ #define BLOODSUCKER_INTERACT_WITH_VASSAL "bloodsucker_interact_with_vassal" ///Called when a Bloodsucker makes a Vassal into their Favorite Vassal: (datum/vassal_datum, mob/master) #define BLOODSUCKER_MAKE_FAVORITE "bloodsucker_make_favorite" +// called when a bloodsucker looses their favorite vassal, cleaning up whatever they gained +#define BLOODSUCKER_LOOSE_FAVORITE "bloodsucker_loose_favorite" ///Called when a new Vassal is successfully made: (datum/bloodsucker_datum) #define BLOODSUCKER_MADE_VASSAL "bloodsucker_made_vassal" ///Called when a Bloodsucker exits Torpor. @@ -120,6 +136,8 @@ #define BLOODSUCKER_ENTERS_FRENZY "bloodsucker_enters_frenzy" ///Called when a Bloodsucker exits Frenzy #define BLOODSUCKER_EXITS_FRENZY "bloodsucker_exits_frenzy" +// Called when anyone enters the coffin +#define COMSIG_ENTER_COFFIN "comsig_enter_coffin" /** * Sol signals & Defines @@ -164,6 +182,12 @@ */ /// Source trait for Bloodsuckers-related traits #define BLOODSUCKER_TRAIT "bloodsucker_trait" + +#define VASSAL_TRAIT "vassal_trait" + +/// Source trait for dominate related traits +#define DOMINATE_TRAIT "dominate_trait" + /// Source trait for Monster Hunter-related traits #define HUNTER_TRAIT "monsterhunter_trait" /// Source trait while Feeding @@ -186,6 +210,7 @@ #define IS_MONSTERHUNTER(mob) (FALSE) #define BLOODSUCKER_SIGHT_COLOR_CUTOFF list(25, 8, 5) +#define POLL_IGNORE_VASSAL "vassal" // Why waste memory on a dynamic global list if we can just bake it in on compile time? #define BLOODSUCKER_PROTECTED_ROLES list( \ @@ -214,4 +239,5 @@ /datum/species/skeleton, \ /datum/species/zombie, \ /datum/species/mutant, \ + /datum/species/dullahan \ ) \ diff --git a/modular_zubbers/code/__DEFINES/traits.dm b/modular_zubbers/code/__DEFINES/traits.dm index 67a63435c41..0de6ca840a2 100644 --- a/modular_zubbers/code/__DEFINES/traits.dm +++ b/modular_zubbers/code/__DEFINES/traits.dm @@ -1 +1,3 @@ #define TRAIT_MONOPHOBIA "monophobia" + +#define TRAIT_COFFIN_ENLARGED "coffin_enlarged" diff --git a/modular_zubbers/code/__DEFINES/votes.dm b/modular_zubbers/code/__DEFINES/votes.dm index feb1d74a92f..6603d0814d0 100644 --- a/modular_zubbers/code/__DEFINES/votes.dm +++ b/modular_zubbers/code/__DEFINES/votes.dm @@ -1,4 +1,5 @@ /datum/vote/map_vote + count_method = VOTE_COUNT_METHOD_MULTI winner_method = VOTE_WINNER_METHOD_SIMPLE /datum/vote/transfer_vote diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm index 9d8f8655f50..0110cf8a612 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_common.dm @@ -462,8 +462,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/fishing_rod = 5 ) = 25, list( - /obj/item/bedsheet/dorms = 10, - /obj/item/bedsheet/dorms_double = 1 + /obj/effect/spawner/random/bedsheet = 10, + /obj/effect/spawner/random/bedsheet/double = 1 ) = 10, list( /obj/item/ammo_box/foambox = 5, diff --git a/modular_zubbers/code/controllers/subsystem/mapping.dm b/modular_zubbers/code/controllers/subsystem/mapping.dm new file mode 100644 index 00000000000..c7c4f5e2173 --- /dev/null +++ b/modular_zubbers/code/controllers/subsystem/mapping.dm @@ -0,0 +1,14 @@ +//This is for Moonstation. + +/datum/controller/subsystem/mapping/setup_rivers() + . = ..() + // Generate mining ruins + var/list/lava_ruins = levels_by_trait(ZTRAIT_LAVA_RUINS) + for (var/lava_z in lava_ruins) + spawn_rivers(lava_z, 4, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/underground/unexplored) + +/datum/controller/subsystem/mapping/setup_ruins() + . = ..() + var/list/lava_ruins = levels_by_trait(ZTRAIT_LAVA_RUINS) + if (lava_ruins.len) + seedRuins(lava_ruins, CONFIG_GET(number/lavaland_budget), list(/area/lavaland/underground/unexplored), themed_ruins[ZTRAIT_LAVA_RUINS], clear_below = TRUE) diff --git a/modular_zubbers/code/datums/action.dm b/modular_zubbers/code/datums/action.dm new file mode 100644 index 00000000000..9c0995fe94e --- /dev/null +++ b/modular_zubbers/code/datums/action.dm @@ -0,0 +1,3 @@ +/datum/action + /// Extended description of the action, usually shown in an antag UI. + var/power_explanation = "" diff --git a/modular_zubbers/code/datums/armor_overrides.dm b/modular_zubbers/code/datums/armor_overrides.dm index c4ac1da46f7..a7b4c060064 100644 --- a/modular_zubbers/code/datums/armor_overrides.dm +++ b/modular_zubbers/code/datums/armor_overrides.dm @@ -16,6 +16,7 @@ /obj/item/mod/control/pre_equipped/security/Initialize() default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security + applied_modules -= /obj/item/mod/module/headprotector . = ..() /datum/mod_theme/safeguard //HoS @@ -35,6 +36,7 @@ /obj/item/mod/control/pre_equipped/safeguard/Initialize() default_pins += /obj/item/mod/module/armor_booster/nanotrasen/security/safeguard + applied_modules -= /obj/item/mod/module/headprotector . = ..() /datum/mod_theme/magnate // Captain @@ -54,6 +56,7 @@ /obj/item/mod/control/pre_equipped/magnate/Initialize() default_pins += /obj/item/mod/module/armor_booster/nanotrasen/magnate + applied_modules -= /obj/item/mod/module/headprotector . = ..() /datum/mod_theme/responsory // ERT diff --git a/modular_zubbers/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/modular_zubbers/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index a304b0f81be..b6423d25a96 100644 --- a/modular_zubbers/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/modular_zubbers/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -38,6 +38,8 @@ /datum/dynamic_ruleset/roundstart/bloodsucker/execute() for(var/datum/mind/candidate_minds as anything in assigned) if(!candidate_minds.make_bloodsucker()) + candidate_minds.special_role = null + candidate_minds.restricted_roles = null message_admins("[ADMIN_LOOKUPFLW(candidate_minds)] was selected by the [name] ruleset, but couldn't be made into a Bloodsucker.") assigned -= candidate_minds continue diff --git a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm index dcc41d857cd..899297d7447 100644 --- a/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm +++ b/modular_zubbers/code/game/machinery/burger_reactor/reactor.dm @@ -104,11 +104,7 @@ . = ..() -/obj/machinery/power/rbmk2/deconstruct(disassembled = TRUE) - - if(flags_1 & NO_DECONSTRUCTION) - return - +/obj/machinery/power/rbmk2/on_deconstruction(disassembled = TRUE) if(!disassembled && stored_rod) //Uh oh. var/turf/T = get_turf(src) @@ -130,7 +126,6 @@ stored_rod.take_damage(1000,armour_penetration=100) if(stored_rod) //Just in case. remove_rod() - . = ..() /obj/machinery/power/rbmk2/preloaded/Initialize(mapload) diff --git a/modular_zubbers/code/game/machinery/computer/arcade/arcade.dm b/modular_zubbers/code/game/machinery/computer/arcade/arcade.dm deleted file mode 100644 index eb1d69582f5..00000000000 --- a/modular_zubbers/code/game/machinery/computer/arcade/arcade.dm +++ /dev/null @@ -1,14 +0,0 @@ -/obj/machinery/computer/arcade/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/stack/arcadeticket)) - var/obj/item/stack/arcadeticket/T = O - T.pay_tickets() - prizevend(user) - to_chat(user, span_notice("You turn in 1 ticket and claim a prize from [src]!")) - return - -/obj/item/stack/arcadeticket/pay_tickets() - amount -= 1 - if (amount <= 0) - qdel(src) - else - update_appearance() diff --git a/modular_zubbers/code/game/machinery/pipe/construction.dm b/modular_zubbers/code/game/machinery/pipe/construction.dm new file mode 100644 index 00000000000..97ad3399a6f --- /dev/null +++ b/modular_zubbers/code/game/machinery/pipe/construction.dm @@ -0,0 +1,4 @@ +//For nolog PR #1116 +/obj/item/pipe/Initialize(mapload) + flags_1 |= SUPERMATTER_NOLOGS_1 + . = ..() diff --git a/modular_zubbers/code/modules/antagonists/_common/antag_datum.dm b/modular_zubbers/code/modules/antagonists/_common/antag_datum.dm new file mode 100644 index 00000000000..14f19dc26e8 --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/_common/antag_datum.dm @@ -0,0 +1,18 @@ + +/datum/antagonist + var/antag_panel_title = "Antagonist Panel" + var/antag_panel_description = "This is the antagonist panel. It contains all the abilities you have access to as an antagonist. Use them wisely." + +/datum/antagonist/proc/ability_ui_data(actions = list()) + var/list/data = list() + data["title"] = "[antag_panel_title]\n[antag_panel_data()]" + data["description"] = antag_panel_description + for(var/datum/action/cooldown/power as anything in actions) + var/list/power_data = list() + + power_data["power_name"] = power.name + power_data["power_explanation"] = power?.power_explanation + power_data["power_icon"] = power.button_icon_state + + data["powers"] += list(power_data) + return data diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm index dba59f4753f..e79f851870d 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/bloodsucker.dm @@ -24,6 +24,8 @@ COOLDOWN_DECLARE(bloodsucker_spam_sol_burn) ///Timer between alerts for Healing messages COOLDOWN_DECLARE(bloodsucker_spam_healing) + /// Timer between exiting torpor + COOLDOWN_DECLARE(bloodsucker_spam_torpor) ///Used for assigning your name var/bloodsucker_name @@ -38,10 +40,10 @@ var/broke_masquerade = FALSE ///How many Masquerade Infractions do we have? var/masquerade_infractions = 0 - ///Blood required to enter Frenzy - var/frenzy_threshold = FRENZY_THRESHOLD_ENTER ///If we are currently in a Frenzy var/frenzied = FALSE + /// sired by a ventrue + var/ventrue_sired ///ALL Powers currently owned var/list/datum/action/cooldown/bloodsucker/powers = list() @@ -91,12 +93,18 @@ TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_VIRUSIMMUNE, - TRAIT_TOXIMMUNE, TRAIT_HARDLY_WOUNDED, TRAIT_NO_MIRROR_REFLECTION, - TRAIT_DRINKS_BLOOD + TRAIT_DRINKS_BLOOD, + TRAIT_TOXIMMUNE, + // Fun fact, toxins can still be applied to you if you loose your liver even with TOXIMMUNE + TRAIT_STABLELIVER ) - var/biotype = MOB_VAMPIRIC + var/static/biotype = MOB_VAMPIRIC + /// Weakref to the owner mob's heart, without bloodsucker_life stops and they die. Handled via signals due to the fact that + /// Bloodsuckers don't take damage from lacking a heart due to TRAIT_NOBREATH + /// Saved here so we can keep a track of it and remove signals properly + var/datum/weakref/heart /** * Apply innate effects is everything given to the mob @@ -110,6 +118,9 @@ RegisterSignal(current_mob, COMSIG_LIVING_LIFE, PROC_REF(LifeTick)) RegisterSignal(current_mob, COMSIG_LIVING_DEATH, PROC_REF(on_death)) RegisterSignal(current_mob, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) + RegisterSignal(current_mob, COMSIG_QDELETING, PROC_REF(on_removal)) + RegisterSignal(current_mob, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_organ_gain)) + talking_head() handle_clown_mutation(current_mob, mob_override ? null : "As a vampiric clown, you are no longer a danger to yourself. Your clownish nature has been subdued by your thirst for blood.") add_team_hud(current_mob) @@ -117,7 +128,9 @@ on_hud_created() else RegisterSignal(current_mob, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created)) - current_mob?.dna?.species.on_bloodsucker_gain(current_mob) + if(ishuman(current_mob)) + current_mob?.dna?.species.on_bloodsucker_gain(current_mob) + add_signals_to_heart(current_mob) #ifdef BLOODSUCKER_TESTING var/turf/user_loc = get_turf(current_mob) new /obj/structure/closet/crate/coffin(user_loc) @@ -126,13 +139,14 @@ /** * Remove innate effects is everything given to the mob - * When a body is tranferred, this is called on the old mob. + * When a body is transferred, this is called on the old mob. * while on_removal is called ONCE per ANTAG, this is called ONCE per BODY. */ /datum/antagonist/bloodsucker/remove_innate_effects(mob/living/mob_override) . = ..() var/mob/living/carbon/current_mob = mob_override || owner.current - UnregisterSignal(current_mob, list(COMSIG_LIVING_LIFE, COMSIG_ATOM_EXAMINE, COMSIG_LIVING_DEATH, COMSIG_SPECIES_GAIN)) + remove_signals_from_heart(current_mob) + UnregisterSignal(current_mob, list(COMSIG_LIVING_LIFE, COMSIG_ATOM_EXAMINE, COMSIG_LIVING_DEATH, COMSIG_SPECIES_GAIN, COMSIG_QDELETING)) handle_clown_mutation(current_mob, removing = FALSE) if(current_mob.hud_used) @@ -160,17 +174,21 @@ bloodsucker_hud.show_hud(bloodsucker_hud.hud_version) UnregisterSignal(owner.current, COMSIG_MOB_HUD_CREATED) + update_hud() + update_blood_hud() /// Override some properties of incompatible species /datum/antagonist/bloodsucker/proc/on_species_gain(mob/living/carbon/human/target, datum/species/current_species, datum/species/old_species) SIGNAL_HANDLER if(!ishuman(owner.current)) return + add_signals_to_heart(target) var/mob/living/carbon/human/user = owner.current user?.dna?.species.on_bloodsucker_gain(target) /datum/antagonist/bloodsucker/get_admin_commands() . = ..() + .["Set blood level"] = CALLBACK(src, PROC_REF(admin_set_blood)) .["Give Level"] = CALLBACK(src, PROC_REF(RankUp), TRUE) if(bloodsucker_level_unspent >= 1) .["Remove Level"] = CALLBACK(src, PROC_REF(RankDown)) @@ -187,13 +205,14 @@ ///Called when you get the antag datum, called only ONCE per antagonist. /datum/antagonist/bloodsucker/on_gain() + if(!owner?.current) + return ..() RegisterSignal(SSsunlight, COMSIG_SOL_RANKUP_BLOODSUCKERS, PROC_REF(sol_rank_up)) RegisterSignal(SSsunlight, COMSIG_SOL_NEAR_START, PROC_REF(sol_near_start)) RegisterSignal(SSsunlight, COMSIG_SOL_END, PROC_REF(on_sol_end)) RegisterSignal(SSsunlight, COMSIG_SOL_RISE_TICK, PROC_REF(handle_sol)) RegisterSignal(SSsunlight, COMSIG_SOL_WARNING_GIVEN, PROC_REF(give_warning)) - - if(IS_VASSAL(owner.current)) // Vassals shouldnt be getting the same benefits as Bloodsuckers. + if(ventrue_sired) // sired bloodsuckers shouldnt be getting the same benefits as Bloodsuckers. bloodsucker_level_unspent = 0 show_in_roundend = FALSE else @@ -213,13 +232,16 @@ /// Called by the remove_antag_datum() and remove_all_antag_datums() mind procs for the antag datum to handle its own removal and deletion. /datum/antagonist/bloodsucker/on_removal() + UnregisterSignal(SSsunlight, list(COMSIG_SOL_RANKUP_BLOODSUCKERS, COMSIG_SOL_NEAR_START, COMSIG_SOL_END, COMSIG_SOL_RISE_TICK, COMSIG_SOL_WARNING_GIVEN, COMSIG_QDELETING)) + free_all_vassals() + check_cancel_sunlight() //check if sunlight should end + if(!owner?.current) + return if(ishuman(owner.current)) var/mob/living/carbon/human/user = owner.current user?.dna?.species.regenerate_organs(user, null, TRUE) - UnregisterSignal(SSsunlight, list(COMSIG_SOL_RANKUP_BLOODSUCKERS, COMSIG_SOL_NEAR_START, COMSIG_SOL_END, COMSIG_SOL_RISE_TICK, COMSIG_SOL_WARNING_GIVEN)) clear_powers_and_stats() - check_cancel_sunlight() //check if sunlight should end - free_all_vassals() + ventrue_sired = null return ..() /datum/antagonist/bloodsucker/on_body_transfer(mob/living/old_body, mob/living/new_body) @@ -306,7 +328,7 @@ return finish_preview_icon(final_icon) /datum/antagonist/bloodsucker/ui_static_data(mob/user) - var/list/data = list() + var/list/data = ability_ui_data(powers) //we don't need to update this that much. data["in_clan"] = !!my_clan var/list/clan_data = list() @@ -317,15 +339,6 @@ data["clan"] += list(clan_data) - for(var/datum/action/cooldown/bloodsucker/power as anything in powers) - var/list/power_data = list() - - power_data["power_name"] = power.name - power_data["power_explanation"] = power.power_explanation - power_data["power_icon"] = power.button_icon_state - - data["powers"] += list(power_data) - return data + ..() /datum/antagonist/bloodsucker/ui_assets(mob/user) @@ -343,8 +356,9 @@ if(my_clan) return assign_clan_and_bane() + if(ui.closing) + return ui.send_full_update(force = TRUE) - return /datum/antagonist/bloodsucker/roundend_report() var/list/report = list() @@ -403,10 +417,10 @@ var/obj/item/bodypart/user_left_arm = user.get_bodypart(BODY_ZONE_L_ARM) var/obj/item/bodypart/user_right_arm = user.get_bodypart(BODY_ZONE_R_ARM) user.dna?.remove_all_mutations() - user_left_arm.unarmed_damage_low += 1 //lowest possible punch damage - 0 - user_left_arm.unarmed_damage_high += 1 //highest possible punch damage - 9 - user_right_arm.unarmed_damage_low += 1 //lowest possible punch damage - 0 - user_right_arm.unarmed_damage_high += 1 //highest possible punch damage - 9 + user_left_arm.unarmed_damage_low += 1 //lowest possible punch damage - 6 now + user_left_arm.unarmed_damage_high += 1 //highest possible punch damage - 11 + user_right_arm.unarmed_damage_low += 1 //lowest possible punch damage - 6 + user_right_arm.unarmed_damage_high += 1 //highest possible punch damage - 11 user.mob_biotypes |= biotype //Give Bloodsucker Traits owner.current.add_traits(bloodsucker_traits, BLOODSUCKER_TRAIT) @@ -417,7 +431,7 @@ if(HAS_TRAIT(owner.current, TRAIT_SKITTISH)) REMOVE_TRAIT(owner.current, TRAIT_SKITTISH, ROUNDSTART_TRAIT) // Tongue & Language - owner.current.grant_language(/datum/language/vampiric, LANGUAGE_SPOKEN, LANGUAGE_MIND) + owner.current.grant_language(/datum/language/vampiric, ALL, LANGUAGE_MIND) /// Clear Disabilities & Organs heal_vampire_organs() @@ -439,6 +453,8 @@ // Powers for(var/datum/action/cooldown/bloodsucker/all_powers as anything in powers) RemovePower(all_powers) + if(QDELETED(owner.current)) + return /// Stats if(ishuman(owner.current)) var/mob/living/carbon/human/user = owner.current @@ -451,6 +467,9 @@ if(right_arm) right_arm.unarmed_damage_low = initial(right_arm.unarmed_damage_low) right_arm.unarmed_damage_high = initial(right_arm.unarmed_damage_high) + var/obj/item/bodypart/chest/target_chest = owner.current.get_bodypart(BODY_ZONE_CHEST) + if(target_chest && target_chest.bodypart_flags & BODYPART_UNREMOVABLE) + target_chest.bodypart_flags &= ~BODYPART_UNREMOVABLE // Remove all bloodsucker traits owner.current.remove_traits(bloodsucker_traits, BLOODSUCKER_TRAIT) // Language @@ -497,7 +516,7 @@ conversion_objective.objective_name = "Optional Objective" objectives += conversion_objective if(2) // Heart Thief Objective - var/datum/objective/bloodsucker/heartthief/heartthief_objective = new + var/datum/objective/steal_n_of_type/hearts/heartthief_objective = new heartthief_objective.owner = owner heartthief_objective.objective_name = "Optional Objective" objectives += heartthief_objective diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/conversion.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/conversion.dm index cd63b58b6ac..dccc4f21700 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/conversion.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/conversion.dm @@ -25,7 +25,7 @@ * conversion_target - Person being vassalized */ /datum/antagonist/bloodsucker/proc/can_make_vassal(mob/living/conversion_target) - if(!iscarbon(conversion_target) || conversion_target.stat > UNCONSCIOUS) + if(!iscarbon(conversion_target) || (conversion_target.stat < CONSCIOUS)) return FALSE // No Mind! if(!conversion_target.mind) @@ -53,7 +53,6 @@ /datum/antagonist/bloodsucker/proc/make_vassal(mob/living/conversion_target) if(!can_make_vassal(conversion_target)) return FALSE - //Check if they used to be a Vassal and was stolen. var/datum/antagonist/vassal/old_vassal = conversion_target.mind.has_antag_datum(/datum/antagonist/vassal) if(old_vassal) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/hud.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/hud.dm index 812c2c1deaf..48be42016ee 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/hud.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/hud.dm @@ -37,45 +37,49 @@ /// Update Blood Counter + Rank Counter /datum/antagonist/bloodsucker/proc/update_hud() - var/valuecolor - if(bloodsucker_blood_volume > BLOOD_VOLUME_SAFE) - valuecolor = "#FFDDDD" - else if(bloodsucker_blood_volume > BLOOD_VOLUME_BAD) - valuecolor = "#FFAAAA" - - if(blood_display) - blood_display.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(valuecolor, bloodsucker_blood_volume) - if(vamprank_display) if(bloodsucker_level_unspent > 0) vamprank_display.icon_state = "[initial(vamprank_display.icon_state)]_up" else vamprank_display.icon_state = initial(vamprank_display.icon_state) - vamprank_display.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(valuecolor, bloodsucker_level) + vamprank_display.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(hud_text_color(), bloodsucker_level) - if(sunlight_display) - if(SSsunlight.sunlight_active) - valuecolor = "#FF5555" - sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_day" - else - switch(round(SSsunlight.time_til_cycle, 1)) - if(0 to 30) - sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_30" - valuecolor = "#FFCCCC" - if(31 to 60) - sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_60" - valuecolor = "#FFE6CC" - if(61 to 90) - sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_90" - valuecolor = "#FFFFCC" - else - sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_night" - valuecolor = "#FFFFFF" - sunlight_display.maptext = FORMAT_BLOODSUCKER_SUNLIGHT_TEXT( \ - valuecolor, \ - (SSsunlight.time_til_cycle >= 60) ? "[round(SSsunlight.time_til_cycle / 60, 1)] m" : "[round(SSsunlight.time_til_cycle, 1)] s" \ - ) + update_sol_hud() +/datum/antagonist/bloodsucker/proc/hud_text_color() + return bloodsucker_blood_volume > BLOOD_VOLUME_SAFE ? "#FFDDDD" : "#FFAAAA" + +/// Updated every time blood is changed by either +/datum/antagonist/bloodsucker/proc/update_blood_hud() + if(!blood_display) + return + blood_display.maptext = FORMAT_BLOODSUCKER_HUD_TEXT(hud_text_color(), bloodsucker_blood_volume) + +/datum/antagonist/bloodsucker/proc/update_sol_hud() + var/valuecolor = hud_text_color() + if(!sunlight_display) + return + if(SSsunlight.sunlight_active) + valuecolor = "#FF5555" + sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_day" + else + switch(round(SSsunlight.time_til_cycle, 1)) + if(0 to 30) + sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_30" + valuecolor = "#FFCCCC" + if(31 to 60) + sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_60" + valuecolor = "#FFE6CC" + if(61 to 90) + sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_90" + valuecolor = "#FFFFCC" + else + sunlight_display.icon_state = "[initial(sunlight_display.icon_state)]_night" + valuecolor = "#FFFFFF" + sunlight_display.maptext = FORMAT_BLOODSUCKER_SUNLIGHT_TEXT( \ + valuecolor, \ + (SSsunlight.time_til_cycle >= 60) ? "[round(SSsunlight.time_til_cycle / 60, 1)] m" : "[round(SSsunlight.time_til_cycle, 1)] s" \ + ) /// 1 tile down #undef UI_BLOOD_DISPLAY /// 2 tiles down diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm index 78a9f1a37b0..ef7857b4e1e 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm @@ -8,20 +8,21 @@ var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(exposed_mob) if(!bloodsuckerdatum) return ..() - bloodsuckerdatum.bloodsucker_blood_volume = min(bloodsuckerdatum.bloodsucker_blood_volume + round(reac_volume, 0.1), BLOOD_VOLUME_MAXIMUM) - + if(bloodsuckerdatum.bloodsucker_blood_volume > BLOOD_VOLUME_NORMAL) + return + bloodsuckerdatum.AdjustBloodVolume(round(reac_volume, 0.1)) /mob/living/carbon/transfer_blood_to(atom/movable/AM, amount, forced) . = ..() - if(!mind) return var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(/datum/antagonist/bloodsucker) if(!bloodsuckerdatum) return - bloodsuckerdatum.bloodsucker_blood_volume -= amount + bloodsuckerdatum.AdjustBloodVolume(-amount) -/// Prevents using a Memento Mori +// Prevents using a Memento Mori +// todo move this to it's own trait /obj/item/clothing/neck/necklace/memento_mori/memento(mob/living/carbon/human/user) if(IS_BLOODSUCKER(user)) to_chat(user, span_warning("The Memento notices your undead soul, and refuses to react..")) @@ -35,6 +36,7 @@ return ..() // Used when analyzing a Bloodsucker, Masquerade will hide brain traumas (Unless you're a Beefman) +/// todo move this to it's own trait or something /mob/living/carbon/get_traumas() if(!mind) return ..() @@ -52,7 +54,11 @@ if(bloodsuckerdatum) . += "" . += "Blood Drank: [bloodsuckerdatum.total_blood_drank]" - . += "Frenzy blood threshold: [bloodsuckerdatum.frenzy_enter_threshold()]" + . += "Maximum blood: [bloodsuckerdatum.max_blood_volume]" + if(bloodsuckerdatum.frenzied) + . += "Frenzy exit blood threshold: [bloodsuckerdatum.frenzy_exit_threshold()]" + else + . += "Frenzy blood threshold: [bloodsuckerdatum.frenzy_enter_threshold()]" /datum/outfit/bloodsucker_outfit name = "Bloodsucker outfit (Preview only)" @@ -96,3 +102,16 @@ continue amount += chosen_bodypart.burn_dam return amount + +/mob/living/brain/can_be_revived() + if(health <= HEALTH_THRESHOLD_DEAD) + return FALSE + if(IS_BLOODSUCKER(src)) + return TRUE + . =..() + +// prevents players being trapped in their brain, alive, yet limbless and voiceless +/obj/item/bodypart/head/drop_organs(mob/user, violent_removal) + var/obj/item/organ/internal/brain/brain = locate(/obj/item/organ/internal/brain) in src + brain.brainmob.death() + . = ..() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm index 009b7bf0bdb..44fcc51f6fd 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/life.dm @@ -4,27 +4,27 @@ /// Runs from COMSIG_LIVING_LIFE, handles Bloodsucker constant proccesses. /datum/antagonist/bloodsucker/proc/LifeTick(mob/living/source, seconds_per_tick, times_fired) SIGNAL_HANDLER - - if(isbrain(owner.current)) - return if(!owner) INVOKE_ASYNC(src, PROC_REF(HandleDeath)) return - if(HAS_TRAIT(owner.current, TRAIT_NODEATH)) + if(isbrain(owner.current)) + INVOKE_ASYNC(src, PROC_REF(update_hud)) + return + if(HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) check_end_torpor() // Deduct Blood - if(owner.current.stat == CONSCIOUS && !HAS_TRAIT(owner.current, TRAIT_IMMOBILIZED) && !HAS_TRAIT(owner.current, TRAIT_NODEATH)) - INVOKE_ASYNC(src, PROC_REF(AddBloodVolume), -BLOODSUCKER_PASSIVE_BLOOD_DRAIN) // -.1 currently + if(owner.current.stat == CONSCIOUS && !HAS_TRAIT(owner.current, TRAIT_IMMOBILIZED) && !HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) + INVOKE_ASYNC(src, PROC_REF(AdjustBloodVolume), -BLOODSUCKER_PASSIVE_BLOOD_DRAIN) // -.1 currently if(HandleHealing()) if((COOLDOWN_FINISHED(src, bloodsucker_spam_healing)) && bloodsucker_blood_volume > 0) to_chat(owner.current, span_notice("The power of your blood begins knitting your wounds...")) COOLDOWN_START(src, bloodsucker_spam_healing, BLOODSUCKER_SPAM_HEALING) // Standard Updates - SEND_SIGNAL(src, COMSIG_BLOODSUCKER_ON_LIFETICK) INVOKE_ASYNC(src, PROC_REF(HandleStarving)) INVOKE_ASYNC(src, PROC_REF(update_blood)) INVOKE_ASYNC(src, PROC_REF(update_hud)) + SEND_SIGNAL(src, COMSIG_BLOODSUCKER_ON_LIFETICK) /datum/antagonist/bloodsucker/proc/on_death(mob/living/source, gibbed) SIGNAL_HANDLER @@ -39,16 +39,33 @@ /** * ## BLOOD STUFF */ -/datum/antagonist/bloodsucker/proc/AddBloodVolume(value) +/datum/antagonist/bloodsucker/proc/AdjustBloodVolume(value) bloodsucker_blood_volume = clamp(bloodsucker_blood_volume + value, 0, max_blood_volume) + update_blood_hud() + +/datum/antagonist/bloodsucker/proc/SetBloodVolume(value) + bloodsucker_blood_volume = clamp(value, 0, max_blood_volume) + update_blood_hud() + +#define MASQUERADE /datum/action/cooldown/bloodsucker/masquerade /datum/antagonist/bloodsucker/proc/AddHumanityLost(value) - // 100 humanity lost already causes you to frenzy at 25 + 100 * 10 = 1025 blood and deal 1 + 100 / 10 = 11 burn per second due to frenzy - if(humanity_lost >= 100) - to_chat(owner.current, span_warning("You hit the maximum amount of lost Humanty, you are far from Human.")) + if(value == 0) return - humanity_lost += value - to_chat(owner.current, span_warning("You feel as if you lost some of your humanity, you will now enter Frenzy at [FRENZY_THRESHOLD_ENTER + (humanity_lost * 10)] Blood.")) + var/has_masq = is_path_in_list(MASQUERADE, powers) + if(value + humanity_lost >= HUMANITY_LOST_MAXIMUM) + if(has_masq) + RemovePowerByPath(MASQUERADE) + to_chat(owner.current, span_warning("You hit the maximum amount of lost Humanty, you are far from Human. You've forgotten how to pretend to be like your prey...")) + else + to_chat(owner.current, span_hypnophrase("The Beast, it yearns for Blood...")) + else if(!has_masq) + BuyPower(MASQUERADE) + to_chat(owner.current, span_hypnophrase("You've remembered, yet again, how it feels to live again.")) + humanity_lost = clamp(value, 0, HUMANITY_LOST_MAXIMUM) + to_chat(owner.current, span_warning("You feel as if you [value < 0 ? "gained" : "lost" ] some of your humanity, you will now enter Frenzy at [FRENZY_THRESHOLD_ENTER + (humanity_lost * 10)] Blood.")) + +#undef MASQUERADE /// mult: SILENT feed is 1/3 the amount /datum/antagonist/bloodsucker/proc/handle_feeding(mob/living/carbon/target, mult=1, power_level) @@ -74,7 +91,7 @@ blood_taken /= 2 //if (!iscarbon(target)) // Penalty for Animals (they're junk food) // Apply to Volume - AddBloodVolume(blood_taken) + AdjustBloodVolume(blood_taken) // Reagents (NOT Blood!) if(target.reagents && target.reagents.total_volume) target.reagents.trans_to(owner.current, INGEST, 1) // Run transfer of 1 unit of reagent from them to me. @@ -90,42 +107,49 @@ /datum/antagonist/bloodsucker/proc/HandleHealing(mult = 1) var/actual_regen = bloodsucker_regen_rate + additional_regen // Don't heal if I'm staked or on Masquerade (+ not in a Coffin). Masqueraded Bloodsuckers in a Coffin however, will heal. - if(owner.current.am_staked() || (HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && !HAS_TRAIT(owner.current, TRAIT_NODEATH))) + if(owner.current.am_staked() || (HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && !HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT))) return FALSE // Garlic in you? No healing for you! if(HAS_TRAIT(owner.current, TRAIT_GARLIC_REAGENT)) return FALSE - owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (actual_regen * 4) * mult) //adjustBrainLoss(-1 * (actual_regen * 4) * mult, 0) + owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * actual_regen * mult) //adjustBrainLoss(-1 * (actual_regen * 4) * mult, 0) if(!iscarbon(owner.current)) // Damage Heal: Do I have damage to ANY bodypart? return FALSE var/mob/living/carbon/user = owner.current var/costMult = 1 // Coffin makes it cheaper - var/bruteheal = min(user.getBruteLoss_nonProsthetic(), actual_regen) // BRUTE: Always Heal + // If you're a synth, you heal prosthetic damage. + var/bruteLoss = getBruteLoss() + var/bruteheal = min(bruteLoss, actual_regen) // BRUTE: Always Heal var/fireheal = 0 // BURN: Heal in Coffin while Fakedeath, or when damage above maxhealth (you can never fully heal fire) // Checks if you're in a coffin here, additionally checks for Torpor right below it. var/amInCoffin = istype(user.loc, /obj/structure/closet/crate/coffin) - if(amInCoffin && HAS_TRAIT(user, TRAIT_NODEATH)) + if(amInCoffin && HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) if(HAS_TRAIT(owner.current, TRAIT_MASQUERADE) && (COOLDOWN_FINISHED(src, bloodsucker_spam_healing))) to_chat(user, span_alert("You do not heal while your Masquerade ability is active.")) COOLDOWN_START(src, bloodsucker_spam_healing, BLOODSUCKER_SPAM_MASQUERADE) return FALSE - fireheal = min(user.getFireLoss_nonProsthetic(), actual_regen) + fireheal = min(getFireLoss(), actual_regen) mult *= 5 // Increase multiplier if we're sleeping in a coffin. costMult /= 2 // Decrease cost if we're sleeping in a coffin. user.extinguish_mob() + user.bodytemperature = user.get_body_temp_normal() + if(ishuman(user)) + var/mob/living/carbon/human/humie = user + humie.set_coretemperature(humie.get_body_temp_normal(apply_change = FALSE)) user.remove_all_embedded_objects() // Remove Embedded! if(check_limbs(costMult)) return TRUE // In Torpor, but not in a Coffin? Heal faster anyways. - else if(HAS_TRAIT(user, TRAIT_NODEATH)) - fireheal = min(user.getFireLoss_nonProsthetic(), actual_regen) / 1.2 // 20% slower than being in a coffin + else if(HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) + var/fireloss = getFireLoss() + fireheal = min(fireloss, actual_regen) / 1.2 // 20% slower than being in a coffin mult *= 3 // Heal if Damaged - if((bruteheal + fireheal > 0) && mult != 0) // Just a check? Don't heal/spend, and return. + if((bruteheal + fireheal) && mult != 0) // Just a check? Don't heal/spend, and return. // We have damage. Let's heal (one time) - user.adjustBruteLoss(-bruteheal * mult, forced=TRUE) // Heal BRUTE / BURN in random portions throughout the body. - user.adjustFireLoss(-fireheal * mult, forced=TRUE) - AddBloodVolume(((bruteheal * -0.5) + (fireheal * -1)) * costMult * mult) // Costs blood to heal + user.adjustBruteLoss(-bruteheal * mult) // Heal BRUTE / BURN in random portions throughout the body. + user.adjustFireLoss(-fireheal * mult) + AdjustBloodVolume(((bruteheal * -0.5) + (fireheal * -1)) * costMult * mult) // Costs blood to heal return TRUE /datum/antagonist/bloodsucker/proc/check_limbs(costMult = 1) @@ -136,9 +160,9 @@ return FALSE for(var/missing_limb in missing) //Find ONE Limb and regenerate it. user.regenerate_limb(missing_limb, FALSE) - AddBloodVolume(-limb_regen_cost) + AdjustBloodVolume(-limb_regen_cost) var/obj/item/bodypart/missing_bodypart = user.get_bodypart(missing_limb) // 2) Limb returns Damaged - missing_bodypart.brute_dam = 60 + missing_bodypart.brute_dam = missing_bodypart.max_damage to_chat(user, span_notice("Your flesh knits as it regrows your [missing_bodypart]!")) playsound(user, 'sound/magic/demon_consume.ogg', 50, TRUE) return TRUE @@ -153,18 +177,22 @@ * * This is called on Bloodsucker's Assign, and when they end Torpor. */ - -/datum/antagonist/bloodsucker/proc/heal_vampire_organs() +/// TODO: Separate this into smaller functions +/datum/antagonist/bloodsucker/proc/heal_vampire_organs(regenerate_heart = FALSE) var/mob/living/carbon/bloodsuckeruser = owner.current - + // please don't poison or asphyxiate the immune + bloodsuckeruser.setToxLoss(0, forced = TRUE) + bloodsuckeruser.setOxyLoss(0, forced = TRUE) if(!bloodsuckeruser) return - + if(HAS_TRAIT_FROM_ONLY(bloodsuckeruser, TRAIT_HUSK, CHANGELING_DRAIN) || bloodsuckeruser.has_status_effect(/datum/status_effect/gutted)) + to_chat(bloodsuckeruser, span_danger("Your immortal blood has healed your body from near-irrecoverable damage, but has used nearly all of your blood in doing so!")) + AddHumanityLost(2) + SetBloodVolume(min(bloodsucker_blood_volume, frenzy_enter_threshold() * 2)) + bloodsuckeruser.cure_husk(CHANGELING_DRAIN) bloodsuckeruser.cure_husk(BURN) - bloodsuckeruser.regenerate_organs(regenerate_existing = FALSE) - - for(var/obj/item/organ/organ as anything in bloodsuckeruser.organs) - organ.set_organ_damage(0) + if(regenerate_heart || bloodsuckeruser.get_organ_slot(ORGAN_SLOT_HEART)) + bloodsuckeruser.regenerate_organs(regenerate_existing = FALSE) if(!HAS_TRAIT(bloodsuckeruser, TRAIT_MASQUERADE)) var/obj/item/organ/internal/heart/current_heart = bloodsuckeruser.get_organ_slot(ORGAN_SLOT_HEART) current_heart.Stop() @@ -174,6 +202,10 @@ current_eyes.color_cutoffs = BLOODSUCKER_SIGHT_COLOR_CUTOFF current_eyes.sight_flags = SEE_MOBS bloodsuckeruser.update_sight() + /// Disable gutting for the chest + var/obj/item/bodypart/chest/target_chest = bloodsuckeruser.get_bodypart(BODY_ZONE_CHEST) + if(target_chest && !(target_chest.bodypart_flags & BODYPART_UNREMOVABLE)) + target_chest.bodypart_flags |= BODYPART_UNREMOVABLE // Sometimes bloodsuckers can get into a loop of reviving and dying, if they somehow get a new body without being revived. if(_listen_lookup?[COMSIG_BLOODSUCKER_ON_LIFETICK] || bloodsuckeruser._listen_lookup?[COMSIG_LIVING_REVIVE]) on_revive() @@ -184,7 +216,8 @@ // From [powers/panacea.dm] var/list/bad_organs = list( bloodsuckeruser.get_organ_by_type(/obj/item/organ/internal/body_egg), - bloodsuckeruser.get_organ_by_type(/obj/item/organ/internal/zombie_infection)) + bloodsuckeruser.get_organ_by_type(/obj/item/organ/internal/zombie_infection) + ) for(var/tumors in bad_organs) var/obj/item/organ/yucky_organs = tumors if(!istype(yucky_organs)) @@ -214,9 +247,14 @@ FinalDeath() return // Temporary Death? Convert to Torpor. - if(HAS_TRAIT(owner.current, TRAIT_NODEATH)) + if(HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT) || isbrain(owner.current)) return - check_begin_torpor(TRUE) + // Won't torpor without vital organs, as this means they'd revive without a heart + if(ishuman(owner.current)) + var/mob/living/carbon/human/humie = owner.current + if(humie.dna.species.mutantheart && !owner.current.get_organ_slot(ORGAN_SLOT_HEART)) + return + check_begin_torpor(TORPOR_SKIP_CHECK_ALL) /datum/antagonist/bloodsucker/proc/HandleStarving() // I am thirsty for blood! // Nutrition - The amount of blood is how full we are. @@ -226,11 +264,11 @@ // handled in bloodsucker_integration.dm // BLOOD_VOLUME_EXIT: [250] - Exit Frenzy (If in one) This is high because we want enough to kill the poor soul they feed off of. var/datum/status_effect/frenzy/status_effect = owner.current.has_status_effect(/datum/status_effect/frenzy) - if(bloodsucker_blood_volume >= frenzy_exit_threshold() && frenzied && status_effect.duration == -1) + if(bloodsucker_blood_volume >= frenzy_exit_threshold() && frenzied && status_effect?.duration == -1) status_effect.duration = world.time + 10 SECONDS owner.current.balloon_alert(owner.current, "Frenzy ends in 10 seconds!") // BLOOD_VOLUME_BAD: [224] - Jitter - if(bloodsucker_blood_volume < BLOOD_VOLUME_BAD && prob(0.5) && !HAS_TRAIT(owner.current, TRAIT_NODEATH) && !HAS_TRAIT(owner.current, TRAIT_MASQUERADE)) + if(bloodsucker_blood_volume < BLOOD_VOLUME_BAD && prob(0.5) && !HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT) && !HAS_TRAIT(owner.current, TRAIT_MASQUERADE)) owner.current.set_timed_status_effect(3 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) // BLOOD_VOLUME_SURVIVE: [122] - Blur Vision if(bloodsucker_blood_volume < BLOOD_VOLUME_SURVIVE) @@ -267,10 +305,25 @@ owner.current.blood_volume = bloodsucker_blood_volume +/// Turns the bloodsucker into a wacky talking head. +/datum/antagonist/bloodsucker/proc/talking_head() + var/mob/living/poor_fucker = owner.current + // Don't do anything if we're not actually inside a brain and a head + if(!is_head(poor_fucker) || poor_fucker.stat != DEAD || !poor_fucker.can_be_revived()) + return + // Ensure that the HUD updates (We might have lost the heart at some point) + RegisterSignal(poor_fucker, COMSIG_LIVING_LIFE, PROC_REF(LifeTick), TRUE) + poor_fucker.revive() + poor_fucker.stat = CONSCIOUS + to_chat(poor_fucker, span_warning("Your immortal [pick(list("blood", "curse"))] keeps your head alive! Though... what will you do now?")) + // No lungs to speak, let's make it spooky + poor_fucker.speech_span = SPAN_PAPYRUS + /// Gibs the Bloodsucker, roundremoving them. -/datum/antagonist/bloodsucker/proc/FinalDeath() +/datum/antagonist/bloodsucker/proc/FinalDeath(check_organs = FALSE) + SIGNAL_HANDLER // If we have no body, end here. - if(!owner.current) + if(!owner.current || isbrain(owner.current)) return UnregisterSignal(src, list( COMSIG_BLOODSUCKER_ON_LIFETICK, diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/names.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/names.dm index c5d78b293fc..60a9c1c1d74 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/names.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/names.dm @@ -36,7 +36,7 @@ ) ///Returns a Title for the Bloodsucker. -/datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = 0, forced = FALSE) +/datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = FALSE, forced = FALSE) // Already have Title if(!forced && bloodsucker_title != null) return diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm index ca5ea15828c..967ef6cefa7 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/objectives.dm @@ -165,35 +165,23 @@ // NOTE: Look up /steal in objective.dm for inspiration. /// Steal hearts. You just really wanna have some hearts. -/datum/objective/bloodsucker/heartthief +/datum/objective/steal_n_of_type/hearts + martyr_compatible = TRUE name = "heartthief" + wanted_items = (/obj/item/organ/internal/heart) // GENERATE! -/datum/objective/bloodsucker/heartthief/New() - target_amount = rand(2,3) +/datum/objective/steal_n_of_type/hearts/New() + amount = rand(2, 3) + explanation_text = "Steal and keep [amount] organic hearts. Must be obtained from non-monkeys. Examine hearts thoroughly to see if they are valid." + update_explanation_text() ..() -// EXPLANATION -/datum/objective/bloodsucker/heartthief/update_explanation_text() +/datum/objective/steal_n_of_type/hearts/check_if_valid_item(obj/item/organ/internal/heart/current_item) . = ..() - explanation_text = "Steal and keep [target_amount] organic heart\s." - -// WIN CONDITIONS? -/datum/objective/bloodsucker/heartthief/check_completion() - if(!owner.current) + if(current_item.type == /obj/item/organ/internal/heart/monkey || IS_ROBOTIC_ORGAN(current_item)) return FALSE - var/list/all_items = owner.current.get_all_contents() - var/heart_count = 0 - for(var/obj/item/organ/internal/heart/current_hearts in all_items) - if(IS_ROBOTIC_ORGAN(current_hearts)) // No robo-hearts allowed - continue - heart_count++ - - if(heart_count >= target_amount) - return TRUE - return FALSE - ////////////////////////////////////////////////////////////////////////////////////// ///Eat blood from a lot of people @@ -202,7 +190,7 @@ // GENERATE! /datum/objective/bloodsucker/gourmand/New() - target_amount = rand(450,650) + target_amount = rand(800, 3 * BLOOD_VOLUME_NORMAL) ..() // EXPLANATION @@ -285,10 +273,9 @@ var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.current.mind.has_antag_datum(/datum/antagonist/bloodsucker) if(!bloodsuckerdatum) return FALSE - for(var/datum/antagonist/vassal/vassaldatum in bloodsuckerdatum.vassals) - if(IS_FAVORITE_VASSAL(vassaldatum.owner.current)) - if(vassaldatum.owner.has_antag_datum(/datum/antagonist/bloodsucker)) - return TRUE + for(var/datum/antagonist/bloodsucker/sired_vamp in GLOB.antagonists) + if(sired_vamp.ventrue_sired == bloodsuckerdatum) + return TRUE return FALSE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm index 3b7e517de0e..3336ed52256 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/procs.dm @@ -7,6 +7,10 @@ if(vamp_examine) examine_text += vamp_examine +/datum/antagonist/bloodsucker/proc/BuyPowers(powers = list()) + for(var/datum/action/cooldown/bloodsucker/power as anything in powers) + BuyPower(power) + ///Called when a Bloodsucker buys a power: (power) /datum/antagonist/bloodsucker/proc/BuyPower(datum/action/cooldown/bloodsucker/power) for(var/datum/action/cooldown/bloodsucker/current_powers as anything in powers) @@ -25,6 +29,11 @@ powers -= power power.Remove(owner.current) +/datum/antagonist/bloodsucker/proc/RemovePowerByPath(datum/action/cooldown/bloodsucker/power_to_remove) + for(var/datum/action/cooldown/bloodsucker/power as anything in powers) + if(power?.type == power_to_remove) + RemovePower(power) + ///When a Bloodsucker breaks the Masquerade, they get their HUD icon changed, and Malkavian Bloodsuckers get alerted. /datum/antagonist/bloodsucker/proc/break_masquerade(mob/admin) if(broke_masquerade) @@ -43,6 +52,8 @@ return to_chat(owner.current, span_cultboldtalic("You have re-entered the Masquerade.")) broke_masquerade = FALSE + antag_hud_name = "bloodsucker" + add_team_hud(owner.current) /datum/antagonist/bloodsucker/proc/give_masquerade_infraction() if(broke_masquerade) @@ -66,12 +77,6 @@ if(bloodsucker_level_unspent >= 2) to_chat(owner, span_announce("Bloodsucker Tip: If you cannot find or steal a coffin to use, you can build one from wood or metal.")) return - if(max_vassals() >= 1 && !(/datum/crafting_recipe/vassalrack in owner?.learned_recipes)) - owner.teach_crafting_recipe(/datum/crafting_recipe/vassalrack) - owner.teach_crafting_recipe(/datum/crafting_recipe/candelabrum) - owner.teach_crafting_recipe(/datum/crafting_recipe/bloodthrone) - owner.teach_crafting_recipe(/datum/crafting_recipe/meatcoffin) - owner.current.balloon_alert(owner.current, "new recipes learned! Vassalization unlocked!") SpendRank() /datum/antagonist/bloodsucker/proc/RankDown() @@ -94,7 +99,7 @@ ///Disables all powers, accounting for torpor /datum/antagonist/bloodsucker/proc/DisableAllPowers(forced = FALSE) for(var/datum/action/cooldown/bloodsucker/power as anything in powers) - if(forced || ((power.check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT(owner.current, TRAIT_NODEATH))) + if(forced || ((power.check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT))) if(power.active) power.DeactivatePower() @@ -124,16 +129,16 @@ * viewer - The person examining. */ /datum/antagonist/bloodsucker/proc/return_vamp_examine(mob/living/viewer) - if(!viewer.mind) + if(!viewer.mind && !isobserver(viewer)) return FALSE // Viewer is Target's Vassal? - if(viewer.mind.has_antag_datum(/datum/antagonist/vassal) in vassals) + if(!isobserver(viewer) && (viewer.mind.has_antag_datum(/datum/antagonist/vassal) in vassals)) var/returnString = "\[This is your Master!\]" var/returnIcon = "[icon2html('modular_zubbers/icons/misc/language.dmi', world, "bloodsucker")]" returnString += "\n" return returnIcon + returnString // Viewer not a Vamp AND not the target's vassal? - if(!viewer.mind.has_antag_datum((/datum/antagonist/bloodsucker)) && !(viewer in vassals)) + if(!isobserver(viewer) && !viewer.mind.has_antag_datum((/datum/antagonist/bloodsucker)) && !(viewer in vassals)) if(!(HAS_TRAIT(viewer.mind, TRAIT_BLOODSUCKER_HUNTER) && broke_masquerade)) return FALSE // Default String @@ -159,3 +164,88 @@ /datum/antagonist/bloodsucker/proc/frenzy_exit_threshold() return FRENZY_THRESHOLD_EXIT + (humanity_lost * 10) + +/datum/antagonist/bloodsucker/proc/add_signals_to_heart(mob/living/carbon/human/current_mob) + if(heart?.resolve()) + remove_signals_from_heart(current_mob) + var/organ = current_mob.get_organ_slot(ORGAN_SLOT_HEART) + heart = WEAKREF(organ) + RegisterSignal(organ, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removal)) + RegisterSignal(organ, COMSIG_ORGAN_BEING_REPLACED, PROC_REF(before_organ_replace)) + +/datum/antagonist/bloodsucker/proc/remove_signals_from_heart(mob/living/carbon/human/current_mob) + var/organ = heart.resolve() + if(!organ) + return + UnregisterSignal(organ, COMSIG_ORGAN_REMOVED) + UnregisterSignal(organ, COMSIG_ORGAN_BEING_REPLACED) + organ = null + +/datum/antagonist/bloodsucker/proc/on_organ_removal(obj/item/organ/organ, mob/living/carbon/old_owner) + SIGNAL_HANDLER + if(old_owner.get_organ_slot(ORGAN_SLOT_HEART) || organ.slot != ORGAN_SLOT_HEART || !old_owner.dna.species.mutantheart) + return + remove_signals_from_heart(old_owner) + // You don't run bloodsucker life without a heart or brain + RegisterSignal(old_owner, COMSIG_ENTER_COFFIN, PROC_REF(regain_heart)) + UnregisterSignal(old_owner, COMSIG_LIVING_LIFE) + DisableAllPowers(TRUE) + if(HAS_TRAIT_FROM_ONLY(old_owner, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) + torpor_end(TRUE) + to_chat(old_owner, span_userdanger("You have lost your [organ.slot]!")) + to_chat(old_owner, span_warning("This means you will no longer enter torpor nor revive from death, and you will no longer heal any damage, nor can you use your abilities.")) + +/datum/antagonist/bloodsucker/proc/on_organ_gain(mob/living/carbon/human/current_mob, obj/item/organ/replacement) + SIGNAL_HANDLER + if(replacement.slot != ORGAN_SLOT_HEART) + return + // Shit might get really fucked up. Let's try to fix things if it does + if(current_mob != owner.current) + UnregisterSignal(current_mob, COMSIG_CARBON_GAIN_ORGAN) + RegisterSignal(owner.current, COMSIG_CARBON_GAIN_ORGAN) + add_signals_to_heart(owner.current) + RegisterSignal(owner.current, COMSIG_LIVING_LIFE, PROC_REF(LifeTick), TRUE) + CRASH("What the fuck, somehow called on_organ_gain signal on [src] without current_mob being the antag datum's owner?") + UnregisterSignal(current_mob, COMSIG_ENTER_COFFIN) + RegisterSignal(current_mob, COMSIG_LIVING_LIFE, PROC_REF(LifeTick)) + add_signals_to_heart(current_mob) + +/// This handles regen_organs replacing organs, without this the bloodsucker would die for a moment due to their heart being removed for a moment +/datum/antagonist/bloodsucker/proc/before_organ_replace(obj/item/organ/old_organ, obj/item/organ/new_organ) + SIGNAL_HANDLER + if(new_organ.slot != ORGAN_SLOT_HEART) + return + remove_signals_from_heart(owner.current) + +/// checks if we're a brainmob inside a brain & the brain is inside a head +/datum/antagonist/bloodsucker/proc/is_head(mob/living/poor_fucker) + if(!istype(poor_fucker?.loc, /obj/item/organ/internal/brain)) + return + var/obj/brain = poor_fucker.loc + if(!istype(brain?.loc, /obj/item/bodypart/head)) + return + return brain.loc + +// helper procs for damage checking, just in case a synth becomes one, let's them heal thesmelves +/datum/antagonist/bloodsucker/proc/getBruteLoss() + var/mob/living/carbon/human/humie = owner.current + return issynthetic(humie) ? humie.getBruteLoss() : humie.getBruteLoss_nonProsthetic() + +/datum/antagonist/bloodsucker/proc/getFireLoss() + var/mob/living/carbon/human/humie = owner.current + return issynthetic(humie) ? humie.getFireLoss() : humie.getFireLoss_nonProsthetic() + +/datum/antagonist/bloodsucker/proc/admin_set_blood(mob/admin) + var/blood = tgui_input_number(admin, "What blood level to set [owner.current]'s to?", "Blood is life.", floor(bloodsucker_blood_volume), max_blood_volume, 0) + // 0 input is falsey + if(blood == null) + return + SetBloodVolume(blood) + update_hud() + +/datum/antagonist/bloodsucker/proc/regain_heart(mob/coffin_dweller, obj/structure/closet/crate/coffin/coffin, mob/user) + SIGNAL_HANDLER + var/obj/item/organ/heart = locate(/obj/item/organ/internal/heart) in coffin.contents + if(heart && !coffin_dweller.get_organ_slot(ORGAN_SLOT_HEART)) + to_chat(span_warning("You have regained your heart!")) + heart.Insert(coffin_dweller) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm index c34262f120f..d883645dd75 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/sol.dm @@ -41,7 +41,7 @@ /// Cycle through all vamp antags and check if they're inside a closet. /datum/antagonist/bloodsucker/proc/handle_sol() SIGNAL_HANDLER - if(!owner || !owner.current) + if(!owner || !owner.current || isbrain(owner.current)) return if(!istype(owner.current.loc, /obj/structure)) @@ -64,10 +64,10 @@ if(istype(owner.current.loc, /obj/structure/closet/crate/coffin)) // Coffins offer the BEST protection if(owner.current.am_staked() && COOLDOWN_FINISHED(src, bloodsucker_spam_sol_burn)) - to_chat(owner.current, span_userdanger("You are staked! Remove the offending weapon from your heart before sleeping.")) + to_chat(owner.current, span_userdanger("You are staked you will keep burning until it is removed! Remove the offending weapon from your heart before sleeping.")) COOLDOWN_START(src, bloodsucker_spam_sol_burn, BLOODSUCKER_SPAM_SOL) //This should happen twice per Sol - if(!HAS_TRAIT(owner.current, TRAIT_NODEATH)) - check_begin_torpor(TRUE) + if(!HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) + check_begin_torpor(TORPOR_SKIP_CHECK_ALL) owner.current.add_mood_event("vampsleep", /datum/mood_event/coffinsleep) return @@ -112,58 +112,68 @@ * - Having less than 10 Brute & Burn Combined while INSIDE of your Coffin while it isnt Sol. * - Sol being over, dealt with by /sunlight/process() [bloodsucker_daylight.dm] */ -/datum/antagonist/bloodsucker/proc/check_begin_torpor(SkipChecks = FALSE) +/datum/antagonist/bloodsucker/proc/check_begin_torpor(SkipChecks = NONE) var/mob/living/carbon/user = owner.current /// Are we entering Torpor via Sol/Death? Then entering it isnt optional! - if(SkipChecks) - to_chat(user, span_danger("Your immortal body will not yet relinquish your soul to the abyss. You enter Torpor.")) - torpor_begin() + if(SkipChecks & TORPOR_SKIP_CHECK_ALL) + if(COOLDOWN_FINISHED(src, bloodsucker_spam_torpor)) + to_chat(user, span_danger("Your immortal body will not yet relinquish your soul to the abyss. You enter Torpor.")) + torpor_begin(TRUE) return /// Prevent Torpor whilst frenzied. - if(frenzied || (IS_DEAD_OR_INCAP(user) && bloodsucker_blood_volume == 0)) + if(!(SkipChecks & TORPOR_SKIP_CHECK_FRENZY) && (frenzied || (IS_DEAD_OR_INCAP(user) && bloodsucker_blood_volume == 0))) to_chat(user, span_userdanger("Your frenzy prevents you from entering torpor!")) return - var/total_brute = user.getBruteLoss_nonProsthetic() - var/total_burn = user.getFireLoss_nonProsthetic() - var/total_damage = total_brute + total_burn + // sometimes you might incur these damage types when you really, should not, important to check for it here so we can heal it later + var/total_damage = getBruteLoss() + getFireLoss() + user.getToxLoss() + user.getOxyLoss() /// Checks - Not daylight & Has more than 10 Brute/Burn & not already in Torpor - if(!SSsunlight.sunlight_active && total_damage >= 10 && !HAS_TRAIT(owner.current, TRAIT_NODEATH)) + if(SkipChecks & TORPOR_SKIP_CHECK_DAMAGE || !SSsunlight.sunlight_active && total_damage >= 10 && !HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_NODEATH, BLOODSUCKER_TRAIT)) torpor_begin() /datum/antagonist/bloodsucker/proc/check_end_torpor() var/mob/living/carbon/user = owner.current - var/total_brute = user.getBruteLoss_nonProsthetic() - var/total_burn = user.getFireLoss_nonProsthetic() + var/total_brute = getBruteLoss() + var/total_burn = getFireLoss() + // for waking up we ignore all other damage types so we don't get stuck var/total_damage = total_brute + total_burn - if(bloodsucker_blood_volume == 0 || owner.current.am_staked() || HAS_TRAIT(owner.current, TRAIT_GARLIC_REAGENT)) - torpor_end() if(total_burn >= user.maxHealth * 2) return FALSE if(SSsunlight.sunlight_active) return FALSE + if(bloodsucker_blood_volume == 0 || owner.current.am_staked() || HAS_TRAIT(owner.current, TRAIT_GARLIC_REAGENT)) + // If you're frenzying, you need a bit more health to actually have a chance to do something + if(frenzied && total_damage >= user.maxHealth) + return FALSE + torpor_end() // You are in a Coffin, so instead we'll check TOTAL damage, here. if(istype(user.loc, /obj/structure/closet/crate/coffin)) if(total_damage <= 10) torpor_end() else - if(total_brute <= 10) + if(total_damage <= 10) torpor_end() + return TRUE -/datum/antagonist/bloodsucker/proc/torpor_begin() - to_chat(owner.current, span_notice("You enter the horrible slumber of deathless Torpor. You will heal until you are renewed.")) +/datum/antagonist/bloodsucker/proc/torpor_begin(silent = FALSE) + // slow down bucko + if(!COOLDOWN_FINISHED(src, bloodsucker_spam_torpor)) + return + if(!silent) + to_chat(owner.current, span_notice("You enter the horrible slumber of deathless Torpor. You will heal until you are renewed.")) // Force them to go to sleep REMOVE_TRAIT(owner.current, TRAIT_SLEEPIMMUNE, BLOODSUCKER_TRAIT) // Without this, you'll just keep dying while you recover. owner.current.add_traits(list(TRAIT_NODEATH, TRAIT_FAKEDEATH, TRAIT_DEATHCOMA, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE), BLOODSUCKER_TRAIT) - owner.current.set_timed_status_effect(0 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) + owner.current.do_jitter_animation(2) // Disable ALL Powers DisableAllPowers() -/datum/antagonist/bloodsucker/proc/torpor_end() - owner.current.grab_ghost() - to_chat(owner.current, span_warning("You have recovered from Torpor.")) +/datum/antagonist/bloodsucker/proc/torpor_end(quiet = FALSE) + if(quiet) + owner.current.grab_ghost() + to_chat(owner.current, span_warning("You have recovered from Torpor.")) owner.current.remove_traits(list(TRAIT_NODEATH, TRAIT_FAKEDEATH, TRAIT_DEATHCOMA, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTHIGHPRESSURE), BLOODSUCKER_TRAIT) - if(!HAS_TRAIT(owner.current, TRAIT_MASQUERADE)) + if(!HAS_TRAIT_FROM_ONLY(owner.current, TRAIT_MASQUERADE, BLOODSUCKER_TRAIT)) ADD_TRAIT(owner.current, TRAIT_SLEEPIMMUNE, BLOODSUCKER_TRAIT) heal_vampire_organs() SEND_SIGNAL(src, BLOODSUCKER_EXIT_TORPOR) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm index 4ebe37bb114..c09f75b1f7e 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm @@ -38,7 +38,8 @@ RegisterSignal(bloodsuckerdatum, BLOODSUCKER_RANK_UP, PROC_REF(on_spend_rank)) RegisterSignal(bloodsuckerdatum, BLOODSUCKER_INTERACT_WITH_VASSAL, PROC_REF(on_interact_with_vassal)) - RegisterSignal(bloodsuckerdatum, BLOODSUCKER_MAKE_FAVORITE, PROC_REF(on_favorite_vassal)) + RegisterSignal(bloodsuckerdatum, BLOODSUCKER_MAKE_FAVORITE, PROC_REF(favorite_vassal_gain)) + RegisterSignal(bloodsuckerdatum, BLOODSUCKER_LOOSE_FAVORITE, PROC_REF(favorite_vassal_loss)) RegisterSignal(bloodsuckerdatum, BLOODSUCKER_MADE_VASSAL, PROC_REF(on_vassal_made)) RegisterSignal(bloodsuckerdatum, BLOODSUCKER_EXIT_TORPOR, PROC_REF(on_exit_torpor)) @@ -205,7 +206,7 @@ if(cost_rank) bloodsuckerdatum.bloodsucker_level_unspent-- if(blood_cost) - bloodsuckerdatum.AddBloodVolume(-blood_cost) + bloodsuckerdatum.AdjustBloodVolume(-blood_cost) // Ranked up enough to get your true Reputation? if(bloodsuckerdatum.bloodsucker_level == BLOODSUCKER_HIGH_LEVEL) @@ -214,10 +215,19 @@ to_chat(bloodsuckerdatum.owner.current, span_notice("You are now a rank [bloodsuckerdatum.bloodsucker_level] Bloodsucker. \ - Your strength, health, feed rate, regen rate, and maximum blood capacity have all increased! \n\ + Your strength, feed rate, regen rate, and maximum blood capacity have all increased! \n\ * Your existing powers have all ranked up as well!")) bloodsuckerdatum.owner.current.playsound_local(null, 'sound/effects/pope_entry.ogg', 25, TRUE, pressure_affected = FALSE) bloodsuckerdatum.update_hud() + bloodsuckerdatum.update_static_data_for_all_viewers() + + // unlock vassalizing if we have a vassal slot + if(bloodsuckerdatum.max_vassals() >= 1 && !(/datum/crafting_recipe/vassalrack in bloodsuckerdatum.owner?.learned_recipes)) + bloodsuckerdatum.owner.teach_crafting_recipe(/datum/crafting_recipe/vassalrack) + bloodsuckerdatum.owner.teach_crafting_recipe(/datum/crafting_recipe/candelabrum) + bloodsuckerdatum.owner.teach_crafting_recipe(/datum/crafting_recipe/bloodthrone) + bloodsuckerdatum.owner.teach_crafting_recipe(/datum/crafting_recipe/meatcoffin) + bloodsuckerdatum.owner.current.balloon_alert(bloodsuckerdatum.owner.current, "new recipes learned! Vassalization unlocked!") /** * Called when we are trying to turn someone into a Favorite Vassal @@ -258,7 +268,7 @@ bloodsuckerdatum.owner.current.balloon_alert(bloodsuckerdatum.owner.current, "Out of Special Vassal slots!") return - to_chat(bloodsuckerdatum.owner.current, span_notice("You can change who this Vassal is, who are they to you?")) + to_chat(bloodsuckerdatum.owner.current, span_notice("You can change who this Vassal is, who are they to you? This will cost [SPECIAL_VASSAL_COST] blood.")) var/vassal_response = show_radial_menu(bloodsuckerdatum.owner.current, vassaldatum.owner.current, radial_display) if(!vassal_response) return @@ -266,7 +276,7 @@ if(QDELETED(src) || QDELETED(bloodsuckerdatum.owner.current) || QDELETED(vassaldatum.owner.current)) return FALSE vassaldatum.make_special(vassal_response) - bloodsuckerdatum.bloodsucker_blood_volume -= 150 + bloodsuckerdatum.AdjustBloodVolume(-SPECIAL_VASSAL_COST) return TRUE /** @@ -275,6 +285,9 @@ * bloodsuckerdatum - antagonist datum of the Bloodsucker who turned them into a Vassal. * vassaldatum - the antagonist datum of the Vassal being offered up. */ -/datum/bloodsucker_clan/proc/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) +/datum/bloodsucker_clan/proc/favorite_vassal_gain(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) SIGNAL_HANDLER vassaldatum.BuyPower(/datum/action/cooldown/bloodsucker/targeted/brawn) + +/datum/bloodsucker_clan/proc/favorite_vassal_loss(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + SIGNAL_HANDLER diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm index af9d200ffa9..81938f9b9fa 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_malkavian.dm @@ -52,7 +52,7 @@ var/message = pick(strings("malkavian_revelations.json", "revelations", "modular_zubbers/strings/bloodsuckers")) INVOKE_ASYNC(bloodsuckerdatum.owner.current, TYPE_PROC_REF(/atom/movable, say), message, forced = CLAN_MALKAVIAN) -/datum/bloodsucker_clan/malkavian/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) +/datum/bloodsucker_clan/malkavian/favorite_vassal_gain(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) var/mob/living/carbon/carbonowner = vassaldatum.owner.current if(istype(carbonowner)) carbonowner.gain_trauma(/datum/brain_trauma/mild/hallucinations, TRAUMA_RESILIENCE_ABSOLUTE) @@ -61,8 +61,18 @@ psychotic_brawling.teach(vassaldatum.owner.current, TRUE) to_chat(vassaldatum.owner.current, span_notice("Additionally, you now suffer the same fate as your Master, while also gaining the ability to tap into the madness when fighting.")) +/datum/bloodsucker_clan/malkavian/favorite_vassal_loss(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + var/mob/living/carbon/carbonowner = vassaldatum.owner.current + if(istype(carbonowner)) + carbonowner.cure_trauma_type(/datum/brain_trauma/mild/hallucinations, TRAUMA_RESILIENCE_ABSOLUTE) + carbonowner.cure_trauma_type(/datum/brain_trauma/special/bluespace_prophet/phobetor, TRAUMA_RESILIENCE_ABSOLUTE) + if(!istype(/datum/martial_art/psychotic_brawling, vassaldatum.owner.martial_art)) + return + var/datum/martial_art/psychotic_brawling/psychotic_brawling = vassaldatum.owner.martial_art + psychotic_brawling.remove(vassaldatum.owner.current) + /datum/bloodsucker_clan/malkavian/on_exit_torpor(datum/antagonist/bloodsucker/source) - var/mob/living/carbon/carbonowner = bloodsuckerdatum.owner.current + var/mob/living/carbon/carbonowner = bloodsuckerdatum.owner.martial_art if(istype(carbonowner)) carbonowner.gain_trauma(/datum/brain_trauma/mild/hallucinations, TRAUMA_RESILIENCE_ABSOLUTE) carbonowner.gain_trauma(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_nosferatu.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_nosferatu.dm index 16543d531fa..4946cb61832 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_nosferatu.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_nosferatu.dm @@ -33,6 +33,12 @@ if(!HAS_TRAIT(bloodsuckerdatum.owner.current, TRAIT_NOBLOOD)) bloodsuckerdatum.owner.current.blood_volume = BLOOD_VOLUME_SURVIVE -/datum/bloodsucker_clan/nosferatu/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) - vassaldatum.owner.current.add_traits(list(TRAIT_VENTCRAWLER_NUDE, TRAIT_DISFIGURED, TRAIT_TRUE_NIGHT_VISION, TRAIT_KNOW_ENGI_WIRES, TRAIT_SILENT_FOOTSTEPS), BLOODSUCKER_TRAIT) +/datum/bloodsucker_clan/nosferatu/favorite_vassal_gain(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + var/list/traits_to_add = list(TRAIT_VENTCRAWLER_NUDE, TRAIT_DISFIGURED, TRAIT_TRUE_NIGHT_VISION, TRAIT_KNOW_ENGI_WIRES, TRAIT_SILENT_FOOTSTEPS) + vassaldatum.owner.current.add_traits(traits_to_add, VASSAL_TRAIT) + vassaldatum.traits += traits_to_add + vassaldatum.owner.current.update_sight() to_chat(vassaldatum.owner.current, span_notice("Additionally, you can now ventcrawl while naked, and are permanently disfigured. You also have night vision, know how which wires to cut, and have silent footsteps.")) + +/datum/bloodsucker_clan/nosferatu/favorite_vassal_loss(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + vassaldatum.owner.current.update_sight() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_tremere.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_tremere.dm index fe4c4d30aad..8f5fd1ece7a 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_tremere.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_tremere.dm @@ -45,7 +45,7 @@ to_chat(bloodsuckerdatum.owner.current, span_notice("You grow more ancient by the night!")) else // Give them the UI to purchase a power. - var/choice = tgui_input_list(bloodsuckerdatum.owner.current, "You have the opportunity to grow more ancient. Select a power you wish to upgrade.", "Your Blood Thickens...", options) + var/choice = tgui_input_list(bloodsuckerdatum.owner.current, "You have the opportunity to grow more ancient. Spend [round(blood_cost, 1)] blood to upgrade a power.", "Your Blood Thickens...", options) // Prevent Bloodsuckers from closing/reopning their coffin to spam Levels. if(cost_rank && bloodsuckerdatum.bloodsucker_level_unspent <= 0) return @@ -72,10 +72,14 @@ finalize_spend_rank(bloodsuckerdatum, cost_rank, blood_cost) -/datum/bloodsucker_clan/tremere/on_favorite_vassal(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) +/datum/bloodsucker_clan/tremere/favorite_vassal_gain(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) var/datum/action/cooldown/spell/shapeshift/bat/batform = new(vassaldatum.owner || vassaldatum.owner.current) batform.Grant(vassaldatum.owner.current) +/datum/bloodsucker_clan/tremere/favorite_vassal_loss(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + var/datum/action/cooldown/spell/shapeshift/bat/batform = locate() in vassaldatum.owner.current.actions + batform.Remove(vassaldatum.owner.current) + /datum/bloodsucker_clan/tremere/on_vassal_made(datum/antagonist/bloodsucker/source, mob/living/user, mob/living/target) . = ..() to_chat(bloodsuckerdatum.owner.current, span_danger("You have now gained an additional Rank to spend!")) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm index 441531d42f0..905527e9c93 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan_ventrue.dm @@ -1,12 +1,12 @@ ///The maximum level a Ventrue Bloodsucker can be, before they have to level up their vassal instead. -#define VENTRUE_MAX_LEVEL 3 +#define VENTRUE_MAX_POWERS 3 ///How much it costs for a Ventrue to rank up without a spare rank to spend. #define BLOODSUCKER_BLOOD_RANKUP_COST (550) /datum/bloodsucker_clan/ventrue name = CLAN_VENTRUE description = "The Ventrue Clan is extremely snobby with their meals, and refuse to drink blood from people without a mind. \n\ - You may only level yourself up to Level %MAX_LEVEL%, anything further will be ranks to spend on their Favorite Vassal through a Persuasion Rack. \n\ + You may have up to %MAX_POWERS% powers, anything further will be ranks to spend on their Favorite Vassal through a Persuasion Rack. \n\ The Favorite Vassal will slowly turn more Vampiric this way, until they finally lose their last bits of Humanity. \n\ Once you finish your embracing, the newly sired vampire will become just a vassal, and you'll be able to sire another bloodsucker." clan_objective = /datum/objective/bloodsucker/embrace @@ -17,19 +17,31 @@ /datum/bloodsucker_clan/ventrue/New(datum/antagonist/bloodsucker/owner_datum) . = ..() - description = replacetext(description, "%MAX_LEVEL%", VENTRUE_MAX_LEVEL) + description = replacetext(description, "%MAX_POWERS%", VENTRUE_MAX_POWERS) + +/datum/bloodsucker_clan/ventrue/proc/has_enough_abilities() + var/power_count = 0 + for(var/datum/action/cooldown/bloodsucker/power in bloodsuckerdatum.powers) + if(!(power.purchase_flags & BLOODSUCKER_DEFAULT_POWER)) + power_count++ + if(power_count >= VENTRUE_MAX_POWERS) + return TRUE + return FALSE /datum/bloodsucker_clan/ventrue/spend_rank(datum/antagonist/bloodsucker/source, mob/living/carbon/target, cost_rank = TRUE, blood_cost) - if(bloodsuckerdatum.bloodsucker_level < VENTRUE_MAX_LEVEL) + if(!target && !has_enough_abilities()) return ..() else if(!target) - to_chat(bloodsuckerdatum.owner.current, span_danger("You can only level up to Level [VENTRUE_MAX_LEVEL], anything further will be ranks to spend on your Favorite Vassal through a Persuasion Rack.")) + to_chat(bloodsuckerdatum.owner.current, span_danger("You can only have up to [VENTRUE_MAX_POWERS] powers, anything further will be ranks to spend on your Favorite Vassal through a Persuasion Rack.")) return FALSE var/datum/antagonist/vassal/favorite/vassaldatum = target.mind.has_antag_datum(/datum/antagonist/vassal/favorite) var/datum/antagonist/vassal/non_favorite = target.mind.has_antag_datum(/datum/antagonist/vassal) if(!vassaldatum && vassaldatum.master != bloodsuckerdatum.owner.current || !IS_BLOODSUCKER(target) && !non_favorite && vassaldatum.master != bloodsuckerdatum.owner.current) target.balloon_alert(target, "is not a sired bloodsucker nor your favorite vassal!") return FALSE + if(!vassaldatum.owner.current.mind) + target.balloon_alert(target, "vassal must be awake!") + return FALSE // Purchase Power Prompt var/list/options = list() for(var/datum/action/cooldown/bloodsucker/power as anything in bloodsuckerdatum.all_bloodsucker_powers) @@ -67,18 +79,19 @@ return vassaldatum.vassal_level++ finish_spend_rank(vassaldatum, cost_rank, blood_cost) + var/traits_to_add = list() switch(vassaldatum.vassal_level) if(1) - target.add_traits(list(TRAIT_COLDBLOODED, TRAIT_NOBREATH, TRAIT_AGEUSIA), BLOODSUCKER_TRAIT) + traits_to_add = list(TRAIT_COLDBLOODED, TRAIT_NOBREATH, TRAIT_AGEUSIA) to_chat(target, span_notice("Your blood begins to feel cold, and as a mote of ash lands upon your tongue, you stop breathing...")) if(2) - target.add_traits(list(TRAIT_NOCRITDAMAGE, TRAIT_NOSOFTCRIT, TRAIT_SLEEPIMMUNE, TRAIT_VIRUSIMMUNE), BLOODSUCKER_TRAIT) + traits_to_add = list(TRAIT_NOCRITDAMAGE, TRAIT_NOSOFTCRIT, TRAIT_SLEEPIMMUNE, TRAIT_VIRUSIMMUNE) to_chat(target, span_notice("You feel your Master's blood reinforce you, strengthening you up.")) if(ishuman(target)) var/mob/living/carbon/human/human_target = target human_target.skin_tone = "albino" if(3) - target.add_traits(list(TRAIT_NOHARDCRIT, TRAIT_HARDLY_WOUNDED), BLOODSUCKER_TRAIT) + traits_to_add = list(TRAIT_NOHARDCRIT, TRAIT_HARDLY_WOUNDED) to_chat(target, span_notice("You feel yourself able to take cuts and stabbings like it's nothing.")) if(4 to INFINITY) var/datum/antagonist/bloodsucker/bloodsucker_target = target.mind.has_antag_datum(/datum/antagonist/bloodsucker) @@ -89,18 +102,18 @@ var/powers_to_transfer = list() // Get rid of the favorite datum and replace with a normal vassal datum if(target.mind.has_antag_datum(/datum/antagonist/vassal/favorite)) - var/datum/antagonist/vassal/new_antag_datum = new(target.mind) - powers_to_transfer = vassaldatum.bloodsucker_powers.Copy() - vassaldatum.bloodsucker_powers.Cut(powers_to_transfer) + for(var/datum/power as anything in vassaldatum.bloodsucker_powers) + powers_to_transfer += power.type target.mind.remove_antag_datum(/datum/antagonist/vassal/favorite) - new_antag_datum.master = vassaldatum.master - new_antag_datum.silent = TRUE - target.mind.add_antag_datum(new_antag_datum) - new_antag_datum.remove_powers(new_antag_datum.powers) - bloodsucker_target = target.mind.add_antag_datum(/datum/antagonist/bloodsucker) - bloodsucker_target?.powers += powers_to_transfer + var/datum/antagonist/bloodsucker/vamp = new() + vamp.ventrue_sired = bloodsuckerdatum + bloodsucker_target = target.mind.add_antag_datum(vamp) + bloodsucker_target.BuyPowers(powers_to_transfer) // Check for the recuperate power and remove it if they have it bloodsuckerdatum.owner.current.add_mood_event("madevamp", /datum/mood_event/madevamp) + if(vassaldatum && QDELETED(vassaldatum) && length(traits_to_add)) + target.add_traits(traits_to_add, VASSAL_TRAIT) + vassaldatum.traits += traits_to_add /datum/bloodsucker_clan/ventrue/proc/finish_spend_rank(datum/antagonist/vassal/vassaldatum, cost_rank, blood_cost) finalize_spend_rank(bloodsuckerdatum, cost_rank, blood_cost) @@ -112,9 +125,6 @@ return TRUE if(!istype(vassaldatum)) return FALSE - if(bloodsuckerdatum.bloodsucker_level < VENTRUE_MAX_LEVEL) - to_chat(bloodsuckerdatum.owner.current, span_danger("You are too low level to Rank up [vassaldatum.owner.current] You must at least be level [VENTRUE_MAX_LEVEL].")) - return FALSE if(!bloodsuckerdatum.bloodsucker_level_unspent <= 0) bloodsuckerdatum.SpendRank(vassaldatum.owner.current) return TRUE @@ -132,9 +142,9 @@ to_chat(bloodsuckerdatum.owner.current, span_danger("You don't have any levels or enough Blood to Rank [vassaldatum.owner.current] up with.")) return TRUE -/datum/bloodsucker_clan/ventrue/on_favorite_vassal(datum/source, datum/antagonist/vassal/vassaldatum, mob/living/bloodsucker) - to_chat(bloodsucker, span_announce("* Bloodsucker Tip: You can now upgrade your Favorite Vassal by buckling them onto a persuasion rack!")) +/datum/bloodsucker_clan/ventrue/favorite_vassal_gain(datum/antagonist/bloodsucker/source, datum/antagonist/vassal/vassaldatum) + to_chat(source.owner.current, span_announce("* Bloodsucker Tip: You can now upgrade your Favorite Vassal by buckling them onto a persuasion rack!")) vassaldatum.BuyPower(/datum/action/cooldown/bloodsucker/distress) #undef BLOODSUCKER_BLOOD_RANKUP_COST -#undef VENTRUE_MAX_LEVEL +#undef VENTRUE_MAX_POWERS diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/_powers.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/_powers.dm index 01919b0038e..b13f7775d6a 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/_powers.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/_powers.dm @@ -17,7 +17,6 @@ base_background_icon_state = "vamp_power_off" /// The text that appears when using the help verb, meant to explain how the Power changes when ranking up. - var/power_explanation = "" ///The owner's stored Bloodsucker datum var/datum/antagonist/bloodsucker/bloodsuckerdatum_power @@ -25,14 +24,14 @@ /// The effects on this Power (Toggled/Single Use/Static Cooldown) var/power_flags = BP_AM_TOGGLE|BP_AM_SINGLEUSE|BP_AM_STATIC_COOLDOWN|BP_AM_COSTLESS_UNCONSCIOUS /// Requirement flags for checks - check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_STAKED|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS + check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS /// Who can purchase the Power var/purchase_flags = NONE // BLOODSUCKER_CAN_BUY|BLOODSUCKER_DEFAULT_POWER|TREMERE_CAN_BUY|VASSAL_CAN_BUY // VARS // /// If the Power is currently active, differs from action cooldown because of how powers are handled. var/active = FALSE - ///Can increase to yield new abilities - Each Power ranks up each Rank + ///Can increase to yield new capabilities - Each Power ranks up each Rank, with the oldest power being the highest rank. var/level_current = 0 ///The cost to ACTIVATE this Power var/bloodcost = 0 @@ -102,6 +101,13 @@ ///Called when the Power is upgraded. /datum/action/cooldown/bloodsucker/proc/upgrade_power() level_current++ + build_all_button_icons(UPDATE_BUTTON_NAME) + +// Put desc that you want to update every time build_all_button_icons is called here +/datum/action/cooldown/bloodsucker/update_button_name(atom/movable/screen/movable/action_button/button, force) + . = ..() + if((purchase_flags & BLOODSUCKER_CAN_BUY) || (purchase_flags & TREMERE_CAN_BUY)) + button.desc += "

LEVEL: [level_current]" ///Checks if the Power is available to use. /datum/action/cooldown/bloodsucker/proc/can_use(mob/living/carbon/user, trigger_flags) @@ -109,6 +115,12 @@ return FALSE if(!isliving(user)) return FALSE + if(bloodsuckerdatum_power && !bloodsuckerdatum_power.heart?.resolve()) + to_chat(user, span_warning("To channel your powers you need a heart!")) + return FALSE + if(isbrain(user)) + to_chat(user, span_warning("What are you going to do, jump on someone and suck their blood? You're just a head.")) + return FALSE // Torpor? if((check_flags & BP_CANT_USE_IN_TORPOR) && HAS_TRAIT(user, TRAIT_NODEATH)) to_chat(user, span_warning("Not while you're in Torpor.")) @@ -121,11 +133,11 @@ to_chat(user, span_warning("You cannot use powers while in a Frenzy!")) return FALSE // Stake? - if((check_flags & BP_CANT_USE_WHILE_STAKED) && user.am_staked()) + if(!(check_flags & BP_CAN_USE_WHILE_STAKED) && user.am_staked()) to_chat(user, span_warning("You have a stake in your chest! Your powers are useless.")) return FALSE // Conscious? -- We use our own (AB_CHECK_CONSCIOUS) here so we can control it more, like the error message. - if((check_flags & BP_CANT_USE_WHILE_UNCONSCIOUS) && user.stat != CONSCIOUS) + if((check_flags & BP_CANT_USE_WHILE_UNCONSCIOUS) && user.stat >= UNCONSCIOUS) to_chat(user, span_warning("You can't do this while you are unconcious!")) return FALSE // Incapacitated? @@ -133,13 +145,16 @@ to_chat(user, span_warning("Not while you're incapacitated!")) return FALSE // Constant Cost (out of blood) - if(constant_bloodcost > 0 && bloodsuckerdatum_power?.bloodsucker_blood_volume <= 0) + if(constant_bloodcost > 0 && !can_pay_blood(user)) to_chat(user, span_warning("You don't have the blood to upkeep [src].")) return FALSE return TRUE /// NOTE: With this formula, you'll hit half cooldown at level 8 for that power. -/datum/action/cooldown/bloodsucker/StartCooldown() +/datum/action/cooldown/bloodsucker/StartCooldown(override_cooldown_time, override_melee_cooldown_time) + // don't re-set the cooldown if we don't have a override time and there's already a cooldown ongoing + if(!override_cooldown_time && next_use_time > world.time) + return // Calculate Cooldown (by power's level) if(power_flags & BP_AM_STATIC_COOLDOWN) cooldown_time = initial(cooldown_time) @@ -148,6 +163,9 @@ return ..() +/datum/action/cooldown/bloodsucker/proc/can_pay_blood(mob/living/carbon/user) + return bloodsuckerdatum_power ? bloodsuckerdatum_power?.bloodsucker_blood_volume >= 0 : user.blood_volume >= 0 + /datum/action/cooldown/bloodsucker/proc/can_deactivate() return TRUE @@ -164,8 +182,7 @@ // Bloodsuckers in a Frenzy don't have enough Blood to pay it, so just don't. if(bloodsuckerdatum_power.frenzied) return - bloodsuckerdatum_power.bloodsucker_blood_volume -= bloodcost - bloodsuckerdatum_power.update_hud() + bloodsuckerdatum_power.AdjustBloodVolume(-bloodcost) /datum/action/cooldown/bloodsucker/proc/ActivatePower(trigger_flags) active = TRUE @@ -200,7 +217,7 @@ if(power_flags & BP_AM_COSTLESS_UNCONSCIOUS && owner.stat != CONSCIOUS) return TRUE if(bloodsuckerdatum_power) - bloodsuckerdatum_power.AddBloodVolume(-constant_bloodcost * seconds_per_tick) + bloodsuckerdatum_power.AdjustBloodVolume(-constant_bloodcost * seconds_per_tick) else var/mob/living/living_owner = owner if(!HAS_TRAIT(living_owner, TRAIT_NOBLOOD)) @@ -211,7 +228,7 @@ /datum/action/cooldown/bloodsucker/proc/ContinueActive(mob/living/user, mob/living/target) if(!user) return FALSE - if(!constant_bloodcost > 0 || bloodsuckerdatum_power.bloodsucker_blood_volume > 0) + if(!constant_bloodcost > 0 || can_pay_blood(user)) return TRUE /// Used to unlearn Single-Use Powers diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm index 60df4447a9d..6d83cfe5e80 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/feed.dm @@ -15,8 +15,8 @@ If you are in desperate need of blood, mice can be fed off of, at a cost.\n\ You must use the ability again to stop sucking blood." power_flags = BP_AM_TOGGLE|BP_AM_STATIC_COOLDOWN - check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_WHILE_STAKED|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS - purchase_flags = BLOODSUCKER_CAN_BUY|BLOODSUCKER_DEFAULT_POWER + check_flags = BP_CANT_USE_IN_TORPOR|BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS|BP_CAN_USE_WHILE_STAKED + purchase_flags = BLOODSUCKER_DEFAULT_POWER bloodcost = 0 cooldown_time = 15 SECONDS @@ -69,8 +69,8 @@ bloodsuckerdatum_power.AddHumanityLost(5) target_ref = null - warning_target_bloodvol = BLOOD_VOLUME_MAX_LETHAL - blood_taken = 0 + warning_target_bloodvol = initial(warning_target_bloodvol) + blood_taken = initial(blood_taken) REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, FEED_TRAIT) REMOVE_TRAIT(user, TRAIT_MUTE, FEED_TRAIT) return ..() @@ -84,7 +84,7 @@ var/mob/living/user = owner user.add_mood_event("drankblood", /datum/mood_event/drankblood_bad) bloodsuckerdatum_power.AddHumanityLost(1) - bloodsuckerdatum_power.AddBloodVolume(25) + bloodsuckerdatum_power.AdjustBloodVolume(25) DeactivatePower() feed_target.death() return @@ -111,7 +111,7 @@ // Only people who AREN'T the target will notice this action. var/dead_message = feed_target.stat != DEAD ? " [feed_target.p_they(TRUE)] looks dazed, and will not remember this." : "" owner.visible_message( - span_notice("[owner] puts [feed_target]'s wrist up to [owner.p_their()] mouth."), \ + span_warning("[owner] puts [feed_target]'s wrist up to [owner.p_their()] mouth."), \ span_notice("You slip your fangs into [feed_target]'s wrist.[dead_message]"), \ vision_distance = FEED_NOTICE_RANGE, ignored_mobs = feed_target) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm index 82a34868067..002c18419af 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm @@ -4,7 +4,7 @@ button_icon_state = "power_fortitude" power_explanation = "Fortitude:\n\ Activating Fortitude will provide pierce, stun and dismember immunity.\n\ - You will additionally gain resistance to Brute and Stamina damge, scaling with level.\n\ + You will additionally gain resistance to both physical and stamina damage, scaling with level.\n\ While using Fortitude, attempting to run will crush you.\n\ At level 4, you gain complete stun immunity.\n\ Higher levels will increase Brute and Stamina resistance." @@ -29,6 +29,7 @@ if(IS_BLOODSUCKER(owner) || IS_VASSAL(owner)) fortitude_resist = max(0.3, 0.7 - level_current * 0.1) bloodsucker_user.physiology.brute_mod *= fortitude_resist + bloodsucker_user.physiology.burn_mod *= fortitude_resist + 0.2 bloodsucker_user.physiology.stamina_mod *= fortitude_resist was_running = (bloodsucker_user.move_intent == MOVE_INTENT_RUN) @@ -58,8 +59,8 @@ var/mob/living/carbon/human/bloodsucker_user = owner if(IS_BLOODSUCKER(owner) || IS_VASSAL(owner)) bloodsucker_user.physiology.brute_mod /= fortitude_resist - if(!HAS_TRAIT_FROM(bloodsucker_user, TRAIT_STUNIMMUNE, BLOODSUCKER_TRAIT)) - bloodsucker_user.physiology.stamina_mod /= fortitude_resist + bloodsucker_user.physiology.burn_mod /= fortitude_resist + 0.2 + bloodsucker_user.physiology.stamina_mod /= fortitude_resist // Remove Traits & Effects owner.remove_traits(list(TRAIT_PIERCEIMMUNE, TRAIT_NODISMEMBER, TRAIT_PUSHIMMUNE, TRAIT_STUNIMMUNE), BLOODSUCKER_TRAIT) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm index 5b55a8ec9c6..88bc01f8b3f 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/gohome.dm @@ -20,11 +20,12 @@ Immediately after activating, lights around the user will begin to flicker. \n\ Once the user teleports to their coffin, in their place will be a Rat or Bat." power_flags = BP_AM_TOGGLE|BP_AM_SINGLEUSE|BP_AM_STATIC_COOLDOWN - check_flags = BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_STAKED + check_flags = BP_CANT_USE_IN_FRENZY purchase_flags = NONE bloodcost = 100 constant_bloodcost = 2 cooldown_time = 100 SECONDS + ///What stage of the teleportation are we in var/teleporting_stage = GOHOME_START ///The types of mobs that will drop post-teleportation. diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm index 74f02cc22f3..ff13b9b7f15 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/masquerade.dm @@ -16,14 +16,14 @@ button_icon_state = "power_human" power_explanation = "Masquerade:\n\ Activating Masquerade will forge your identity to be practically identical to that of a human;\n\ - - You lose nearly all Bloodsucker benefits, including healing, sleep, radiation, crit, virus and cold immunity.\n\ + - You lose nearly all Bloodsucker benefits, including healing, sleep, radiation, crit, virus, gutting and cold immunity.\n\ - Your eyes turn to that of a regular human as your heart begins to beat.\n\ - You gain a Genetic sequence, and appear to have 100% blood when scanned by a Health Analyzer.\n\ - You will not appear as Pale when examined. Anything further than Pale, however, will not be hidden.\n\ - At the end of a Masquerade, you will re-gain your Vampiric abilities, as well as lose any Disease & Gene you might have." + At the end of a Masquerade, you will re-gain your Vampiric abilities, as well as lose any diseases you might have." power_flags = BP_AM_TOGGLE|BP_AM_STATIC_COOLDOWN|BP_AM_COSTLESS_UNCONSCIOUS check_flags = BP_CANT_USE_IN_FRENZY - purchase_flags = BLOODSUCKER_CAN_BUY|BLOODSUCKER_DEFAULT_POWER + purchase_flags = BLOODSUCKER_DEFAULT_POWER bloodcost = 10 cooldown_time = 5 SECONDS constant_bloodcost = 0.1 @@ -40,7 +40,11 @@ // Handle Traits user.remove_traits(bloodsuckerdatum_power.bloodsucker_traits, BLOODSUCKER_TRAIT) + ADD_TRAIT(user, TRAIT_MASQUERADE, BLOODSUCKER_TRAIT) + var/obj/item/bodypart/chest/target_chest = user.get_bodypart(BODY_ZONE_CHEST) + if(target_chest) + target_chest.bodypart_flags &= ~BODYPART_UNREMOVABLE // Handle organs var/obj/item/organ/internal/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) if(vampheart) @@ -52,6 +56,7 @@ eyes.sight_flags = initial(eyes.sight_flags) user.update_sight() +/// todo, make bloodsuckerification into it's own proc, ie, eyes, traits, and such /datum/action/cooldown/bloodsucker/masquerade/DeactivatePower() . = ..() // activate = FALSE var/mob/living/carbon/user = owner @@ -59,14 +64,15 @@ // Remove status effect, mutations & diseases that you got while on masq. user.remove_status_effect(/datum/status_effect/masquerade) - user.dna.remove_all_mutations() for(var/datum/disease/diseases as anything in user.diseases) diseases.cure() // Handle Traits user.add_traits(bloodsuckerdatum_power.bloodsucker_traits, BLOODSUCKER_TRAIT) REMOVE_TRAIT(user, TRAIT_MASQUERADE, BLOODSUCKER_TRAIT) - + var/obj/item/bodypart/chest/target_chest = user.get_bodypart(BODY_ZONE_CHEST) + if(target_chest) + target_chest.bodypart_flags |= BODYPART_UNREMOVABLE // Handle organs var/obj/item/organ/internal/heart/vampheart = user.get_organ_slot(ORGAN_SLOT_HEART) if(vampheart) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm index 55be6a9ccb3..565aa001e8f 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/haste.dm @@ -5,10 +5,11 @@ /datum/action/cooldown/bloodsucker/targeted/haste name = "Immortal Haste" - desc = "Dash somewhere with supernatural speed. Those nearby may be knocked away, stunned, or left empty-handed." + desc = "Force yourself to stand up if you're down and dash somewhere with supernatural speed. Those nearby may be knocked away, stunned, or left empty-handed." button_icon_state = "power_speed" power_explanation = "Immortal Haste:\n\ Click anywhere to immediately dash towards that location.\n\ + At level 3, if you are lying down, you will get up and regain your stamina, but the resulting dash will not knock down those nearby.\n\ The Power will not work if you are lying down, in no gravity, or are aggressively grabbed.\n\ Anyone in your way during your Haste will be knocked down.\n\ Higher levels will increase the knockdown dealt to enemies.\n\ @@ -34,8 +35,8 @@ if(!user.has_gravity(user.loc)) //We dont want people to be able to use this to fly around in space user.balloon_alert(user, "you cannot dash while floating!") return FALSE - if(user.body_position == LYING_DOWN) - user.balloon_alert(user, "you must be standing to tackle!") + if(level_current < 3 && user.body_position == LYING_DOWN) + user.balloon_alert(user, "you must be standing to dash!") return FALSE return TRUE @@ -49,8 +50,17 @@ /// This is a non-async proc to make sure the power is "locked" until this finishes. /datum/action/cooldown/bloodsucker/targeted/haste/FireTargetedPower(atom/target_atom) . = ..() - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) var/mob/living/user = owner + var/stuns_mobs = TRUE + if(level_current >= 3 && user.body_position == LYING_DOWN) + to_chat(user, span_danger("Your heart takes a beat, and you force yourself to stand up!")) + user.SetKnockdown(0) + user.setStaminaLoss(0) + user.set_resting(FALSE, FALSE, TRUE) + stuns_mobs = FALSE + StartCooldown(cooldown_time * 3) + if(stuns_mobs) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) var/turf/targeted_turf = isturf(target_atom) ? target_atom : get_turf(target_atom) // Pulled? Not anymore. user.pulledby?.stop_pulling() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm index 20b5e93ff4d..3496afbac94 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/lunge.dm @@ -137,7 +137,7 @@ user.spin(10) return // Is my target a Monster hunter? - if(HAS_TRAIT(target, TRAIT_SHOVE_KNOCKDOWN_BLOCKED)) + if(HAS_TRAIT(target, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)) owner.balloon_alert(owner, "pushed away!") target.grabbedby(owner) return diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/mesmerize.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/mesmerize.dm index 49afcd2fd5c..628b74a2364 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/mesmerize.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/targeted/mesmerize.dm @@ -113,7 +113,7 @@ /*if(IS_MONSTERHUNTER(mesmerized_target)) to_chat(mesmerized_target, span_notice("You feel your eyes burn for a while, but it passes.")) return*/ - if(HAS_TRAIT_FROM(mesmerized_target, TRAIT_MUTE, BLOODSUCKER_TRAIT)) + if(HAS_TRAIT_FROM_ONLY(mesmerized_target, TRAIT_MUTE, BLOODSUCKER_TRAIT)) owner.balloon_alert(owner, "[mesmerized_target] is already in a hypnotic gaze.") return if(iscarbon(mesmerized_target)) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm index 8432fa35e7d..2592a82cf5f 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm @@ -68,12 +68,12 @@ name = "Level 4: Possession" upgraded_power = /datum/action/cooldown/bloodsucker/targeted/tremere/dominate/advanced/two level_current = 4 - desc = "Mesmerize, mute and blind any foe who stands still long enough, or convert the damaged to temporary Vassals." + desc = "Mesmerize, mute and blind any foe who stands still long enough, or convert the damaged or dead to temporary Vassals." power_explanation = "Level 4: Possession:\n\ Click any person to, after a 4 second timer, Mesmerize them.\n\ This will completely immobilize, mute, and blind them for the next 13.5 seconds.\n\ However, while adjacent to the target, if your target is in critical condition or dead, they will instead be turned into a temporary Vassal.\n\ - If you use this on a currently dead normal Vassal, you will instead revive them normally.\n\ + If you use this on a currently dead normal Vassal, they will will not suddenly cease to live as if a temporary Vassal.\n\ Despite being Mute and Deaf, they will still have complete loyalty to you, until their death in 5 minutes upon use." background_icon_state = "tremere_power_gold_off" active_background_icon_state = "tremere_power_gold_on" @@ -83,14 +83,14 @@ /datum/action/cooldown/bloodsucker/targeted/tremere/dominate/advanced/two name = "Level 5: Possession" - desc = "Mesmerize, mute and blind any foe who stands still long enough, or convert the damaged to temporary Vassals." + desc = "Mesmerize, mute and blind any foe who stands still long enough, or convert the damaged or dead to temporary Vassals." level_current = 5 upgraded_power = null power_explanation = "Level 5: Possession:\n\ Click any person to, after a 4 second timer, Mesmerize them.\n\ This will completely immobilize, mute, and blind them for the next 13.5 seconds.\n\ However, while adjacent to the target, if your target is in critical condition or dead, they will instead be turned into a temporary Vassal.\n\ - If you use this on a currently dead normal Vassal, you will instead revive them normally.\n\ + If you use this on a currently dead normal Vassal, they will will not suddenly cease to live as if a temporary Vassal.\n\ They will have complete loyalty to you, until their death in 8 minutes upon use." bloodcost = 100 cooldown_time = 2 MINUTES @@ -110,8 +110,11 @@ . = ..() var/mob/living/target = target_atom var/mob/living/user = owner - if(target.stat >= SOFT_CRIT && user.Adjacent(target) && level_current >= 4) - attempt_vassalize(target, user) + if(target.stat != CONSCIOUS && level_current >= 4) + if(user.Adjacent(target)) + attempt_vassalize(target, user) + else + owner.balloon_alert(owner, "too far to vassalize!") return else if(IS_VASSAL(target)) owner.balloon_alert(owner, "vassal cant be revived") @@ -128,7 +131,8 @@ /*if(IS_MONSTERHUNTER(target)) to_chat(target, span_notice("You feel you something crawling under your skin, but it passes.")) return*/ - if(HAS_TRAIT_FROM(target, TRAIT_MUTE, BLOODSUCKER_TRAIT)) + // todo replace with status effect so we don't only check chainstunning above lvl 2 + if(HAS_TRAIT_FROM_ONLY(target, TRAIT_MUTE, BLOODSUCKER_TRAIT)) owner.balloon_alert(owner, "[target] is already in some form of hypnotic gaze.") return if(iscarbon(target)) @@ -155,37 +159,50 @@ owner.balloon_alert(owner, "[target] snapped out of their trance.") /datum/action/cooldown/bloodsucker/targeted/tremere/dominate/proc/attempt_vassalize(mob/living/target, mob/living/user) + var/datum/antagonist/vassal/is_vassal = IS_VASSAL(target) + if(!bloodsuckerdatum_power.can_make_vassal(target)) + owner.balloon_alert(owner, "not a valid target for vassalization!.") + return FALSE + owner.balloon_alert(owner, "attempting to vassalize.") if(!do_after(user, 6 SECONDS, target, NONE, TRUE)) - return + return FALSE - if(IS_VASSAL(target)) + if(is_vassal?.master == bloodsuckerdatum_power) + if(target.stat != DEAD) + owner.balloon_alert(owner, "not dead!") + return FALSE power_activated_sucessfully() to_chat(user, span_warning("We revive [target]!")) + owner.balloon_alert(owner, "successfully revived!") target.mind.grab_ghost() target.revive(ADMIN_HEAL_ALL) + return FALSE + + if(!bloodsuckerdatum_power.make_vassal(target)) + owner.balloon_alert(owner, "not a valid target for vassalization!.") return + /*if(IS_MONSTERHUNTER(target)) to_chat(target, span_notice("Their body refuses to react...")) return*/ - if(!bloodsuckerdatum_power.make_vassal(target)) - return power_activated_sucessfully() to_chat(user, span_warning("We revive [target]!")) target.mind.grab_ghost() target.revive(ADMIN_HEAL_ALL) var/datum/antagonist/vassal/vassaldatum = target.mind.has_antag_datum(/datum/antagonist/vassal) vassaldatum.special_type = TREMERE_VASSAL //don't turn them into a favorite please - var/living_time - if(level_current == 4) - living_time = 5 MINUTES - target.add_traits(list(TRAIT_MUTE, TRAIT_DEAF), BLOODSUCKER_TRAIT) - else if(level_current == 5) - living_time = 8 MINUTES + var/living_time = (1 MINUTES) * level_current + if(level_current <= 4) + target.add_traits(list(TRAIT_MUTE, TRAIT_DEAF), DOMINATE_TRAIT) addtimer(CALLBACK(src, PROC_REF(end_possession), target), living_time) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(end_possession)) + return TRUE /datum/action/cooldown/bloodsucker/targeted/tremere/proc/end_possession(mob/living/user) - user.remove_traits(list(TRAIT_MUTE, TRAIT_DEAF), BLOODSUCKER_TRAIT) + if(!IS_VASSAL(user) && !HAS_TRAIT_FROM_ONLY(user, TRAIT_MUTE, DOMINATE_TRAIT) && !HAS_TRAIT_FROM_ONLY(user, TRAIT_MUTE, DOMINATE_TRAIT)) + return + user.remove_traits(list(TRAIT_MUTE, TRAIT_DEAF), DOMINATE_TRAIT) user.mind.remove_antag_datum(/datum/antagonist/vassal) to_chat(user, span_warning("You feel the Blood of your Master run out!")) user.death() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm index dd7f0b1679c..2cdf85ce5f9 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm @@ -153,7 +153,7 @@ if(bloodsucker_power.level_current >= 5) var/mob/living/person_hit = target person_hit.blood_volume -= 60 - bloodsucker_power.bloodsuckerdatum_power.AddBloodVolume(60) + bloodsucker_power.bloodsuckerdatum_power.AdjustBloodVolume(60) qdel(src) return BULLET_ACT_HIT . = ..() @@ -182,5 +182,5 @@ /obj/item/shield/bloodsucker/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(/datum/antagonist/bloodsucker) if(bloodsuckerdatum) - bloodsuckerdatum.AddBloodVolume(-15) + bloodsuckerdatum.AdjustBloodVolume(-15) return ..() diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/vassal/recuperate.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/vassal/recuperate.dm index 70ec928ce20..2ae1d2893a9 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/vassal/recuperate.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/vassal/recuperate.dm @@ -7,9 +7,9 @@ Activating this Power will begin to heal your wounds.\n\ You will heal Brute and Toxin damage, at the cost of Stamina damage, and blood from both you and your Master.\n\ If you aren't a bloodless race, you will additionally heal Burn damage.\n\ - The power will cancel out if you are incapacitated or dead." + The power will cancel out if you are dead or unconcious." power_flags = BP_AM_TOGGLE - check_flags = BP_CANT_USE_WHILE_INCAPACITATED|BP_CANT_USE_WHILE_UNCONSCIOUS + check_flags = BP_CANT_USE_WHILE_UNCONSCIOUS purchase_flags = NONE bloodcost = 1.5 cooldown_time = 10 SECONDS @@ -38,7 +38,7 @@ return var/mob/living/carbon/user = owner var/datum/antagonist/vassal/vassaldatum = IS_VASSAL(user) - vassaldatum.master.AddBloodVolume(-1) + vassaldatum.master.AdjustBloodVolume(-1) user.set_timed_status_effect(5 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) user.adjustStaminaLoss(bloodcost * 1.1) user.adjustBruteLoss(-2.5) @@ -55,7 +55,7 @@ /datum/action/cooldown/bloodsucker/recuperate/ContinueActive(mob/living/user, mob/living/target) if(user.stat >= DEAD) return FALSE - if(user.incapacitated()) + if(user.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) owner.balloon_alert(owner, "too exhausted...") return FALSE return TRUE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm index bd749cea23d..725b5432ea7 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/veil.dm @@ -7,7 +7,7 @@ Your name and appearance will be completely randomized, and turning the ability off again will undo it all.\n\ Clothes, gear, and Security/Medical HUD status is kept the same while this power is active." power_flags = BP_AM_TOGGLE - check_flags = BP_CANT_USE_IN_FRENZY + check_flags = BP_CANT_USE_IN_FRENZY|BP_CANT_USE_WHILE_UNCONSCIOUS purchase_flags = BLOODSUCKER_DEFAULT_POWER bloodcost = 15 constant_bloodcost = 0.1 diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm index eda2f9c8eb5..d4565ca6700 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/coffin.dm @@ -29,6 +29,7 @@ if(user == resident) . += span_cult("This is your Claimed Coffin.") . += span_cult("Rest in it while injured to enter Torpor. Entering it with unspent Ranks will allow you to spend one.") + . += span_cult("Going inside while it contains a heart will put it in your chest, letting you regain your might.") . += span_cult("Alt-Click while inside the Coffin to Lock/Unlock.") . += span_cult("Alt-Click while outside of your Coffin to Unclaim it, unwrenching it and all your other structures as a result.") @@ -133,6 +134,8 @@ resident = claimant anchored = TRUE START_PROCESSING(SSprocessing, src) + return TRUE + return FALSE /obj/structure/closet/crate/coffin/Destroy() unclaim_coffin() @@ -168,6 +171,7 @@ anchored = FALSE if(!resident || !resident.mind) return + un_enlarge(resident) // Unclaiming var/datum/antagonist/bloodsucker/bloodsuckerdatum = resident.mind.has_antag_datum(/datum/antagonist/bloodsucker) if(bloodsuckerdatum && bloodsuckerdatum.coffin == src) @@ -198,33 +202,61 @@ /obj/structure/closet/crate/coffin/close(mob/living/user) + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user?.mind?.has_antag_datum(/datum/antagonist/bloodsucker) + if(bloodsuckerdatum && user.mob_size > max_mob_size) + if(!HAS_TRAIT_FROM_ONLY(src, TRAIT_COFFIN_ENLARGED, "bloodsucker_coffin")) + if(prompt_coffin_claim(bloodsuckerdatum)) + enlarge(user) + else + user.balloon_alert(user, "already claimed by another!") . = ..() if(!.) return FALSE + for(var/atom/thing as anything in contents) + SEND_SIGNAL(thing, COMSIG_ENTER_COFFIN, src, user) // Only the User can put themself into Torpor. If already in it, you'll start to heal. if(user in src) - var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(/datum/antagonist/bloodsucker) - if(!bloodsuckerdatum) + if(!resident && !prompt_coffin_claim(bloodsuckerdatum)) return FALSE - var/area/current_area = get_area(src) - if(!bloodsuckerdatum.coffin && !resident) - switch(tgui_alert(user, "Do you wish to claim this as your coffin? [current_area] will be your lair.", "Claim Lair", list("Yes", "No"))) - if("Yes") - claim_coffin(user, current_area) - if("No") - return LockMe(user) //Level up if possible. if(!bloodsuckerdatum.my_clan) + user.balloon_alert("enter a clan!") to_chat(user, span_notice("You must enter a Clan to rank up. Do it in the antag menu, which you can see by pressing the action button in the top left.")) else // Level ups cost 30% of your max blood volume, which scales with your rank. - bloodsuckerdatum.SpendRank(blood_cost = bloodsuckerdatum.max_blood_volume * BLOODSUCKER_LEVELUP_PERCENTAGE) - // You're in a Coffin, everything else is done, you're likely here to heal. Let's offer them the oppertunity to do so. - bloodsuckerdatum.check_begin_torpor() + if(!bloodsuckerdatum.frenzied) + bloodsuckerdatum.SpendRank(blood_cost = bloodsuckerdatum.max_blood_volume * BLOODSUCKER_LEVELUP_PERCENTAGE) + // You're in a Coffin, everything else is done, you're likely here to heal. Let's offer them the opportunity to do so. + bloodsuckerdatum.check_begin_torpor(TORPOR_SKIP_CHECK_DAMAGE) return TRUE -#undef BLOODSUCKER_LEVELUP_PERCENTAGE +/obj/structure/closet/crate/coffin/proc/prompt_coffin_claim(datum/antagonist/bloodsucker/dracula) + if(!dracula) + return FALSE + var/area/current_area = get_area(src) + if(!dracula.coffin && !resident) + switch(tgui_alert(dracula.owner.current, "Do you wish to claim this as your coffin? [current_area] will be your lair.", "Claim Lair", list("Yes", "No"))) + if("Yes") + return claim_coffin(dracula.owner.current, current_area) + return FALSE + +// some fatass bloodsucker is trying to fit in a too-small coffin, how about we make some room? +/obj/structure/closet/crate/proc/enlarge(mob/living/user) + ADD_TRAIT(src, TRAIT_COFFIN_ENLARGED, "bloodsucker_coffin") + max_mob_size = user.mob_size + to_chat(user, span_warning("The coffin creaks and squeaks as you try to squeeze into it. It's a tight fit but you manage it make it fit you.")) + playsound(src, 'modular_skyrat/modules/aesthetics/airlock/sound/creaking.ogg') + animate(src, 1 SECONDS, FALSE, BOUNCE_EASING, transform = transform.Scale(user.mob_size * COFFIN_ENLARGE_MULT)) + +/obj/structure/closet/crate/proc/un_enlarge(mob/living/user) + if(!HAS_TRAIT_FROM_ONLY(src, TRAIT_COFFIN_ENLARGED, "bloodsucker_coffin")) + return + REMOVE_TRAIT(src, TRAIT_COFFIN_ENLARGED, "bloodsucker_coffin") + max_mob_size = initial(max_mob_size) + var/matrix/normal + // transform.Scale(user.mob_size * (COFFIN_ENLARGE_MULT + 1) + animate(src, 1 SECONDS, FALSE, transform = normal) /// You cannot weld or deconstruct an owned coffin. Only the owner can destroy their own coffin. /obj/structure/closet/crate/coffin/attackby(obj/item/item, mob/user, params) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm index 01e71b27e1e..fa5fbc74bb6 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/crypt.dm @@ -296,10 +296,10 @@ // Conversion Process if(convert_progress) balloon_alert(user, "spilling blood...") - bloodsuckerdatum.AddBloodVolume(-TORTURE_BLOOD_HALF_COST) + bloodsuckerdatum.AdjustBloodVolume(-TORTURE_BLOOD_HALF_COST) if(!do_torture(user, target)) return FALSE - bloodsuckerdatum.AddBloodVolume(-TORTURE_BLOOD_HALF_COST) + bloodsuckerdatum.AdjustBloodVolume(-TORTURE_BLOOD_HALF_COST) // Prevent them from unbuckling themselves as long as we're torturing. target.Paralyze(1 SECONDS) convert_progress-- @@ -329,7 +329,7 @@ balloon_alert(user, "interrupted!") return // Convert to Vassal! - bloodsuckerdatum.AddBloodVolume(-TORTURE_CONVERSION_COST) + bloodsuckerdatum.AdjustBloodVolume(-TORTURE_CONVERSION_COST) if(bloodsuckerdatum.make_vassal(target)) remove_loyalties(target) SEND_SIGNAL(bloodsuckerdatum, BLOODSUCKER_MADE_VASSAL, user, target) @@ -381,7 +381,9 @@ /obj/structure/bloodsucker/vassalrack/proc/do_disloyalty(mob/living/user, mob/living/target) if(disloyalty_offered) return FALSE - + // Can't willingly join if you're banned from it. It'll just ghost you anyways. + if(is_banned_from(target.ckey, ROLE_BLOODSUCKER)) + return TRUE disloyalty_offered = TRUE to_chat(user, span_notice("[target] has been given the opportunity for servitude. You await their decision...")) var/alert_response = tgui_alert( diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm index 5a1a40dc1e5..c8f621cbcd1 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/structures/objects.dm @@ -124,9 +124,15 @@ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 3) ///Time it takes to embed the stake into someone's chest. - var/staketime = 12 SECONDS + var/staketime = 5 SECONDS var/kills_blodsuckers = FALSE +/obj/item/stake/examine_more(mob/user) + . = ..() + . += span_notice("You can use [src] to stake someone in the chest, if they are laying down or grabbed by the neck.") + if(IS_BLOODSUCKER(user)) + . += span_warning("You feel a sense of dread as you look at the [src]...") + /obj/item/stake/attack(mob/living/target, mob/living/user, params) . = ..() if(.) @@ -161,7 +167,7 @@ return var/datum/antagonist/bloodsucker/bloodsuckerdatum = target.mind.has_antag_datum(/datum/antagonist/bloodsucker) if(bloodsuckerdatum) - // If DEAD or TORPID... Kill Bloodsucker! + // If silver stake and DEAD or TORPOR... Kill the Bloodsucker! if(target.StakeCanKillMe()) bloodsuckerdatum.FinalDeath() else @@ -173,7 +179,7 @@ return FALSE /mob/living/carbon/can_be_staked() - if(!(mobility_flags & MOBILITY_MOVE)) + if(body_position == LYING_DOWN) return TRUE return FALSE @@ -185,8 +191,12 @@ force = 8 throwforce = 12 armour_penetration = 10 - embedding = list("embed_chance" = 35) - staketime = 10 SECONDS + embedding = list("embed_chance" = 35, "fall_chance" = 0) + staketime = 12 SECONDS + +/obj/item/stake/hardened/examine_more(mob/user) + . = ..() + . += span_notice("The [src] won't fall out by itself, if embedded in someone.") /obj/item/stake/hardened/silver name = "silver stake" @@ -197,10 +207,15 @@ force = 9 armour_penetration = 25 custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT) - embedding = list("embed_chance" = 65) - staketime = 8 SECONDS + embedding = list("embed_chance" = 65, "fall_chance" = 0) + staketime = 15 SECONDS kills_blodsuckers = TRUE +/obj/item/stake/hardened/silver/examine_more(mob/user) + . = ..() + if(HAS_TRAIT(user.mind, TRAIT_BLOODSUCKER_HUNTER)) + . += span_notice("You know that the [src] can cause a Final Death to a vile Bloodsucker if they are asleep or dead.") + ////////////////////// // ARCHIVES // ////////////////////// @@ -233,13 +248,6 @@ COOLDOWN_DECLARE(bloodsucker_check_cooldown) var/cooldown_time = 1 MINUTES -/obj/item/book/kindred/station_loving - -/obj/item/book/kindred/station_loving/Initialize() - . = ..() - SSpoints_of_interest.make_point_of_interest(src) - AddComponent(/datum/component/stationloving, FALSE, TRUE) - /obj/item/book/kindred/try_carve(obj/item/carving_item, mob/living/user, params) to_chat(user, span_notice("You feel the gentle whispers of a Librarian telling you not to cut [starting_title].")) return FALSE @@ -304,5 +312,22 @@ /obj/structure/displaycase/curator desc = "This book was found inside a coffin of a long dead Curator. It is said to be able to reveal the true nature of those who feed upon mankind." - start_showpiece_type = /obj/item/book/kindred/station_loving + start_showpiece_type = /obj/item/book/kindred req_access = list(ACCESS_LIBRARY) + + +/// just a typepath to specify that it's monkey-owned, used for the heart thief objective +/obj/item/organ/internal/heart/monkey + +/obj/item/organ/internal/heart/examine_more(mob/user) + . = ..() + var/datum/antagonist/bloodsucker/vampire = IS_BLOODSUCKER(user) + if(!vampire) + return + var/datum/objective/steal_n_of_type/heart_thief = locate() in vampire?.objectives + if(!heart_thief) + return + if(heart_thief.check_if_valid_item(src)) + . += span_notice("This [src.name] will do for your purposes...") + else + . += span_notice("This [src.name] is of lesser quality, it won't do...") diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/batform.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/batform.dm index ae4b172d6de..7d0b2d495c5 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/batform.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/batform.dm @@ -6,14 +6,14 @@ /datum/action/cooldown/spell/shapeshift/bat name = "Bat Form" desc = "Take on the shape of a space bat. You can fly and see in the dark, and you heal from doing melee attacks." + power_explanation = "You can fly and see in the dark, and you heal from doing melee attacks." invocation = "Master, grant me your might, BAT FORM!!" invocation_type = INVOCATION_SHOUT spell_requirements = NONE convert_damage = TRUE - cooldown_time = 2 MINUTES + cooldown_time = 1 MINUTES possible_shapes = list(/mob/living/basic/bat/bloodsucker) var/bats_to_spawn = 3 - var/powers_stored /datum/action/cooldown/spell/shapeshift/bat/cast(mob/living/cast_on) . = ..() @@ -22,6 +22,7 @@ return for(var/i in 1 to bats_to_spawn) var/mob/living/basic/bat/bat = new(get_turf(cast_on)) + QDEL_IN(bat, cooldown_time) random_step(bat, 2, 50) /mob/living/basic/bat/bloodsucker @@ -29,20 +30,24 @@ desc = "A bat with a thirst for blood." maxHealth = 100 health = 100 + speed = 0 melee_damage_lower = 10 melee_damage_upper = 15 wound_bonus = 10 obj_damage = 10 - speed = -0.1 + lighting_cutoff_red = 25 + lighting_cutoff_green = 8 + lighting_cutoff_blue = 5 melee_attack_cooldown = CLICK_CD_MELEE basic_mob_flags = FLAMMABLE_MOB lighting_color_cutoffs = BLOODSUCKER_SIGHT_COLOR_CUTOFF damage_coeff = list(BRUTE = 0.9, BURN = 1.25, TOX = 1, STAMINA = 1, OXY = 1) - attack_verb_simple = list("bite", "drain", "drain blood", "nip") - attack_verb_continuous = list("bites", "drains", "drains blood", "nips") + attack_verb_simple = "drain blood from" + attack_verb_continuous = "drains blood from" /mob/living/basic/bat/bloodsucker/Initialize(mapload) . = ..() + // Go as fast as people can run AddElement(/datum/element/lifesteal, melee_damage_lower) // Too fat to fit through vents REMOVE_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm index 8512e91c558..380fc6d43c0 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm @@ -7,48 +7,39 @@ name = "\improper Vassal" roundend_category = "vassals" antagpanel_category = "Bloodsucker" - job_rank = ROLE_BLOODSUCKER + job_rank = ROLE_VASSAL antag_hud_name = "vassal" show_in_roundend = FALSE hud_icon = 'modular_zubbers/icons/mob/huds/bloodsucker.dmi' ui_name = "AntagInfoVassal" + antag_panel_description = "You are a Vassal, a mortal servant of a Bloodsucker." /// The Master Bloodsucker's antag datum. var/datum/antagonist/bloodsucker/master - /// List of all Purchased Powers, like Bloodsuckers. + /// List of all Purchased Powers, to be cleaned up on antag removal. var/list/datum/action/powers = list() ///Whether this vassal is already a special type of Vassal. var/special_type = FALSE - /// The first textblock text in the antag panel. - var/antag_panel_title - var/antag_panel_description ///Description of what this Vassal does. /// It's shown to the bloodsucker in the radial for setting vassal type var/vassal_description + /// inherent traits that are removed and addded on antag datum loss and gain + var/list/traits = list() /datum/antagonist/vassal/antag_panel_data() - return "Master : [master.owner.name]" + return "Master : [master?.owner.name ? master.owner.name : "Gone"]" +// todo make this into a shared proc that bloodsuckers and vassals share /datum/antagonist/vassal/ui_static_data(mob/user) - var/list/data = list() - data["title"] = "[antag_panel_title]\n[antag_panel_data()]" - data["description"] = antag_panel_description - for(var/datum/action/cooldown/bloodsucker/power as anything in powers) - var/list/power_data = list() - - power_data["power_name"] = power.name - power_data["power_explanation"] = power.power_explanation - power_data["power_icon"] = power.button_icon_state - - data["powers"] += list(power_data) - - return data + ..() + return ability_ui_data(powers) + ..() /datum/antagonist/vassal/apply_innate_effects(mob/living/mob_override) . = ..() var/mob/living/current_mob = mob_override || owner.current current_mob.apply_status_effect(/datum/status_effect/agent_pinpointer/vassal_edition) add_team_hud(current_mob) + if(length(traits)) + current_mob.add_traits(traits, VASSAL_TRAIT) /datum/antagonist/vassal/add_team_hud(mob/target) QDEL_NULL(team_hud_ref) @@ -76,6 +67,8 @@ . = ..() var/mob/living/current_mob = mob_override || owner.current current_mob.remove_status_effect(/datum/status_effect/agent_pinpointer/vassal_edition) + if(length(traits)) + current_mob.remove_traits(traits, VASSAL_TRAIT) /datum/antagonist/vassal/pre_mindshield(mob/implanter, mob/living/mob_override) return COMPONENT_MINDSHIELD_PASSED @@ -114,7 +107,7 @@ objectives += vassal_objective /// Give Vampire Language & Hud owner.current.grant_all_languages(FALSE, FALSE, TRUE) - owner.current.grant_language(/datum/language/vampiric, LANGUAGE_SPOKEN, LANGUAGE_MIND) + owner.current.grant_language(/datum/language/vampiric, ALL, LANGUAGE_MIND) return ..() /datum/antagonist/vassal/on_removal() @@ -128,14 +121,14 @@ owner.enslaved_to = null //Remove ALL Traits, as long as its from BLOODSUCKER_TRAIT's source. for(var/all_status_traits in owner.current._status_traits) - REMOVE_TRAIT(owner.current, all_status_traits, BLOODSUCKER_TRAIT) + REMOVE_TRAIT(owner.current, all_status_traits, VASSAL_TRAIT) //Remove Recuperate Power remove_powers(powers) //Remove Language & Hud - owner.current.remove_language(/datum/language/vampiric, LANGUAGE_SPOKEN, LANGUAGE_MIND) + owner.current.remove_language(/datum/language/vampiric, ALL, LANGUAGE_MIND) return ..() -/datum/antagonist/vassal/proc/remove_powers(var/list/removing_powers) +/datum/antagonist/vassal/proc/remove_powers(list/removing_powers) for(var/datum/action/cooldown/bloodsucker/power as anything in removing_powers) removing_powers -= power if(!(power in owner.current.actions)) @@ -187,12 +180,12 @@ continue possible_vampires += vamp if(!length(possible_vampires)) - message_admins("[key_name_admin(usr)] tried vassalizing [key_name_admin(new_owner)], but there were no bloodsuckers!") + message_admins("[key_name_admin(admin)] tried vassalizing [key_name_admin(new_owner)], but there were no bloodsuckers!") return - var/datum/mind/choice = input("Which bloodsucker should this vassal belong to?", "Bloodsucker") in possible_vampires + var/datum/mind/choice = tgui_input_list(admin, "Which bloodsucker should this vassal belong to?", "Bloodsucker", possible_vampires) if(!choice) return - log_admin("[key_name_admin(usr)] turned [key_name_admin(new_owner)] into a vassal of [key_name_admin(choice)]!") + log_admin("[key_name_admin(admin)] turned [key_name_admin(new_owner)] into a vassal of [key_name_admin(choice)]!") var/datum/antagonist/bloodsucker/vampire = choice.has_antag_datum(/datum/antagonist/bloodsucker) master = vampire new_owner.add_antag_datum(src) diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm index be32d1aa264..d9c20ed8ead 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_procs.dm @@ -9,7 +9,7 @@ * viewer - The person examining. */ /datum/antagonist/vassal/proc/return_vassal_examine(mob/living/viewer) - if(!viewer.mind || !iscarbon(owner.current)) + if((!viewer.mind && !isobserver(viewer)) || !iscarbon(owner.current)) return FALSE var/mob/living/carbon/carbon_current = owner.current // Target must be a Vassal @@ -17,14 +17,14 @@ var/returnString = "\[" var/returnIcon = "" // Vassals and Bloodsuckers recognize eachother, while Monster Hunters can see Vassals. - if(!IS_BLOODSUCKER(viewer) && !IS_VASSAL(viewer) && !IS_MONSTERHUNTER(viewer)) + if(!IS_BLOODSUCKER(viewer) && !IS_VASSAL(viewer) && !IS_MONSTERHUNTER(viewer) && !isobserver(viewer)) return FALSE // Am I Viewer's Vassal? if(master.owner == viewer.mind) returnString += "This [carbon_current.dna.species.name] bears YOUR mark!" returnIcon = "[icon2html('modular_zubbers/icons/misc/language.dmi', world, "vassal")]" // Am I someone ELSE'S Vassal? - else if(IS_BLOODSUCKER(viewer) || IS_MONSTERHUNTER(viewer)) + else if(IS_BLOODSUCKER(viewer) || IS_MONSTERHUNTER(viewer) || isobserver(viewer)) returnString += "This [carbon_current.dna.species.name] bears the mark of [master.return_full_name()][master.broke_masquerade ? " who has broken the Masquerade" : ""]" returnIcon = "[icon2html('modular_zubbers/icons/misc/language.dmi', world, "vassal_grey")]" // Are you serving the same master as I am? @@ -40,7 +40,7 @@ return returnIcon + returnString /// Used when your Master teaches you a new Power. -/datum/antagonist/vassal/proc/BuyPower(datum/action/cooldown/bloodsucker/power, list_to_add_to = powers) +/datum/antagonist/vassal/proc/BuyPower(datum/action/cooldown/power, list_to_add_to = powers) for(var/datum/action/current_powers as anything in list_to_add_to) if(current_powers.type == power.type) return FALSE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/ex_vassal.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/ex_vassal.dm index 51a754f95ce..7db0640fadc 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/ex_vassal.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/ex_vassal.dm @@ -5,7 +5,7 @@ name = "\improper Ex-Vassal" roundend_category = "vassals" antagpanel_category = "Bloodsucker" - job_rank = ROLE_BLOODSUCKER + job_rank = ROLE_VASSAL antag_hud_name = "vassal_grey" show_in_roundend = FALSE show_in_antagpanel = FALSE diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/favorite_vassal.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/favorite_vassal.dm index 41ef83efd37..5d549061e82 100644 --- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/favorite_vassal.dm +++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_types/favorite_vassal.dm @@ -5,7 +5,6 @@ */ /datum/antagonist/vassal/favorite name = "\improper Favorite Vassal" - show_in_antagpanel = FALSE antag_hud_name = "vassal6" special_type = FAVORITE_VASSAL vassal_description = "The Favorite Vassal gets unique abilities over other Vassals depending on your Clan \ @@ -21,7 +20,7 @@ SEND_SIGNAL(master, BLOODSUCKER_MAKE_FAVORITE, src) /datum/antagonist/vassal/favorite/on_removal() - remove_powers(bloodsucker_powers) + SEND_SIGNAL(master, BLOODSUCKER_LOOSE_FAVORITE, src) . = ..() /datum/antagonist/vassal/favorite/pre_mindshield(mob/implanter, mob/living/mob_override) diff --git a/modular_zubbers/code/modules/antagonists/modglue.dm b/modular_zubbers/code/modules/antagonists/modglue.dm new file mode 100644 index 00000000000..d6dd3a22613 --- /dev/null +++ b/modular_zubbers/code/modules/antagonists/modglue.dm @@ -0,0 +1,110 @@ +/obj/item/mod/module/dna_lock/reinforced + var/obj/item/implant/explosive/macro // Not really a macrobomb :P + +/obj/item/implant/explosive/proc/modsuit_explosion() + + playsound(loc, 'sound/items/timer.ogg', 30, FALSE) + if(!panic_beep_sound) + sleep(delay * 0.25) + //total of 8 bomb beeps, and we've already beeped once + var/bomb_beeps_until_boom = 8 + if(!panic_beep_sound) + while(bomb_beeps_until_boom > 0) + //for extra spice + var/beep_volume = 35 + playsound(loc, 'sound/items/timer.ogg', beep_volume, vary = FALSE) + sleep(delay * 0.25) + bomb_beeps_until_boom-- + beep_volume += 5 + explode() + else + addtimer(CALLBACK(src, PROC_REF(explode)), delay) + while(delay > 1) //so we dont accidentally enter an infinite sleep + var/beep_volume = 35 + playsound(loc, 'sound/items/timer.ogg', beep_volume, vary = FALSE) + sleep(delay * 0.2) + delay -= delay * 0.2 + beep_volume += 5 +#define PULL_SUIT "Pull it off" +#define IGNORE_SUIT "Don't pull it off" +#define DUMP_CONTENTS "Dump the storage box" +/obj/item/mod/module/dna_lock/reinforced/proc/explode(mob/user, mob/owner) + if(!dna_check(user)) + macro = new/obj/item/implant/explosive(src) + macro.modsuit_explosion() + owner.spasm_animation(600) + else + to_chat(user, "You feel safe knowing your modsuit did not blow up in your face.") + +/obj/item/mod/control/pre_equipped/contractor/doStrip(mob/living/carbon/stripper, mob/owner) + if(!istype(stripper, /mob/living/carbon)) + return + var/obj/item/mod/module/dna_lock/reinforced/dna_lock = locate(/obj/item/mod/module/dna_lock/reinforced) in modules + var/alert + if(dna_lock) + alert = tgui_alert(stripper, + "As you go to pull the modsuit off of [owner], you spot a what appears to be a failsafe. \n If you pull any further, it looks like a fuse for a bomb will be pulled. Continue???", + "Are you REALLY SURE?", + list(PULL_SUIT, IGNORE_SUIT, DUMP_CONTENTS), 10 SECONDS, TRUE) + + + if(alert == PULL_SUIT) + ASYNC + if(dna_lock.dna) + dump_modsuit_toss_contents() + dna_lock.explode(user = stripper, owner = owner) + qdel(src) + . = ..() + if(alert == DUMP_CONTENTS) + dump_modsuit_toss_contents() + +/obj/item/mod/control/pre_equipped/ninja/doStrip(mob/living/carbon/stripper, mob/owner) + if(!istype(stripper, /mob/living/carbon)) + return + var/obj/item/mod/module/dna_lock/reinforced/dna_lock = locate(/obj/item/mod/module/dna_lock/reinforced) in modules + var/alert + if(dna_lock) + alert = tgui_alert(stripper, + "As you go to pull the modsuit off of [owner], you spot a what appears to be a failsafe. \n If you pull any further, it looks like a fuse for a bomb will be pulled. Continue???", + "Are you REALLY SURE?", + list(PULL_SUIT, IGNORE_SUIT, DUMP_CONTENTS), 10 SECONDS, TRUE) + + + if(alert == PULL_SUIT) + ASYNC + if(dna_lock.dna) + dump_modsuit_toss_contents() + dna_lock.explode(user = stripper, owner = owner) + qdel(src) + . = ..() + if(alert == DUMP_CONTENTS) + dump_modsuit_toss_contents() + +/obj/item/mod/control + COOLDOWN_DECLARE(trash_cooldown) + COOLDOWN_DECLARE(funny_sound_cooldown) + +/obj/item/mod/control/proc/dump_modsuit_toss_contents() + if(QDELETED(src)) + return FALSE + var/obj/item/mod/module/storage/storage = locate() in contents + if(!storage) + playsound(src, 'sound/effects/quack.ogg') + return FALSE + for(var/atom/movable/i in storage.contents) + sleep(0.2 SECONDS) + reset_thing(i) + i.loc = get_turf(src) + var/turf/throw_at = get_ranged_target_turf_direct(src, usr, 7, rand(-60,60)) + if(i.safe_throw_at(throw_at, rand(2,4), rand(1,3), usr, spin = TRUE)) + playsound(i, 'sound/weapons/punchmiss.ogg', 10) + + return TRUE + +/proc/reset_thing(atom/movable/thing) + thing.layer = initial(thing.layer) + SET_PLANE_IMPLICIT(thing, initial(thing.plane)) + thing.mouse_opacity = initial(thing.mouse_opacity) + thing.screen_loc = null + if(thing.maptext) + thing.maptext = "" diff --git a/modular_zubbers/code/modules/mob/living/basic/vermin/mouse.dm b/modular_zubbers/code/modules/mob/living/basic/vermin/mouse.dm index b5001c0a7d4..dba23bee09c 100644 --- a/modular_zubbers/code/modules/mob/living/basic/vermin/mouse.dm +++ b/modular_zubbers/code/modules/mob/living/basic/vermin/mouse.dm @@ -1,4 +1,4 @@ //Addition: MICE WADDLE NOW. /mob/living/basic/mouse/Initialize(mapload, tame = FALSE, new_body_color) . = ..() - AddElement(/datum/element/waddling) + AddElementTrait(TRAIT_WADDLING, "innate", /datum/element/waddling) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm index 0762f737c5a..dc0b0f93fe7 100644 --- a/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm +++ b/modular_zubbers/code/modules/mob/living/carbon/human/_species.dm @@ -6,28 +6,29 @@ return null /// Replaces a couple organs to normal variants to not cause issues. Not super happy with this, alternative is disallowing vampiric races from being bloodsuckers -/datum/species/proc/humanize_organs(mob/living/carbon/human/target) - var/list/organs_to_handle = list( - ORGAN_SLOT_HEART = /obj/item/organ/internal/heart, - ORGAN_SLOT_LIVER = /obj/item/organ/internal/liver, - ORGAN_SLOT_STOMACH = /obj/item/organ/internal/stomach, - ORGAN_SLOT_TONGUE = /obj/item/organ/internal/tongue, - ) - mutantheart = organs_to_handle[ORGAN_SLOT_HEART] - mutantliver = organs_to_handle[ORGAN_SLOT_LIVER] - mutantstomach = organs_to_handle[ORGAN_SLOT_STOMACH] - mutanttongue = organs_to_handle[ORGAN_SLOT_TONGUE] - for(var/organ_slot in organs_to_handle) +/datum/species/proc/humanize_organs(mob/living/carbon/human/target, organs = list()) + if(!organs || !length(organs)) + organs = list( + ORGAN_SLOT_HEART = /obj/item/organ/internal/heart, + ORGAN_SLOT_LIVER = /obj/item/organ/internal/liver, + ORGAN_SLOT_STOMACH = /obj/item/organ/internal/stomach, + ORGAN_SLOT_TONGUE = /obj/item/organ/internal/tongue, + ) + mutantheart = organs[ORGAN_SLOT_HEART] + mutantliver = organs[ORGAN_SLOT_LIVER] + mutantstomach = organs[ORGAN_SLOT_STOMACH] + mutanttongue = organs[ORGAN_SLOT_TONGUE] + for(var/organ_slot in organs) var/obj/item/organ/old_organ = target.get_organ_slot(organ_slot) - var/organ_path = organs_to_handle[organ_slot] + var/organ_path = organs[organ_slot] if(old_organ?.type == organ_path) continue var/obj/item/organ/new_organ = SSwardrobe.provide_type(organ_path) - new_organ.Insert(target, FALSE, FALSE) + new_organ.Insert(target, FALSE, DELETE_IF_REPLACED) /datum/species/proc/normalize_organs(mob/living/carbon/human/target) mutantheart = initial(mutantheart) mutantliver = initial(mutantliver) mutantstomach = initial(mutantstomach) mutanttongue = initial(mutanttongue) - regenerate_organs(target) + regenerate_organs(target, replace_current = TRUE) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm new file mode 100644 index 00000000000..e2bb364a800 --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -0,0 +1,7 @@ + +/datum/species/jelly/on_bloodsucker_gain(mob/living/carbon/human/target) + humanize_organs(target) + +/datum/species/jelly/on_bloodsucker_loss(mob/living/carbon/human/target) + // regenerate_organs with replace doesn't seem to automatically remove invalid organs unfortunately + normalize_organs() diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm new file mode 100644 index 00000000000..60f5bf38fa2 --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -0,0 +1,8 @@ + +/datum/species/lizard/on_bloodsucker_gain(mob/living/carbon/human/target, datum/species/current_species) + bodytemp_heat_damage_limit = BODYTEMP_HEAT_DAMAGE_LIMIT + bodytemp_cold_damage_limit = BODYTEMP_COLD_DAMAGE_LIMIT + +/datum/species/lizard/on_bloodsucker_loss(mob/living/carbon/human/target) + bodytemp_heat_damage_limit = initial(bodytemp_heat_damage_limit) + bodytemp_cold_damage_limit = initial(bodytemp_cold_damage_limit) diff --git a/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm new file mode 100644 index 00000000000..405286e2565 --- /dev/null +++ b/modular_zubbers/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -0,0 +1,3 @@ + +/datum/species/monkey + mutantheart = /obj/item/organ/internal/heart/monkey diff --git a/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm b/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm index 8327808271f..bce5acf9adb 100644 --- a/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm +++ b/modular_zubbers/code/modules/spells/spell_types/nerfed_spells.dm @@ -70,6 +70,24 @@ cost = 2 limit = 1 +// Lichdom. Imbue an object and that object is basically your mobile respawn point. +// Funny mechanic, but it was INSANELY generous on what you could imbue, causing near immortality. Mechanical changes are in the non-modular file of lichdom.dm +/datum/spellbook_entry/lichdom + name = "Bind Fiery Soul" + desc = "An infernal necromantic pact that can forever bind your soul to a bulky item of your choosing, \ + turning you into an immortal Lich. So long as the item remains intact, you will revive from death, \ + no matter the circumstances. Be wary - with each revival, your body will become weaker, and \ + it will become easier for others to find your item of power. \ + Note that the fiery nature of the spell also requires it to be cast on a non-fireproof item, as the magic can't penetrate that way." + +/datum/action/cooldown/spell/lichdom + desc = "A fiery spell from the depths of hell that binds your soul to an item in your hands. \ + Binding your soul to an item will turn you into an immortal Lich. \ + So long as the item remains intact, you will revive from death, \ + no matter the circumstances. \ + Cannot be used on objects smaller than bulky or fireproof objects." + + // High Frequency Spellblade. Holy fuck just looking at the code is nonsense holy fuck. Can slash through walls, and also gib people who are dead. Absolutely silly. // Replaces it with a banhammer that can send you to the perma brig because that's funnier. /datum/spellbook_entry/item/highfrequencyblade diff --git a/modular_zubbers/code/modules/transport/transport_navigation.dm b/modular_zubbers/code/modules/transport/transport_navigation.dm deleted file mode 100644 index f5d05fe1b93..00000000000 --- a/modular_zubbers/code/modules/transport/transport_navigation.dm +++ /dev/null @@ -1,19 +0,0 @@ -//Moon Station - -/obj/effect/landmark/transport/transport_id/moonstation/line_1 - specific_transport_id = TRAMSTATION_LINE_1 - -/obj/effect/landmark/transport/nav_beacon/tram/nav/moonstation/main - name = TRAMSTATION_LINE_1 - specific_transport_id = TRAM_NAV_BEACONS - dir = WEST - -/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/terminal - name = "Terminal" - platform_code = TRAMSTATION_WEST - tgui_icons = list("Terminal" = "plane-arrival") - -/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/station - name = "Station" - platform_code = TRAMSTATION_EAST - tgui_icons = list("Station" = "plane-departure") diff --git a/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm b/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm index 79a5899aa8d..0b19b7449d9 100644 --- a/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm +++ b/modular_zubbers/code/modules/uplink/uplink_items/device_tools.dm @@ -1,3 +1,7 @@ /datum/uplink_item/device_tools/suspiciousphone surplus = 0 cant_discount = TRUE + limited_stock = 1 + +/datum/uplink_item/device_tools/powersink + limited_stock = 1 \ No newline at end of file diff --git a/modular_zubbers/icons/donator/idmaco.dmi b/modular_zubbers/icons/donator/idmaco.dmi index d88dd5b3663..c28ba6c449f 100644 Binary files a/modular_zubbers/icons/donator/idmaco.dmi and b/modular_zubbers/icons/donator/idmaco.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi b/modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi index e26cf2bb5d3..d02aae33bb1 100644 Binary files a/modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi and b/modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi differ diff --git a/modular_zubbers/modules/borgs/code/robot_model.dm b/modular_zubbers/modules/borgs/code/robot_model.dm index 603cc9d34f6..4cf57eb9fd6 100644 --- a/modular_zubbers/modules/borgs/code/robot_model.dm +++ b/modular_zubbers/modules/borgs/code/robot_model.dm @@ -69,13 +69,13 @@ /obj/item/robot_model/standard/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Standard", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Standard", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), ) /obj/item/robot_model/medical/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Medical", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Medical", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), "Raptor" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_MED_LARGE_BUBBER, @@ -86,7 +86,7 @@ /obj/item/robot_model/engineering/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Engineer", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Engineer", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), "Raptor" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_ENG_LARGE_BUBBER, @@ -97,7 +97,7 @@ /obj/item/robot_model/janitor/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Janitor", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Janitor", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), //64x48 sprites below (Raptor) "Raptor" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, @@ -109,7 +109,7 @@ /obj/item/robot_model/miner/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Mining", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Mining", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), //64x32 Sprites below (Wide) "Corrupt" = list( SKIN_ICON_STATE = "corrupt", @@ -132,7 +132,7 @@ /obj/item/robot_model/security/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Security", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Security", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), //32x64 Sprites below (Tall) "Meka - Bluesec" = list( SKIN_ICON_STATE = "mekasecalt", @@ -148,19 +148,10 @@ ), ) -/obj/item/robot_model/peacekeeper/Initialize(mapload) - . = ..() - borg_skins |= list( - "Raptor" = list( - SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, - SKIN_ICON = CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), - ), - ) - /obj/item/robot_model/peacekeeper/Initialize(mapload) .=..() borg_skins |= list( + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Pk", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), //32x64 Sprites below (Tall) "Meka - Bluesec" = list( SKIN_ICON_STATE = "mekasecalt", @@ -179,7 +170,7 @@ /obj/item/robot_model/service/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Service", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Service", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), "Fancy Raptor" = list( SKIN_ICON_STATE = "fancyraptor", SKIN_ICON = CYBORG_ICON_SERVICE_LARGE_BUBBER, @@ -215,7 +206,7 @@ SKIN_ICON = CYBORG_ICON_SYNDIE_LARGE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Syndicat", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Combat", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), ) /obj/item/robot_model/syndicate @@ -235,6 +226,7 @@ SKIN_ICON = CYBORG_ICON_SYNDIE_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Combat", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), ) /obj/item/robot_model/syndicate_medical @@ -278,14 +270,15 @@ /obj/item/robot_model/research/Initialize(mapload) . = ..() borg_skins |= list( - "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Research", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL, TRAIT_R_UNIQUEPANEL)), + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Research", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), ) */ -/* -/obj/item/robot_model/ninja/Initialize() + +/obj/item/robot_model/ninja/Initialize(mapload) . = ..() borg_skins |= list( + /* "Raptor" = list( SKIN_ICON_STATE = CYBORG_ICON_TYPE_RAPTOR, SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, @@ -296,5 +289,12 @@ SKIN_ICON = CYBORG_ICON_NINJA_WIDE_BUBBER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE) ), + */ + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Ninja", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), + ) + +/obj/item/robot_model/ninja_saboteur/Initialize(mapload) + . = ..() + borg_skins |= list( + "F3-LINE" = list(SKIN_ICON_STATE = "FELI-Ninja", SKIN_ICON = 'modular_zubbers/modules/borgs/sprites/felibot_all.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)), ) -*/ diff --git a/modular_zubbers/modules/borgs/sprites/felibot_all.dmi b/modular_zubbers/modules/borgs/sprites/felibot_all.dmi index 9db5771d20a..df980b7ecf5 100644 Binary files a/modular_zubbers/modules/borgs/sprites/felibot_all.dmi and b/modular_zubbers/modules/borgs/sprites/felibot_all.dmi differ diff --git a/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm b/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm new file mode 100644 index 00000000000..ca001ff0b5b --- /dev/null +++ b/modular_zubbers/modules/bubber_tram/code/moonstation_tram.dm @@ -0,0 +1,58 @@ +/obj/effect/landmark/transport/transport_id/moonstation/line_1 + specific_transport_id = MOONSTATION_LINE_1 + +/obj/effect/landmark/transport/nav_beacon/tram/nav/moonstation/main + name = MOONSTATION_LINE_1 + specific_transport_id = TRAM_NAV_BEACONS + dir = WEST + +/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/terminal + name = "Arrivals Terminal" + specific_transport_id = MOONSTATION_LINE_1 + platform_code = MOONSTATION_TERMINAL + tgui_icons = list("Arrivals Terminal" = "plane-arrival", "Cryogenic Sleepers" = "bed-pulse") + +/obj/effect/landmark/transport/nav_beacon/tram/platform/moonstation/station + name = "Main Station" + specific_transport_id = MOONSTATION_LINE_1 + platform_code = MOONSTATION_MAIN_STATION + tgui_icons = list("Main Station" = "arrow-right-to-city", "Departures/Evac" = "plane-departure") + +/obj/machinery/transport/tram_controller/moonstation + name = "moon rover controller" + desc = "Unlike the iconic moon rover of yesteryears, our tram is here to remind you that even in space, mediocrity finds a way." + configured_transport_id = MOONSTATION_LINE_1 + obj_flags = parent_type::obj_flags | NO_DECONSTRUCTION + +/obj/machinery/transport/destination_sign/moonstation + icon = 'modular_zubbers/modules/bubber_tram/icons/tram_display.dmi' + configured_transport_id = MOONSTATION_LINE_1 + +/obj/machinery/transport/destination_sign/indicator/moonstation + icon = 'modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi' + configured_transport_id = MOONSTATION_LINE_1 + +/obj/machinery/transport/destination_sign/Initialize(mapload) + . = ..() + LAZYADD(available_faces, MOONSTATION_LINE_1) + +/obj/machinery/computer/tram_controls/moonstation + name = "moon rover controls" + desc = "Unlike the iconic moon rover of yesteryears, our tram is here to remind you that even in space, mediocrity finds a way." + icon = 'modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi' + icon_screen = MOONSTATION_LINE_1 + specific_transport_id = MOONSTATION_LINE_1 + +/obj/machinery/computer/tram_controls/moonstation/directional/north + dir = SOUTH + pixel_x = -16 + pixel_y = 32 + +/obj/machinery/computer/tram_controls/moonstation/directional/south + dir = NORTH + pixel_x = 16 + pixel_y = -32 + +/obj/machinery/door/airlock/tram/moonstation + name = "moon rover door" + transport_linked_id = MOONSTATION_LINE_1 diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi new file mode 100644 index 00000000000..0b3909e962d Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_controls.dmi differ diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi new file mode 100644 index 00000000000..460c0eb54e5 Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_display.dmi differ diff --git a/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi b/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi new file mode 100644 index 00000000000..5b79d162f7f Binary files /dev/null and b/modular_zubbers/modules/bubber_tram/icons/tram_indicator.dmi differ diff --git a/modular_zubbers/modules/digitigrade-cybernetics/code/__DEFINES/research/research_categories.dm b/modular_zubbers/modules/digitigrade-cybernetics/code/__DEFINES/research/research_categories.dm deleted file mode 100644 index 7912d6ed16e..00000000000 --- a/modular_zubbers/modules/digitigrade-cybernetics/code/__DEFINES/research/research_categories.dm +++ /dev/null @@ -1 +0,0 @@ -#define RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI "/Digitigrade" diff --git a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/designs/mechfabricator_designs.dm b/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/designs/mechfabricator_designs.dm deleted file mode 100644 index 35ce224e1b6..00000000000 --- a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/designs/mechfabricator_designs.dm +++ /dev/null @@ -1,51 +0,0 @@ -/datum/design/digitigrade_cyber_r_leg - name = "Digitigrade Cybernetic Right Leg" - id = "digitigradecyber_r_leg" - build_type = MECHFAB - build_path = /obj/item/bodypart/leg/right/robot/digi - materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 2) - construction_time = 8 SECONDS - category = list( - RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI - ) - -/datum/design/digitigrade_cyber_l_leg - name = "Digitigrade Cybernetic Left Leg" - id = "digitigradecyber_l_leg" - build_type = MECHFAB - build_path = /obj/item/bodypart/leg/left/robot/digi - materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 2) - construction_time = 8 SECONDS - category = list( - RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI - ) - -/datum/design/digitigrade_adv_r_leg - name = "Digitigrade Advanced Right Leg" - id = "digitigradeadvanced_r_leg" - build_type = MECHFAB - build_path = /obj/item/bodypart/leg/right/robot/advanced/digi - materials = list( - /datum/material/iron=SHEET_MATERIAL_AMOUNT*10, - /datum/material/titanium=SHEET_MATERIAL_AMOUNT*3, - /datum/material/gold=SHEET_MATERIAL_AMOUNT*3, - ) - construction_time = 20 SECONDS - category = list( - RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI - ) - -/datum/design/digitigrade_adv_l_leg - name = "Digitigrade Advanced Left Leg" - id = "digitigradeadvanced_l_leg" - build_type = MECHFAB - build_path = /obj/item/bodypart/leg/left/robot/advanced/digi - materials = list( - /datum/material/iron=SHEET_MATERIAL_AMOUNT*10, - /datum/material/titanium=SHEET_MATERIAL_AMOUNT*3, - /datum/material/gold=SHEET_MATERIAL_AMOUNT*3, - ) - construction_time = 20 SECONDS - category = list( - RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI - ) diff --git a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/techweb/all_nodes.dm deleted file mode 100644 index 8ad6635df64..00000000000 --- a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/research/techweb/all_nodes.dm +++ /dev/null @@ -1,24 +0,0 @@ -//digitigrade research - -/datum/techweb_node/digitigradecyber - id = "digitigradecyber" - display_name = "Digitigrade Cybernetics" - description = "Specialized cybernetic limb designs. The shortening of the femur is surely the result of mechanical optimization." - prereq_ids = list("base") - design_ids = list( - "digitigradecyber_l_leg", - "digitigradecyber_r_leg", - ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) - - -/datum/techweb_node/adv_digitigradecyber - id = "adv_digitigradecyber" - display_name = "Advanced Digitigrade Cybernetics" - description = "A step above consumer-grade digitigrade models, These have self-sharping claws for destroying your footwear much faster." - prereq_ids = list("adv_robotics", "digitigradecyber") - design_ids = list( - "digitigradeadvanced_l_leg", - "digitigradeadvanced_r_leg", - ) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500) diff --git a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/surgery/robot_bodyparts.dm b/modular_zubbers/modules/digitigrade-cybernetics/code/modules/surgery/robot_bodyparts.dm deleted file mode 100644 index a77f021c84a..00000000000 --- a/modular_zubbers/modules/digitigrade-cybernetics/code/modules/surgery/robot_bodyparts.dm +++ /dev/null @@ -1,38 +0,0 @@ -//makes digi-robo limbs -//for now, all digi limbs use the same sprites. This will be changed eventually. - -/obj/item/bodypart/leg/right/robot/digi - name = "cyborg digitigrade right leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE - -/obj/item/bodypart/leg/left/robot/digi - name = "cyborg digitigrade left leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE - -/obj/item/bodypart/leg/right/robot/surplus/digi - name = "prosthetic digitigrade right leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE - -/obj/item/bodypart/leg/left/robot/surplus/digi - name = "prosthetic digitigrade right leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE - -/obj/item/bodypart/leg/right/robot/advanced/digi - name = "advanced digitigrade right leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE - -/obj/item/bodypart/leg/left/robot/advanced/digi - name = "advanced digitigrade right leg" - icon_static = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi' - icon = 'modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_DIGITIGRADE diff --git a/modular_zubbers/modules/digitigrade-cybernetics/customization/modules/client/augment/limbs.dm b/modular_zubbers/modules/digitigrade-cybernetics/customization/modules/client/augment/limbs.dm deleted file mode 100644 index 589596d9cad..00000000000 --- a/modular_zubbers/modules/digitigrade-cybernetics/customization/modules/client/augment/limbs.dm +++ /dev/null @@ -1,21 +0,0 @@ -/datum/augment_item/limb/l_leg/digi_prosthetic - name = "Digitigrade prosthetic left leg" - path = /obj/item/bodypart/leg/left/robot/surplus/digi - cost = -1 - uses_robotic_styles = FALSE - -/datum/augment_item/limb/l_leg/digi_cybernetic - name = "Digitigrade cybernetic left leg" - path = /obj/item/bodypart/leg/left/robot/digi - uses_robotic_styles = FALSE - -/datum/augment_item/limb/r_leg/digi_prosthetic - name = "Digitigrade prosthetic right leg" - path = /obj/item/bodypart/leg/right/robot/surplus/digi - cost = -1 - uses_robotic_styles = FALSE - -/datum/augment_item/limb/r_leg/digi_cybernetic - name = "Digitigrade cybernetic right leg" - path = /obj/item/bodypart/leg/right/robot/digi - uses_robotic_styles = FALSE diff --git a/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi b/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi deleted file mode 100644 index cdb2e4d8f22..00000000000 Binary files a/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/advanced_digitigrade_parts.dmi and /dev/null differ diff --git a/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi b/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi deleted file mode 100644 index 9f6e39e8efb..00000000000 Binary files a/modular_zubbers/modules/digitigrade-cybernetics/icons/bodyparts/digitigrade_parts.dmi and /dev/null differ diff --git a/modular_zubbers/modules/emotes/code/synth_emotes.dm b/modular_zubbers/modules/emotes/code/synth_emotes.dm index 3fe10c71b44..fd7750f4d97 100644 --- a/modular_zubbers/modules/emotes/code/synth_emotes.dm +++ b/modular_zubbers/modules/emotes/code/synth_emotes.dm @@ -3,7 +3,6 @@ message = "emits a disconcerting tone." vary = FALSE sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_scary.ogg' - silicon_allowed = TRUE allowed_species = list(/datum/species/synthetic) cooldown = 2 SECONDS @@ -12,7 +11,6 @@ message = "experiences a system error." vary = FALSE sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_error.ogg' - silicon_allowed = TRUE allowed_species = list(/datum/species/synthetic) cooldown = 2 SECONDS @@ -21,7 +19,6 @@ message = "chimes to life." vary = FALSE sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_startup.ogg' - silicon_allowed = TRUE allowed_species = list(/datum/species/synthetic) cooldown = 2 SECONDS @@ -30,6 +27,5 @@ message = "emits a nostalgic tone as they fall silent." vary = FALSE sound = 'modular_zubbers/modules/emotes/sound/synth_voice/synth_shutdown.ogg' - silicon_allowed = TRUE allowed_species = list(/datum/species/synthetic) cooldown = 2 SECONDS diff --git a/modular_zubbers/modules/hacks/atmos/force_atmos.dm b/modular_zubbers/modules/hacks/atmos/force_atmos.dm new file mode 100644 index 00000000000..d2d41f91672 --- /dev/null +++ b/modular_zubbers/modules/hacks/atmos/force_atmos.dm @@ -0,0 +1,22 @@ + +SUBSYSTEM_DEF(force_atmos) + name = "Atmospherics Forcer" + init_order = INIT_ORDER_AIR + priority = FIRE_PRIORITY_AIR + wait = 1 SECONDS + flags = SS_KEEP_TIMING + runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME + can_fire = FALSE // VAREDIT to make atmos actually forcefully run + +/datum/controller/subsystem/force_atmos/fire() + if(can_fire) + SSair.fire() // holy shitcode, batman + +GLOBAL_VAR(atmos_is_broken) + +/proc/atmos_is_broke() + + if(GLOB.atmos_is_broken) // end/start this all by varediting the global var atmos_is_broken + SSair.fire() + sleep(2 SECONDS) // We don't even trust the MC for timing. How did it get so bad? Overly complicated problems? Simple solutions. Horrible! + atmos_is_broke() // RECURSIVE OH NO diff --git a/modular_zubbers/modules/modular_items/code/idmaco_donator.dm b/modular_zubbers/modules/modular_items/code/idmaco_donator.dm index 40175af5e48..972dc25570a 100644 --- a/modular_zubbers/modules/modular_items/code/idmaco_donator.dm +++ b/modular_zubbers/modules/modular_items/code/idmaco_donator.dm @@ -5,45 +5,54 @@ //These are also additionally handed out to snaffle as they were a major player in the NRI events <3 -#define IDMA_CKEY_WHITELIST list("EspeciallyStrange", "Snaffle15", "Waterpig") +#define IDMA_CKEY_WHITELIST list("EspeciallyStrange", "Snaffle15", "Waterpig", "Mishanok") /datum/loadout_item/suit/idmarsuit name = "IDMA service jacket" item_path = /obj/item/clothing/suit/hooded/wintercoat/security/idma_jacket ckeywhitelist = IDMA_CKEY_WHITELIST - restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap /datum/loadout_item/suit/idmardjacket name = "silicon administrator vest" item_path = /obj/item/clothing/suit/jacket/vera_jacket - ckeywhitelist = list("especiallystrange") // Specific to me + ckeywhitelist = IDMA_CKEY_WHITELIST restricted_roles = list(JOB_RESEARCH_DIRECTOR) // and otherwise if not, specific to the RD /datum/loadout_item/under/miscellaneous/idmasnowfatigue name = "IDMA service uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue ckeywhitelist = IDMA_CKEY_WHITELIST - restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap //acts like a security uniform now /datum/loadout_item/under/miscellaneous/idmafatigue name = "IDMA desert service uniform" item_path = /obj/item/clothing/under/rank/security/idma_fatigue/alt - ckeywhitelist = list("especiallystrange", "snaffle15", "waterpig") - restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap + ckeywhitelist = IDMA_CKEY_WHITELIST + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap /datum/loadout_item/head/idmaberet name = "IDMA beret" item_path = /obj/item/clothing/head/idma_beret - ckeywhitelist = list("especiallystrange", "snaffle15", "waterpig") + ckeywhitelist = IDMA_CKEY_WHITELIST /datum/loadout_item/head/idmahelmet name = "IDMA service helmet" item_path = /obj/item/clothing/head/helmet/sec/sol/idma_helmet - ckeywhitelist = list("especiallystrange", "snaffle15", "waterpig") - restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap + ckeywhitelist = IDMA_CKEY_WHITELIST + restricted_roles = list(JOB_BLUESHIELD, JOB_CAPTAIN, JOB_NT_REP, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHIEF_ENGINEER, JOB_HEAD_OF_PERSONNEL, JOB_QUARTERMASTER, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_MEDIC, JOB_DETECTIVE) //Secure Personnel Only. It is a round start armor even if the actual armor can be ordered for cheap //acts like a proper helmet now +/datum/loadout_item/accessory/idmaarmbands + name = "IDMA armbands" + item_path = /obj/item/clothing/accessory/armband/idmaarmband + ckeywhitelist = IDMA_CKEY_WHITELIST + +/datum/loadout_item/toys/especiallystrange + item_path = /obj/item/toy/plush/especiallystrange + ckeywhitelist = IDMA_CKEY_WHITELIST + /obj/item/clothing/head/helmet/sec/sol/idma_helmet name = "ironmoon service helmet." desc = "A helmet worn by the romulus expeditionary force." @@ -116,7 +125,7 @@ //This is meant to be a functional wintercoat /obj/item/clothing/suit/hooded/wintercoat/security/idma_jacket name = "ironmoon service coat" - desc = "A heavy jacket worn by the romulus expeditionary force, contains ablative plating underneaths to protect the wearer from harms." + desc = "A heavy jacket worn with a '/Romulus Expeditionary Force/' insignia on it, contains ablative plating underneaths to protect the wearer from harms." icon_state = "romulusofficer" icon = 'modular_zubbers/icons/donator/idmaco.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi' @@ -128,3 +137,20 @@ icon_state = "romulushood" icon = 'modular_zubbers/icons/donator/idmaco.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi' + +/obj/item/clothing/accessory/armband/idmaarmband + name = "ironmoon police armband" + desc = "A fancy red armband normally seen used by the romulus federation police" + icon_state = "romuluspolice" + icon = 'modular_zubbers/icons/donator/idmaco.dmi' + worn_icon = 'modular_zubbers/icons/mob/clothing/under/idmaco_worn.dmi' + + +/obj/item/toy/plush/especiallystrange + name = "ironmoon tajaran plushie" + desc = "A small plushie based on the thousand tajaran volunteer, this one in particular seems to be a gun maintainer." + icon_state = "travian" + icon = 'modular_zubbers/icons/donator/idmaco.dmi' + attack_verb_continuous = list("cuddles", "meows", "hisses") + attack_verb_simple = list("cuddle", "meow", "hiss") + squeak_override = list('modular_skyrat/modules/customization/game/objects/items/sound/merowr.ogg' = 1) diff --git a/modular_zubbers/modules/tesh-vali_augments/code/surgery/bodyparts/robot_bodyparts.dm b/modular_zubbers/modules/tesh-vali_augments/code/surgery/bodyparts/robot_bodyparts.dm index c297214467b..9b8ce4574ce 100644 --- a/modular_zubbers/modules/tesh-vali_augments/code/surgery/bodyparts/robot_bodyparts.dm +++ b/modular_zubbers/modules/tesh-vali_augments/code/surgery/bodyparts/robot_bodyparts.dm @@ -21,7 +21,7 @@ desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case." icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH @@ -34,7 +34,7 @@ desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH @@ -47,7 +47,7 @@ desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH @@ -60,7 +60,7 @@ desc = "A skeletal limb wrapped in pseudomuscles and membranous feathers, with a low-conductivity case." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH @@ -73,7 +73,7 @@ desc = "A heavily reinforced case containing cyborg logic boards, with space for a standard power cell, covered in a layer of membranous feathers." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM brute_modifier = 1 burn_modifier = 0.9 @@ -85,7 +85,7 @@ desc = "A standard reinforced braincase, with spine-plugged neural socket and sensor gimbals. A layer of membranous feathers covers the stark metal." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW unarmed_damage_high = TESHARI_PUNCH_HIGH @@ -102,7 +102,7 @@ desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 @@ -121,7 +121,7 @@ desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -139,7 +139,7 @@ desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -157,7 +157,7 @@ desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -175,7 +175,7 @@ desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -193,8 +193,8 @@ desc = "A skeletal, robotic wing. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM - + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM + unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -213,7 +213,7 @@ desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -232,7 +232,7 @@ desc = "A skeletal, robotic hindlimb. Outdated and fragile, but it's still better than nothing. A layer of membranous feathers hides the cheap assembly." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/surplus_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 0.3 unarmed_damage_high = TESHARI_PUNCH_HIGH * 0.5 @@ -252,7 +252,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -270,7 +270,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -288,7 +288,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -306,7 +306,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -324,7 +324,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -342,7 +342,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -360,7 +360,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 @@ -378,7 +378,7 @@ desc = "An advanced robotic hindlimb. These designs are usually reserved for those still on the search for Avalon." icon_static = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' icon = 'modular_zubbers/modules/tesh-vali_augments/icons/advanced_augments_teshvali.dmi' - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ROBOTIC | BODYTYPE_CUSTOM + bodytype = BODYSHAPE_HUMANOID | BODYTYPE_ROBOTIC | BODYSHAPE_CUSTOM unarmed_damage_low = TESHARI_PUNCH_LOW * 2 unarmed_damage_high = TESHARI_PUNCH_HIGH * 3 diff --git a/tgstation.dme b/tgstation.dme index afd561e3321..f13ff00b349 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -487,6 +487,7 @@ #include "code\__DEFINES\~~bubber_defines\species.dm" #include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm" #include "code\__DEFINES\~~bubber_defines\traits.dm" +#include "code\__DEFINES\~~bubber_defines\transport.dm" #include "code\__DEFINES\~~bubber_defines\___HELPERS\global_lists.dm" #include "code\__HELPERS\_auxtools_api.dm" #include "code\__HELPERS\_lists.dm" @@ -8178,7 +8179,7 @@ #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\sentinel.dm" #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\spitter.dm" #include "modular_skyrat\modules\xenos_skyrat_redo\code\xeno_types\warrior.dm" -#include "modular_zubbers\code\__DEFINES\bloodsucker.dm" +#include "modular_zubbers\code\__DEFINES\bloodsucker_defines.dm" #include "modular_zubbers\code\__DEFINES\moonstation_defines.dm" #include "modular_zubbers\code\__DEFINES\send2relay.dm" #include "modular_zubbers\code\__DEFINES\traits.dm" @@ -8191,7 +8192,9 @@ #include "modular_zubbers\code\_globalvars\lists\maintenance_loot_uncommon.dm" #include "modular_zubbers\code\_globalvars\lists\~maintenance_loot.dm" #include "modular_zubbers\code\controllers\subsystem\air.dm" +#include "modular_zubbers\code\controllers\subsystem\mapping.dm" #include "modular_zubbers\code\controllers\subsystem\sol_subsystem.dm" +#include "modular_zubbers\code\datums\action.dm" #include "modular_zubbers\code\datums\armor_overrides.dm" #include "modular_zubbers\code\datums\department_security.dm" #include "modular_zubbers\code\datums\ert.dm" @@ -8250,7 +8253,6 @@ #include "modular_zubbers\code\game\machinery\burger_reactor_sniffer\reactor_sniffer_wires.dm" #include "modular_zubbers\code\game\machinery\camera\camera.dm" #include "modular_zubbers\code\game\machinery\computer\crew.dm" -#include "modular_zubbers\code\game\machinery\computer\arcade\arcade.dm" #include "modular_zubbers\code\game\machinery\computer\arcade\arcade_weights_classic.dm" #include "modular_zubbers\code\game\machinery\computer\arcade\arcade_weights_mechanical.dm" #include "modular_zubbers\code\game\machinery\computer\arcade\arcade_weights_oh_god.dm" @@ -8259,6 +8261,7 @@ #include "modular_zubbers\code\game\machinery\computer\arcade\minesweeper.dm" #include "modular_zubbers\code\game\machinery\computer\arcade\~arcade_weights_final.dm" #include "modular_zubbers\code\game\machinery\doors\firedoor.dm" +#include "modular_zubbers\code\game\machinery\pipe\construction.dm" #include "modular_zubbers\code\game\machinery\vending\multisec.dm" #include "modular_zubbers\code\game\objects\effects\decals.dm" #include "modular_zubbers\code\game\objects\effects\landmarks.dm" @@ -8299,6 +8302,8 @@ #include "modular_zubbers\code\modules\_defines.dm" #include "modular_zubbers\code\modules\admin\verbs\debug.dm" #include "modular_zubbers\code\modules\alternative_job_titles\code\alt_job_titles.dm" +#include "modular_zubbers\code\modules\antagonists\modglue.dm" +#include "modular_zubbers\code\modules\antagonists\_common\antag_datum.dm" #include "modular_zubbers\code\modules\antagonists\ashwalker\ashwalker.dm" #include "modular_zubbers\code\modules\antagonists\bloodsucker\bloodsuckers\assets.dm" #include "modular_zubbers\code\modules\antagonists\bloodsucker\bloodsuckers\bloodsucker.dm" @@ -8468,6 +8473,9 @@ #include "modular_zubbers\code\modules\mob\living\carbon\human\_species.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\abductor.dm" +#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\jellypeople.dm" +#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\lizardpeople.dm" +#include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\monkeys.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\shadekin.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\snail.dm" #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\vampire.dm" @@ -8516,7 +8524,6 @@ #include "modular_zubbers\code\modules\surgery\organs\internal\eyes\_eyes.dm" #include "modular_zubbers\code\modules\surgery\organs\internal\lungs\_lungs.dm" #include "modular_zubbers\code\modules\traitor\goal_overrides.dm" -#include "modular_zubbers\code\modules\transport\transport_navigation.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\device_tools.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\job.dm" @@ -8575,6 +8582,7 @@ #include "modular_zubbers\modules\borgs\code\robot_items.dm" #include "modular_zubbers\modules\borgs\code\robot_model.dm" #include "modular_zubbers\modules\borgs\code\robot_upgrade.dm" +#include "modular_zubbers\modules\bubber_tram\code\moonstation_tram.dm" #include "modular_zubbers\modules\client\code\chat_color.dm" #include "modular_zubbers\modules\client\code\preferences.dm" #include "modular_zubbers\modules\client\code\ssd.dm" @@ -8596,15 +8604,11 @@ #include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\akula.dm" #include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\tajaran.dm" #include "modular_zubbers\modules\customization\modules\mob\living\carbon\human\species\xeno.dm" -#include "modular_zubbers\modules\digitigrade-cybernetics\code\__DEFINES\research\research_categories.dm" -#include "modular_zubbers\modules\digitigrade-cybernetics\code\modules\research\designs\mechfabricator_designs.dm" -#include "modular_zubbers\modules\digitigrade-cybernetics\code\modules\research\techweb\all_nodes.dm" -#include "modular_zubbers\modules\digitigrade-cybernetics\code\modules\surgery\robot_bodyparts.dm" -#include "modular_zubbers\modules\digitigrade-cybernetics\customization\modules\client\augment\limbs.dm" #include "modular_zubbers\modules\emotes\code\emotes.dm" #include "modular_zubbers\modules\emotes\code\synth_emotes.dm" #include "modular_zubbers\modules\examine\examine_tgui.dm" #include "modular_zubbers\modules\gladiator\code\game\objects\items\gladiator_items.dm" +#include "modular_zubbers\modules\hacks\atmos\force_atmos.dm" #include "modular_zubbers\modules\hemophages\code\limbgrower.dm" #include "modular_zubbers\modules\hemophages\code\species.dm" #include "modular_zubbers\modules\hydroponics\code\grown\rocks.dm" diff --git a/tgui/packages/tgui/interfaces/TramControl.tsx b/tgui/packages/tgui/interfaces/TramControl.tsx index 74b93c61dec..ff39679f754 100644 --- a/tgui/packages/tgui/interfaces/TramControl.tsx +++ b/tgui/packages/tgui/interfaces/TramControl.tsx @@ -38,6 +38,11 @@ const DEPARTMENT2COLOR = { Ordnance: 'yellow', Office: 'red', Dormitories: 'black', + // BUBBER EDIT ADD - Moonstation + 'Arrivals Terminal': 'yellow', + 'Cryogenic Sleepers': 'purple', + 'Main Station': 'blue', + 'Departures/Evac': 'green', } as const; const COLOR2BLURB = { diff --git a/tools/UpdatePaths/Scripts_Bubber/upstream_24_03_06.txt b/tools/UpdatePaths/Scripts_Bubber/upstream_24_03_06.txt new file mode 100644 index 00000000000..74c38b798ab --- /dev/null +++ b/tools/UpdatePaths/Scripts_Bubber/upstream_24_03_06.txt @@ -0,0 +1,7 @@ +/obj/machinery/door/window/left/directional/south : /obj/machinery/door/window/left/directional/south{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/left/directional/west : /obj/machinery/door/window/left/directional/west{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/left/directional/north : /obj/machinery/door/window/left/directional/north{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/left/directional/east : /obj/machinery/door/window/left/directional/east{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/right/directional/west : /obj/machinery/door/window/right/directional/west{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/right/directional/south : /obj/machinery/door/window/right/directional/south{@OLD;icon_state = @SKIP} +/obj/machinery/door/window/right/directional/north : /obj/machinery/door/window/right/directional/north{@OLD;icon_state = @SKIP}