diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index f25c8e5f5f..1c9ff79460 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -50,3 +50,6 @@ /area/holodeck/source_patient_ward name = "\improper Holodeck - Patient Ward" + +/area/holodeck/the_uwu_zone + name = "\improper Holodeck - Inside" diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 9817650461..619792719f 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -72,7 +72,8 @@ var/list/restricted_programs = list( "Burnoff Test Simulation" = new/datum/holodeck_program(/area/holodeck/source_burntest, list()), - "Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()) + "Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()), + "Inside" = new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add ) /obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index a3cd39d2bf..f13051be24 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -127,7 +127,7 @@ . += shoes.slowdown //VOREStation Addition Start - if(buckled && istype(buckled, /obj/machinery/power/rtg/d_type_reg)) + if(buckled && istype(buckled, /obj/machinery/power/rtg/reg)) . += shoes.slowdown //VOREStation Addition End diff --git a/code/modules/power/port_gen_vr.dm b/code/modules/power/port_gen_vr.dm index f8e018f99d..124865e38b 100644 --- a/code/modules/power/port_gen_vr.dm +++ b/code/modules/power/port_gen_vr.dm @@ -282,16 +282,17 @@ log_and_message_admins("[ADMIN_LOOKUPFLW(Proj.firer)] triggered a kugelblitz core explosion at [x],[y],[z] via projectile.") asplod() -/obj/machinery/power/rtg/d_type_reg +/obj/machinery/power/rtg/reg name = "d-type rotary electric generator" desc = "It looks kind of like a large hamster wheel." icon = 'icons/obj/power_vrx96.dmi' icon_state = "reg" - circuit = /obj/item/weapon/circuitboard/machine/reg + circuit = /obj/item/weapon/circuitboard/machine/reg_d irradiate = FALSE power_gen = 0 var/default_power_gen = 1000000 //It's big but it gets adjusted based on what you put into it!!! var/part_mult = 0 + var/nutrition_drain = 1 pixel_x = -32 plane = ABOVE_MOB_PLANE layer = ABOVE_MOB_LAYER @@ -299,29 +300,29 @@ interact_offline = TRUE density = FALSE -/obj/machinery/power/rtg/d_type_reg/Initialize() +/obj/machinery/power/rtg/reg/Initialize() pixel_x = -32 . = ..() -/obj/machinery/power/rtg/d_type_reg/Destroy() +/obj/machinery/power/rtg/reg/Destroy() . = ..() -/obj/machinery/power/rtg/d_type_reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE) +/obj/machinery/power/rtg/reg/user_buckle_mob(mob/living/M, mob/user, var/forced = FALSE, var/silent = TRUE) . = ..() M.pixel_y = 8 M.visible_message("\The [M], hops up onto \the [src] and begins running!") -/obj/machinery/power/rtg/d_type_reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE) +/obj/machinery/power/rtg/reg/unbuckle_mob(mob/living/buckled_mob, force = FALSE) . = ..() buckled_mob.pixel_y = initial(buckled_mob.pixel_y) -/obj/machinery/power/rtg/d_type_reg/RefreshParts() +/obj/machinery/power/rtg/reg/RefreshParts() var/n = 0 for(var/obj/item/weapon/stock_parts/SP in component_parts) n += SP.rating part_mult = n -/obj/machinery/power/rtg/d_type_reg/attackby(obj/item/I, mob/user, params) +/obj/machinery/power/rtg/reg/attackby(obj/item/I, mob/user, params) pixel_x = -32 if(default_deconstruction_screwdriver(user, I)) return @@ -329,7 +330,7 @@ return return ..() -/obj/machinery/power/rtg/d_type_reg/update_icon() +/obj/machinery/power/rtg/reg/update_icon() pixel_x = -32 if(panel_open) icon_state = "reg-o" @@ -338,7 +339,7 @@ else icon_state = "reg" -/obj/machinery/power/rtg/d_type_reg/process() +/obj/machinery/power/rtg/reg/process() ..() if(buckled_mobs && buckled_mobs.len > 0) for(var/mob/living/L in buckled_mobs) @@ -347,7 +348,7 @@ power_gen = 0 update_icon() -/obj/machinery/power/rtg/d_type_reg/proc/runner_process(var/mob/living/runner) +/obj/machinery/power/rtg/reg/proc/runner_process(var/mob/living/runner) if(runner.stat != CONSCIOUS) unbuckle_mob(runner) runner.visible_message("\The [runner], topples off of \the [src]!") @@ -381,16 +382,31 @@ if(part_mult > 1) cool_rotations += (cool_rotations * (part_mult - 1)) / 4 power_gen = cool_rotations - runner.nutrition -- + runner.nutrition -= nutrition_drain -/obj/machinery/power/rtg/d_type_reg/emp_act(severity) +/obj/machinery/power/rtg/reg/emp_act(severity) return -/obj/item/weapon/circuitboard/machine/reg - name = T_BOARD("REG") - build_path = /obj/machinery/power/rtg/d_type_reg +/obj/item/weapon/circuitboard/machine/reg_d + name = T_BOARD("D-Type-REG") + build_path = /obj/machinery/power/rtg/reg board_type = new /datum/frame/frame_types/machine origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) req_components = list( /obj/item/stack/cable_coil = 5, - /obj/item/weapon/stock_parts/capacitor = 1) \ No newline at end of file + /obj/item/weapon/stock_parts/capacitor = 1) + +/obj/item/weapon/circuitboard/machine/reg_c + name = T_BOARD("C-Type-REG") + build_path = /obj/machinery/power/rtg/reg/c + board_type = new /datum/frame/frame_types/machine + origin_tech = list(TECH_DATA = 2, TECH_POWER = 4, TECH_ENGINEERING = 4) + req_components = list( + /obj/item/stack/cable_coil = 5, + /obj/item/weapon/stock_parts/capacitor = 1) + +/obj/machinery/power/rtg/reg/c + name = "c-type rotary electric generator" + circuit = /obj/item/weapon/circuitboard/machine/reg_c + default_power_gen = 500000 //Half power + nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm index c37a13095a..f0926dfc8e 100644 --- a/maps/groundbase/gb-misc.dmm +++ b/maps/groundbase/gb-misc.dmm @@ -2486,14 +2486,8 @@ /turf/unsimulated/ai_visible, /area/ai_multicam_room) "lp" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - landmark_tag = "escape_transit"; - name = "Escape Transit" - }, -/turf/space/transit/west, -/area/space) +/turf/simulated/floor/flesh, +/area/holodeck/the_uwu_zone) "lP" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2594,6 +2588,15 @@ /obj/effect/floor_decal/sign/small_h, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"qB" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + landmark_tag = "escape_transit"; + name = "Escape Transit" + }, +/turf/space/transit/west, +/area/space) "qV" = ( /obj/effect/floor_decal/sign/small_6, /turf/simulated/floor/holofloor/wood, @@ -2966,9 +2969,9 @@ }, /area/holodeck/source_gym) "PL" = ( -/turf/space, +/turf/simulated/floor/flesh, /turf/simulated/floor/holofloor/reinforced, -/area/space) +/area/holodeck/the_uwu_zone) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -3225,58 +3228,58 @@ aa ap ap ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ ap -ap -ap -ap -ap -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ jZ jZ jZ @@ -3367,11 +3370,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -3420,7 +3418,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -3509,11 +3512,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -3562,7 +3560,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -3651,11 +3654,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -3704,7 +3702,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -3793,11 +3796,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -3846,7 +3844,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -3935,11 +3938,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -3988,7 +3986,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4077,11 +4080,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4130,7 +4128,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4219,11 +4222,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4272,7 +4270,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4361,11 +4364,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4414,7 +4412,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4503,11 +4506,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4556,7 +4554,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4645,11 +4648,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4698,7 +4696,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4787,11 +4790,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4840,7 +4838,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -4929,11 +4932,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -4982,7 +4980,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5071,11 +5074,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5124,7 +5122,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5213,11 +5216,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5266,7 +5264,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5355,11 +5358,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5408,7 +5406,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5497,11 +5500,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5550,7 +5548,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5639,11 +5642,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5692,7 +5690,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5781,11 +5784,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5834,7 +5832,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -5923,11 +5926,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -5976,7 +5974,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -6065,11 +6068,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6118,7 +6116,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -6207,11 +6210,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6260,7 +6258,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -6349,11 +6352,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6402,7 +6400,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -6491,11 +6494,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6544,7 +6542,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -6633,11 +6636,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6686,6 +6684,11 @@ EA EA EA EA +EA +EA +jZ +ap +jZ jZ jZ jZ @@ -6775,11 +6778,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6828,31 +6826,36 @@ EA EA EA EA -jZ -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA EA EA jZ +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap "} (27,1,1) = {" ul @@ -6917,11 +6920,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -6970,30 +6968,35 @@ EA EA EA EA +EA +EA +jZ +ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ jZ -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA -EA jZ "} (28,1,1) = {" @@ -7059,11 +7062,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7112,7 +7110,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7201,11 +7204,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7254,7 +7252,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7343,11 +7346,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7396,7 +7394,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7485,11 +7488,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7538,7 +7536,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7627,11 +7630,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7680,7 +7678,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7769,11 +7772,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7822,7 +7820,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -7911,11 +7914,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -7964,7 +7962,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8053,11 +8056,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8106,7 +8104,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8195,11 +8198,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8248,7 +8246,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8337,11 +8340,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8390,7 +8388,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8479,11 +8482,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8532,7 +8530,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8621,11 +8624,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8674,7 +8672,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8763,11 +8766,6 @@ aa ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8816,7 +8814,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -8905,11 +8908,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -8958,7 +8956,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9047,11 +9050,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9100,7 +9098,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9189,11 +9192,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9242,7 +9240,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9331,11 +9334,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9384,7 +9382,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9473,11 +9476,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9526,7 +9524,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9615,11 +9618,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9668,7 +9666,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9757,11 +9760,6 @@ ap ap ap ap -ap -ap -ap -ap -ap jZ EA EA @@ -9810,7 +9808,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -9875,35 +9878,30 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap jZ EA EA @@ -9952,7 +9950,12 @@ EA EA EA EA +EA +EA jZ +ap +jZ +EA EA EA EA @@ -10017,55 +10020,30 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ -jZ +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap jZ jZ jZ @@ -10117,7 +10095,32 @@ jZ jZ jZ jZ +ap jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA jZ "} (50,1,1) = {" @@ -10159,35 +10162,6 @@ ap ap ap ap -El -El -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -El -El ap ap ap @@ -10261,6 +10235,35 @@ ap ap ap ap +ap +ap +ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ "} (51,1,1) = {" ap @@ -10301,78 +10304,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -10402,7 +10333,79 @@ ap ap ap ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ "} (52,1,1) = {" ar @@ -10443,52 +10446,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -10518,6 +10475,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -10585,52 +10588,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -10660,6 +10617,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -10727,52 +10730,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -10802,6 +10759,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -10869,52 +10872,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -10944,6 +10901,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11011,52 +11014,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11086,6 +11043,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11153,52 +11156,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11228,6 +11185,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11295,52 +11298,6 @@ ap ap ap ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -11370,6 +11327,52 @@ ap ap ap ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11436,10 +11439,6 @@ xp ap ap ap -ap -El -El -iO El El El @@ -11463,55 +11462,59 @@ El El El El -iO +El +El +El +El El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11578,10 +11581,6 @@ xp ap ap ap -ap -El -El -iO El El El @@ -11605,55 +11604,59 @@ El El El El -iO +El +El +El +El El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11720,82 +11723,82 @@ xp ap ap ap -ap El El iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -11862,7 +11865,6 @@ xp ap ap ap -ap El El iO @@ -11893,51 +11895,52 @@ iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -12004,7 +12007,6 @@ ar ap ap ap -ap El El iO @@ -12035,51 +12037,52 @@ iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -12146,7 +12149,6 @@ xp ap ap ap -ap El El iO @@ -12177,51 +12179,52 @@ iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -12288,7 +12291,6 @@ xp ap ap ap -ap El El iO @@ -12319,51 +12321,52 @@ iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +EA +jZ ap ap ap @@ -12430,7 +12433,6 @@ xp ap ap ap -ap El El iO @@ -12461,51 +12463,52 @@ iO El El ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ +jZ ap ap ap @@ -12572,36 +12575,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -12714,36 +12717,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -12856,36 +12859,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -lp -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -12998,36 +13001,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -13140,36 +13143,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -13282,36 +13285,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -13424,36 +13427,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -iO -El -El ap ap ap @@ -13566,36 +13569,36 @@ ar ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -iO -El -El ap ap ap @@ -13708,36 +13711,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap ap ap @@ -13850,36 +13853,36 @@ xp ap ap ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap ap ap @@ -13992,35 +13995,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ap ap @@ -14134,35 +14137,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ap ap @@ -14276,35 +14279,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ap ap @@ -14418,35 +14421,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +qB +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ZC ZC @@ -14560,35 +14563,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ZC ZF @@ -14702,35 +14705,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ZC ZF @@ -14844,35 +14847,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ZC ZF @@ -14986,35 +14989,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +iO +El +El ap ZC ZF @@ -15128,35 +15131,35 @@ ar ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +iO +El +El ap ZC ZF @@ -15270,35 +15273,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZC ZF @@ -15412,35 +15415,35 @@ xp ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZC ZF @@ -16818,16 +16821,16 @@ fz fz fS dB -fZ -fZ -fZ -fZ +lp +lp +lp +lp PL -fZ -fZ -fZ +lp +lp +lp PL -fZ +lp xp ap ap @@ -16960,16 +16963,16 @@ ei ei fJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17102,16 +17105,16 @@ fJ fz fS dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17244,16 +17247,16 @@ fJ ei fT dB -fZ -fZ -fZ -fZ +lp +lp +lp +lp PL -fZ -fZ -fZ +lp +lp +lp PL -fZ +lp xp ap ap @@ -17386,16 +17389,16 @@ fJ fA fU dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17528,16 +17531,16 @@ ei ei fJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17670,16 +17673,16 @@ fA fA fU dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17812,16 +17815,16 @@ bh aG aG dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -17954,16 +17957,16 @@ dJ dK dK dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap @@ -18096,16 +18099,16 @@ dJ dJ dJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +lp +lp +lp +lp +lp +lp +lp +lp +lp +lp xp ap ap diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index e9d4d526e8..2c7b2e167d 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -85,9 +85,6 @@ /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "al" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -522,9 +519,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Roboticist" - }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "bB" = ( @@ -606,6 +600,7 @@ "bO" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "bP" = ( @@ -678,11 +673,8 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "bZ" = ( -/obj/effect/landmark/start{ - name = "Chief Medical Officer" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/turf/simulated/floor, +/area/groundbase/level1/ne) "ca" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c{ outdoors = 0 @@ -882,6 +874,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "cE" = ( @@ -1001,20 +994,9 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) -"cT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Botanist" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "cU" = ( /obj/item/weapon/stock_parts/manipulator, /obj/item/weapon/stock_parts/matter_bin, @@ -1026,11 +1008,9 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "cV" = ( -/obj/effect/landmark/start{ - name = "Explorer" - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start/clown, +/turf/simulated/floor, +/area/groundbase/level1/ne) "cW" = ( /obj/structure/table/rack/steel, /obj/item/weapon/circuitboard/mech_recharger{ @@ -1082,12 +1062,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or1) -"cZ" = ( -/obj/effect/landmark/start{ - name = "Internal Affairs Agent" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "db" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -1144,6 +1118,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "dn" = ( @@ -1176,12 +1151,6 @@ }, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) -"dt" = ( -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "du" = ( /obj/structure/table/standard, /obj/item/stack/nanopaste, @@ -1418,6 +1387,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "dX" = ( @@ -1440,18 +1410,6 @@ /obj/item/weapon/stool/padded, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) -"eb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Cargo Technician" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "ec" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -1591,6 +1549,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "er" = ( @@ -1676,9 +1635,7 @@ /area/groundbase/security/processing) "eF" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ - name = "Security Officer" - }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "eG" = ( @@ -2692,12 +2649,10 @@ /area/maintenance/groundbase/substation/secsci) "hx" = ( /obj/structure/table/bench/steel, -/obj/effect/landmark/start{ - name = "Security Officer" - }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "hz" = ( @@ -3521,6 +3476,7 @@ pixel_x = -15; pixel_y = -30 }, +/obj/effect/landmark/start/detective, /turf/simulated/floor/carpet, /area/groundbase/security/detective) "jP" = ( @@ -3633,11 +3589,14 @@ /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/engineering/lobby) "ke" = ( -/obj/effect/landmark/start{ - name = "Chemist" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/cyborg, +/turf/simulated/floor/tiled/techfloor/grid, +/area/groundbase/command/ai/robot) "kf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -4721,15 +4680,14 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "mS" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Internal Affairs Agent" - }, +/obj/effect/landmark/start/iaa, /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa2) "mT" = ( @@ -4777,7 +4735,7 @@ dir = 4; icon_state = "pipe-c" }, -/turf/simulated/floor/carpet/deco, +/turf/simulated/floor/lino, /area/groundbase/civilian/bar) "mZ" = ( /obj/structure/bed/chair{ @@ -5172,6 +5130,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/bartender, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "og" = ( @@ -6127,18 +6086,6 @@ "qN" = ( /turf/simulated/floor/tiled, /area/groundbase/engineering/eva) -"qP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Atmospheric Technician" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "qQ" = ( /obj/structure/closet/secure_closet/security, /obj/item/device/holowarrant, @@ -6563,6 +6510,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/landmark/start/atmostech, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "rW" = ( @@ -6854,6 +6802,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "sM" = ( @@ -7361,12 +7310,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) -"ue" = ( -/obj/effect/landmark/start{ - name = "Head of Personnel" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "uf" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/subspace/sub_filter, @@ -7540,9 +7483,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Bartender" - }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/centsquare) "uC" = ( @@ -7581,6 +7521,7 @@ /area/groundbase/level1/eastspur) "uI" = ( /obj/machinery/hologram/holopad, +/obj/effect/landmark/start/cyborg, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/robot) "uK" = ( @@ -7681,13 +7622,12 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "uV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Xenobiologist" +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start/cyborg, +/turf/simulated/floor/tiled/techfloor/grid, +/area/groundbase/command/ai/foyer) "uY" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -7786,9 +7726,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Internal Affairs Agent" - }, +/obj/effect/landmark/start/iaa, /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa1) "vp" = ( @@ -7984,6 +7922,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "vM" = ( @@ -8034,16 +7973,10 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "vV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Security Officer" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "vW" = ( /obj/effect/landmark/vermin, /obj/structure/cable/yellow{ @@ -8146,9 +8079,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "wj" = ( @@ -8168,6 +8099,7 @@ /area/groundbase/security/lobby) "wn" = ( /obj/structure/bed/chair/sofa/bench, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level1/southeastspur) "ws" = ( @@ -8248,12 +8180,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or1) -"wD" = ( -/obj/effect/landmark/start{ - name = "Head of Security" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "wE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8267,13 +8193,9 @@ /turf/simulated/wall, /area/groundbase/medical/morgue) "wF" = ( -/obj/item/stack/material/phoron{ - amount = 25 - }, -/obj/structure/closet/crate, -/obj/machinery/camera/network/engine, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/engine) +/obj/effect/landmark/start/bartender, +/turf/simulated/floor/lino, +/area/groundbase/civilian/bar) "wG" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/glasses/hud/security, @@ -8484,12 +8406,6 @@ /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) -"xe" = ( -/obj/effect/landmark/start{ - name = "Detective" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "xf" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Engineering Substation Bypass" @@ -8683,12 +8599,10 @@ pixel_x = -26; pixel_y = 10 }, -/obj/effect/landmark/start{ - name = "Chief Engineer" - }, /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/effect/landmark/start/ce, /turf/simulated/floor/carpet/oracarpet, /area/groundbase/engineering/ce) "xA" = ( @@ -8782,6 +8696,11 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "engineaccess"; + name = "Engine Access Shutters" + }, /turf/simulated/floor, /area/groundbase/engineering/engine) "xO" = ( @@ -8840,6 +8759,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "xW" = ( @@ -9046,11 +8966,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/or2) "yA" = ( -/obj/effect/landmark/start{ - name = "Pilot" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/entertainer, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "yB" = ( /obj/structure/sign/department/ass, /turf/simulated/wall, @@ -9494,6 +9413,7 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "zG" = ( @@ -9513,6 +9433,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "engineaccess"; + name = "Engine Access"; + pixel_x = -25; + req_access = list(3) + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) "zJ" = ( @@ -9793,12 +9720,6 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "Au" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -9837,16 +9758,10 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) "AA" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Shaft Miner" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/intern, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "AB" = ( /obj/structure/bed/chair{ dir = 4 @@ -10513,6 +10428,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "Cs" = ( @@ -10688,15 +10604,12 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "CP" = ( -/obj/item/stack/material/phoron{ - amount = 25 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/closet/crate, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/engineering/engine) +/obj/effect/landmark/start/bartender, +/turf/simulated/floor/lino, +/area/groundbase/civilian/bar) "CQ" = ( /obj/machinery/telecomms/bus/preset_three, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10748,6 +10661,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, +/obj/effect/landmark/start/warden, /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) "CW" = ( @@ -11005,12 +10919,6 @@ "DQ" = ( /turf/simulated/wall, /area/groundbase/medical/equipment) -"DR" = ( -/obj/effect/landmark/start{ - name = "Engineer" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "DS" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -11186,11 +11094,9 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) "Ep" = ( -/obj/effect/landmark/start{ - name = "Clown" - }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start, +/turf/simulated/floor/tiled/techfloor, +/area/groundbase/civilian/arrivals) "Eq" = ( /obj/structure/table/rack{ dir = 8; @@ -11539,6 +11445,7 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/effect/landmark/start/engineer, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "Fs" = ( @@ -11550,6 +11457,7 @@ /area/groundbase/command/tcomms/computer) "Ft" = ( /obj/structure/bed/chair/comfy/black, +/obj/effect/landmark/start/hos, /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/hos) "Fu" = ( @@ -11757,16 +11665,11 @@ /turf/simulated/floor/carpet/bcarpet, /area/groundbase/security/briefing) "Gd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Scientist" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start, +/turf/simulated/floor/tiled/techfloor, +/area/groundbase/civilian/arrivals) "Ge" = ( /obj/structure/bed/chair/sofa/bench/left{ dir = 8 @@ -11895,6 +11798,7 @@ /obj/structure/bed/chair/sofa/bench{ dir = 8 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) "Gw" = ( @@ -12116,6 +12020,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, +/obj/effect/landmark/start/atmostech, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos/monitoring) "Hf" = ( @@ -12185,6 +12090,7 @@ "Hm" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/briefing) "Hn" = ( @@ -12404,6 +12310,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "HT" = ( @@ -12445,6 +12352,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/landmark/start/atmostech, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "HY" = ( @@ -12524,6 +12432,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/closet/crate, +/obj/item/stack/material/phoron{ + amount = 25 + }, +/obj/item/stack/material/phoron{ + amount = 25 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "Ih" = ( @@ -12736,9 +12651,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/effect/landmark/start{ - name = "Assistant" - }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "IL" = ( @@ -12760,6 +12672,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/atmostech, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "IR" = ( @@ -12808,16 +12721,13 @@ /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "Jc" = ( -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Site Manager" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/apparel) "Jd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -12922,11 +12832,10 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) "Jq" = ( -/obj/effect/landmark/start{ - name = "Paramedic" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/apparel) "Jr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -12936,7 +12845,7 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "Js" = ( -/obj/machinery/power/rtg/d_type_reg, +/obj/machinery/power/rtg/reg/c, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/yellow, /turf/simulated/floor/reinforced, @@ -13003,11 +12912,9 @@ /turf/simulated/floor/lino, /area/groundbase/civilian/bar) "JF" = ( -/obj/effect/landmark/start{ - name = "Research Director" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start/ce, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/workshop) "JG" = ( /obj/structure/cable{ icon_state = "1-8" @@ -13580,9 +13487,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/landmark/start{ - name = "Chaplain" - }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "La" = ( @@ -13699,6 +13603,7 @@ /area/maintenance/groundbase/trashpit) "Lo" = ( /obj/structure/table/bench/padded, +/obj/effect/landmark/start/intern, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "Lq" = ( @@ -13902,6 +13807,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "LP" = ( @@ -14204,12 +14110,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) -"MB" = ( -/obj/effect/landmark/start{ - name = "Entertainer" - }, -/turf/simulated/floor/outdoors/sidewalk/virgo3c, -/area/groundbase/level1/centsquare) "MC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -14248,6 +14148,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "MJ" = ( @@ -14292,11 +14193,14 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "MM" = ( -/obj/effect/landmark/start{ - name = "Pathfinder" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/storage) "MN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14434,6 +14338,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "Ni" = ( @@ -14454,11 +14361,9 @@ /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) "Nl" = ( -/obj/effect/landmark/start{ - name = "Mime" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/effect/landmark/start/detective, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "Nm" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14687,6 +14592,7 @@ pixel_y = 31; req_access = list(1) }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled, /area/groundbase/security/processing) "NR" = ( @@ -14780,17 +14686,13 @@ /obj/structure/bed/chair/sofa/bench{ dir = 4 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) "Oe" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced, -/area/groundbase/engineering/engine) +/obj/effect/landmark/start/hos, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "Of" = ( /obj/structure/closet/walllocker_double/north{ dir = 8; @@ -15059,11 +14961,14 @@ /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) "OW" = ( -/obj/effect/landmark/start{ - name = "Janitor" +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/engine) "OX" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_security/polarized{ @@ -15172,6 +15077,7 @@ /obj/structure/bed/chair/sofa/bench{ dir = 1 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) "Ps" = ( @@ -15565,11 +15471,17 @@ /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/level1/westspur) "QE" = ( -/obj/effect/landmark/start{ - name = "Chef" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass{ + name = "Crew Apparel Care" }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "engineaccess"; + name = "Engine Access Shutters" + }, +/turf/simulated/floor/bmarble, +/area/groundbase/engineering/engine) "QG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 @@ -15692,6 +15604,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) "QY" = ( @@ -15998,9 +15911,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Warden" - }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "RR" = ( @@ -16631,11 +16541,10 @@ /turf/simulated/floor/carpet, /area/groundbase/security/detective) "TB" = ( -/obj/effect/landmark/start{ - name = "Librarian" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/entertainer, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/foodplace) "TC" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/processing) @@ -16669,11 +16578,10 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "TE" = ( -/obj/effect/landmark/start{ - name = "Cyborg" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/groundbase/command/ai/robot) +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/foodplace) "TF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -16901,8 +16809,8 @@ /obj/item/device/analyzer/plant_analyzer, /obj/item/device/analyzer, /obj/item/device/t_scanner, -/obj/item/weapon/circuitboard/machine/reg, -/obj/item/weapon/circuitboard/machine/reg, +/obj/item/weapon/circuitboard/machine/reg_c, +/obj/item/weapon/circuitboard/machine/reg_c, /obj/machinery/camera/network/engineering{ dir = 4 }, @@ -16977,12 +16885,6 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) -"UB" = ( -/obj/effect/landmark/start{ - name = "Medical Doctor" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "UC" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/gateway) @@ -17063,6 +16965,7 @@ /area/groundbase/medical/morgue) "US" = ( /obj/structure/bed/chair/sofa/bench, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /area/groundbase/level1/centsquare) "UU" = ( @@ -17124,9 +17027,6 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -17195,9 +17095,6 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/storage) "Vs" = ( -/obj/effect/landmark/start{ - name = "Command Secretary" - }, /turf/simulated/floor/outdoors/sidewalk/virgo3c, /area/groundbase/level1/centsquare) "Vt" = ( @@ -17227,12 +17124,6 @@ /obj/structure/cable/yellow, /turf/simulated/floor/tiled, /area/groundbase/civilian/toolstorage) -"Vw" = ( -/obj/effect/landmark/start{ - name = "Quartermaster" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "Vx" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17294,6 +17185,7 @@ /obj/effect/landmark{ name = "JoinLateGateway" }, +/obj/effect/landmark/start, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) "VE" = ( @@ -17719,12 +17611,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) -"WO" = ( -/obj/effect/landmark/start{ - name = "Chief Engineer" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "WP" = ( /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/foyer) @@ -17828,6 +17714,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "Xe" = ( @@ -17925,6 +17812,7 @@ dir = 8; pixel_x = 32 }, +/obj/effect/landmark/start/ce, /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "Xo" = ( @@ -18107,9 +17995,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "XP" = ( @@ -18259,12 +18145,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/groundbase/engineering/atmos) -"Yn" = ( -/obj/effect/landmark/start{ - name = "Psychiatrist" - }, -/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, -/area/groundbase/level1/centsquare) "Yo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -21581,7 +21461,7 @@ ms PL Ne zt -TE +hN dx PL ms @@ -21865,7 +21745,7 @@ ms Rr Ui ZJ -cs +ke PN cs rc @@ -22007,7 +21887,7 @@ ms Sy Uu SI -TE +hN RV Zu ms @@ -22578,11 +22458,11 @@ LS xd Ef Bf -Tw +uV Tw DY Tw -Tw +uV zU Qi wM @@ -22597,8 +22477,8 @@ MO pj ht ut -ut -ut +yA +vV bo bE pj @@ -22745,10 +22625,10 @@ lP AE Hq tu +vV ut ut -ut -ut +yA pj MO MO @@ -22880,8 +22760,8 @@ FF MO pj ht -ut -ut +vV +AA ut bo ht @@ -23030,7 +22910,7 @@ mj ht KR ut -ut +AA GF ut pj @@ -23174,7 +23054,7 @@ QQ ht ut GF -ut +vV pj MO MO @@ -23451,7 +23331,7 @@ Ng qd qd qd -ih +CP Es PO Xg @@ -23590,7 +23470,7 @@ MO MO pj vm -ht +qd qd ui ih @@ -23732,7 +23612,7 @@ MO MO pj GA -qd +wF qd mY jG @@ -23874,7 +23754,7 @@ MO MO pj dj -ht +qd qd Wj qd @@ -24019,7 +23899,7 @@ GR qd SF Lz -qd +wF us PO Xg @@ -24215,7 +24095,7 @@ os oH PW wl -nx +Nl Kr sp tY @@ -24584,8 +24464,8 @@ MO MO pj ht -ut -ut +vV +AA ut ht ht @@ -24869,8 +24749,8 @@ MO pj ht ut -ut -ut +yA +vV ht pj pj @@ -25494,7 +25374,7 @@ fm fm wl xr -nx +Oe ah Yh Ca @@ -28172,12 +28052,12 @@ IK Oz Oz Oz -uV +Oz RQ -Jc -AA -vV -Gd +LA +LA +LA +LA bA LA LA @@ -28310,7 +28190,7 @@ Eb Eb Eb US -qP +uB Lk Eb Eb @@ -28320,7 +28200,7 @@ Eb Eb Eb Lk -JF +Zh bf Eb Eb @@ -28462,7 +28342,7 @@ Nv Nv Eb Eb -Vw +Zh Pr Eb Eb @@ -28594,7 +28474,7 @@ Eb Eb Eb Eb -cT +uB Eb Eb Eb @@ -28604,7 +28484,7 @@ Nv Nv Nv Eb -Yn +Zh ds Eb Eb @@ -28736,7 +28616,7 @@ Eb Eb Eb Eb -eb +uB Eb Eb Nv @@ -28746,7 +28626,7 @@ Nv Nv Eb Eb -yA +Zh Eb Eb Eb @@ -28888,7 +28768,7 @@ Nv Nv Eb Eb -MM +OA Eb Eb Eb @@ -29020,7 +28900,7 @@ Eb Eb Eb Eb -QE +Zh Eb Eb Nv @@ -29030,7 +28910,7 @@ Nv Nv Eb Eb -Jq +Zh Eb Eb Eb @@ -29162,7 +29042,7 @@ Eb Eb Eb Eb -ke +Zh Eb Eb Nv @@ -29172,7 +29052,7 @@ Nv Eb Eb Eb -Nl +Zh Eb Eb Nv @@ -29304,7 +29184,7 @@ Eb Eb Eb Io -WO +Zh Eb Nv Eb @@ -29314,7 +29194,7 @@ Eb Eb Eb Eb -UB +Zh tB Eb Eb @@ -29446,7 +29326,7 @@ Nv Eb Eb US -bZ +Zh Lk Eb Eb @@ -29456,7 +29336,7 @@ Eb Eb Eb Lk -TB +Zh Pr Eb Eb @@ -29588,17 +29468,17 @@ Nv Eb Eb Hx -Ep +OA Vs -xe -DR -MB -cV -dt -ue -wD -cZ -OW +Vs +Vs +Vs +OA +Vs +Vs +Vs +Vs +OA ds Eb Eb @@ -29717,7 +29597,7 @@ dk jS BL MI -dl +Jc dl ux hl @@ -30143,7 +30023,7 @@ dk mV Pb Cr -UG +Jq UG BQ Bg @@ -31276,7 +31156,7 @@ DQ oi mf RY -is +Ep is bU Jz @@ -31418,7 +31298,7 @@ DQ oi mf uN -HT +Gd HT Nr Zz @@ -31603,7 +31483,7 @@ aw aw aw xN -xN +QE xN aw aw @@ -32292,7 +32172,7 @@ Wl Wl Wc IX -IX +JF iv sC kb @@ -32587,7 +32467,7 @@ WW JM Hi lw -il +MM tz nD PU @@ -32651,11 +32531,11 @@ qE qE qE qE -qE -qE -qE -pU -qE +bb +bb +bZ +bb +bb qE pU qE @@ -32793,11 +32673,11 @@ qE qE qE qE -qE -qE -qE -qE -qE +bb +bZ +bZ +bZ +bb qE qE qE @@ -32935,11 +32815,11 @@ qE qE qE qE -qE -qE -qE -qE -qE +bb +bZ +cV +bZ +bb qE qE qE @@ -33019,7 +32899,7 @@ Uq Of hz aw -wF +jc vb IN ZB @@ -33077,11 +32957,11 @@ qE qE qE qE -qE -qE -qE -qE -qE +bb +bZ +bZ +bZ +bb qE qE qE @@ -33161,8 +33041,8 @@ pw ea Xo aw -CP -so +Sg +OW ya pS YH @@ -33177,7 +33057,7 @@ Lt Lt Uf zW -Lo +TB nU Xd Hh @@ -33219,11 +33099,11 @@ qE qE qE qE -qE -qE -qE -qE -qE +bb +bb +bb +bb +bb qE qE qE @@ -33303,7 +33183,7 @@ xw xw Wk aw -Oe +ZF Au IN ZB @@ -33319,7 +33199,7 @@ Lt Lt Uf IM -Lo +TE XL vK Hh @@ -33445,7 +33325,7 @@ cU TL ej aw -Oe +ZF al UD wa diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index e6b7e0fe23..4e31c550b2 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -26,6 +26,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, +/obj/effect/landmark/start/rd, /turf/simulated/floor/tiled, /area/groundbase/science/rd) "af" = ( @@ -149,12 +150,10 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "aD" = ( -/obj/effect/landmark/start{ - name = "Janitor" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "aE" = ( @@ -656,6 +655,10 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/hydroponics) +"bU" = ( +/obj/effect/landmark/start/chaplain, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/chapel) "bV" = ( /obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, @@ -1350,6 +1353,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/start/captain, /turf/simulated/floor/wood, /area/groundbase/command/captainq) "ek" = ( @@ -1371,9 +1375,7 @@ /area/groundbase/dorms/room6) "em" = ( /obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start{ - name = "Site Manager" - }, +/obj/effect/landmark/start/captain, /turf/simulated/floor/carpet/blucarpet, /area/groundbase/command/captain) "en" = ( @@ -1442,15 +1444,13 @@ /turf/simulated/floor/tiled, /area/groundbase/science/server) "ey" = ( -/obj/effect/landmark/start{ - name = "Janitor" - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "eA" = ( @@ -1584,6 +1584,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/landmark/start/cmo, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "eR" = ( @@ -1717,9 +1718,10 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "fo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/deco, -/area/groundbase/civilian/kitchen/backroom) +/obj/structure/table/bench/sifwooden/padded, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/dark, +/area/groundbase/dorms) "fp" = ( /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 @@ -2125,6 +2127,7 @@ /obj/structure/bed/chair/sofa/bench{ dir = 1 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/se) "gE" = ( @@ -2236,6 +2239,7 @@ dir = 4; pixel_x = 24 }, +/obj/effect/landmark/start/commandsecretary, /turf/simulated/floor/tiled/dark, /area/groundbase/command/tcomms) "gV" = ( @@ -2356,6 +2360,7 @@ "hm" = ( /obj/structure/bed/chair/sofa/black, /obj/machinery/alarm, +/obj/effect/landmark/start/chef, /turf/simulated/floor/carpet/deco, /area/groundbase/civilian/kitchen/backroom) "hp" = ( @@ -2796,6 +2801,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "iC" = ( @@ -3001,6 +3007,10 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"ji" = ( +/obj/effect/landmark/start/botanist, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/hydroponics) "jk" = ( /obj/effect/landmark/vermin, /turf/simulated/floor/wood, @@ -3059,6 +3069,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) "jt" = ( @@ -3081,9 +3092,7 @@ /area/groundbase/civilian/kitchen/freezer) "jx" = ( /obj/structure/bed/chair/wood/wings, -/obj/effect/landmark/start{ - name = "Chaplain" - }, +/obj/effect/landmark/start/chaplain, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "jy" = ( @@ -3136,6 +3145,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/effect/landmark/start/psych, /turf/simulated/floor/wood, /area/groundbase/medical/psych) "jJ" = ( @@ -3449,6 +3459,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/commandsecretary, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "kG" = ( @@ -3705,6 +3716,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "lv" = ( @@ -3847,6 +3859,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/landmark/start/xenobio, /turf/simulated/floor/tiled, /area/groundbase/science/hall) "lP" = ( @@ -4121,14 +4134,9 @@ /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "mJ" = ( -/obj/structure/bed/chair/comfy/blue{ - dir = 1 - }, -/obj/effect/landmark/start{ - name = "Command Secretary" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/command/tcomms) +/obj/effect/landmark/start/chaplain, +/turf/simulated/floor/lino, +/area/groundbase/civilian/chapel/office) "mL" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/dark, @@ -4223,12 +4231,10 @@ }, /area/groundbase/science/circuits) "nd" = ( -/obj/effect/landmark/start{ - name = "Janitor" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "nf" = ( @@ -4451,6 +4457,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/landmark/start/scientist, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "nN" = ( @@ -5125,7 +5132,6 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/science/xenohall) "pW" = ( -/obj/effect/landmark/start/scientist, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -5138,6 +5144,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) "qa" = ( @@ -5195,6 +5202,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/effect/landmark/start/roboticist, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "ql" = ( @@ -5448,6 +5456,10 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"qW" = ( +/obj/effect/landmark/start/scientist, +/turf/simulated/floor/tiled, +/area/groundbase/science/hall) "qX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5704,6 +5716,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) +"rO" = ( +/turf/simulated/floor, +/area/groundbase/level2/nw) "rP" = ( /turf/simulated/wall, /area/groundbase/civilian/library) @@ -5749,6 +5764,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "se" = ( @@ -6086,6 +6102,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) +"tj" = ( +/obj/effect/landmark/start/chef, +/turf/simulated/floor/tiled/eris/cafe, +/area/groundbase/civilian/kitchen) "tk" = ( /obj/machinery/disease2/isolator, /obj/machinery/light{ @@ -6588,6 +6608,10 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room6) +"uM" = ( +/obj/effect/landmark/start/xenobio, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology) "uN" = ( /obj/structure/closet/l3closet/scientist, /obj/item/clothing/suit/bio_suit/scientist, @@ -6677,6 +6701,7 @@ /obj/structure/bed/chair/comfy/blue{ dir = 4 }, +/obj/effect/landmark/start/commandsecretary, /turf/simulated/floor/tiled/dark, /area/groundbase/command/tcomms) "vk" = ( @@ -6963,6 +6988,13 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"wd" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "we" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -7003,6 +7035,7 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "wm" = ( @@ -7328,6 +7361,7 @@ /obj/structure/bed/chair/office/dark{ dir = 1 }, +/obj/effect/landmark/start/psych, /turf/simulated/floor/carpet/blue, /area/groundbase/medical/psych) "xv" = ( @@ -7503,6 +7537,11 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"xP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/cargo, +/turf/simulated/floor/tiled, +/area/groundbase/cargo/office) "xS" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -7595,6 +7634,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/effect/landmark/start/intern, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "yh" = ( @@ -7918,15 +7958,10 @@ /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) "zi" = ( -/obj/effect/landmark/start/chef, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) +/obj/structure/bed/chair/comfy/brown, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/wood, +/area/groundbase/civilian/library) "zj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -8503,6 +8538,17 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) +"AS" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "AT" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/xenobot) @@ -9093,6 +9139,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/start/cargo, /turf/simulated/floor/tiled/steel_grid, /area/groundbase/cargo/office) "CS" = ( @@ -9493,6 +9540,7 @@ /obj/item/weapon/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/librarian, /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "DS" = ( @@ -9562,6 +9610,16 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"DZ" = ( +/obj/structure/table/bench/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/start/entertainer, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "Ea" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9687,7 +9745,6 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "Es" = ( -/obj/effect/landmark/start/chef, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -10122,6 +10179,11 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) +"FU" = ( +/obj/structure/table/bench/standard, +/obj/effect/landmark/start/rd, +/turf/simulated/floor/outdoors/newdirt/virgo3c, +/area/groundbase/science/picnic) "FW" = ( /obj/effect/landmark{ name = "lightsout" @@ -10322,6 +10384,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/effect/landmark/start/captain, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "Gx" = ( @@ -10545,6 +10608,7 @@ /obj/structure/bed/padded, /obj/machinery/alarm, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/landmark/start/captain, /turf/simulated/floor/carpet, /area/groundbase/command/captainq) "He" = ( @@ -10558,6 +10622,7 @@ dir = 4; pixel_x = 6 }, +/obj/effect/landmark/start/xenobot, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "Hf" = ( @@ -10673,6 +10738,10 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/cargo/office) +"Hy" = ( +/obj/effect/landmark/start/roboticist, +/turf/simulated/floor/tiled, +/area/groundbase/science/robotics) "Hz" = ( /obj/structure/table/marble, /obj/machinery/camera/network/civilian{ @@ -10711,6 +10780,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "HD" = ( @@ -10976,6 +11046,19 @@ /obj/machinery/botany/extractor, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"Iv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/landmark/start/botanist, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/hydroponics) "Iw" = ( /obj/effect/landmark/vermin, /turf/simulated/floor/tiled, @@ -11111,6 +11194,7 @@ pixel_x = -31; pixel_y = 1 }, +/obj/effect/landmark/start/hop, /turf/simulated/floor/tiled, /area/groundbase/command/hop) "IV" = ( @@ -11759,9 +11843,7 @@ /turf/simulated/floor/wood, /area/groundbase/command/captain) "KE" = ( -/obj/effect/landmark/start{ - name = "Janitor" - }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "KF" = ( @@ -11822,6 +11904,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/landmark/start/commandsecretary, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "KR" = ( @@ -11866,6 +11949,7 @@ dir = 8; pixel_x = -6 }, +/obj/effect/landmark/start/xenobot, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "Lc" = ( @@ -11960,6 +12044,7 @@ /obj/structure/bed/chair/sofa/bench{ dir = 1 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/ne) "Ls" = ( @@ -13023,6 +13108,16 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"On" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark/start/medical, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/triage) "Oo" = ( /obj/machinery/button/remote/blast_door{ dir = 1; @@ -13406,6 +13501,7 @@ /obj/structure/bed/chair/comfy/brown, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/librarian, /turf/simulated/floor/wood, /area/groundbase/civilian/library) "Pz" = ( @@ -13513,6 +13609,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"PR" = ( +/obj/effect/landmark/start/xenobio, +/turf/simulated/floor/tiled, +/area/groundbase/science/hall) "PS" = ( /obj/structure/table/bench/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13877,6 +13977,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"QN" = ( +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/groundbase/level2/nw) "QO" = ( /obj/machinery/button/remote/airlock{ id = "dorm7"; @@ -13901,10 +14008,18 @@ /obj/item/weapon/flame/candle/candelabra, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) +"QR" = ( +/obj/effect/landmark/start/entertainer, +/turf/simulated/floor/tiled/virgo3c{ + edge_blending_priority = -1; + outdoors = 0 + }, +/area/groundbase/level2/nw) "QV" = ( /obj/structure/bed/chair/office/dark{ dir = 1 }, +/obj/effect/landmark/start/scientist, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "QW" = ( @@ -13946,6 +14061,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/effect/landmark/start/chaplain, /turf/simulated/floor/carpet, /area/groundbase/civilian/chapel) "Ra" = ( @@ -14864,6 +14980,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/medical, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "TH" = ( @@ -14909,10 +15026,12 @@ dir = 9 }, /obj/machinery/light, +/obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "TO" = ( /obj/structure/bed/chair/office/dark, +/obj/effect/landmark/start/cargo, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "TS" = ( @@ -15682,6 +15801,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/landmark/start/entertainer, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "Wj" = ( @@ -15898,9 +16018,18 @@ /turf/simulated/open/virgo3c, /area/groundbase/level2/westspur) "WY" = ( -/obj/effect/landmark/start/botanist, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/hydroponics) +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/wood, +/area/groundbase/civilian/library) "WZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -15972,6 +16101,11 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"Xj" = ( +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "Xl" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -16062,6 +16196,7 @@ /area/groundbase/medical/triage) "XC" = ( /obj/structure/bed/chair/sofa/bench, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/ne) "XD" = ( @@ -16077,12 +16212,9 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "XG" = ( -/obj/structure/bed/chair/comfy/blue, -/obj/effect/landmark/start{ - name = "Command Secretary" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/command/tcomms) +/obj/effect/landmark/start/cargo, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/cargo/bay) "XH" = ( /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/rnd) @@ -16329,6 +16461,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/hop, /turf/simulated/floor/carpet, /area/groundbase/command/hop) "Yx" = ( @@ -16346,7 +16479,6 @@ /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "YA" = ( -/obj/effect/landmark/start/chef, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, @@ -16548,8 +16680,8 @@ /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "Zl" = ( -/obj/effect/landmark/start/botanist, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/botanist, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "Zn" = ( @@ -16602,6 +16734,10 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/library) +"Zw" = ( +/obj/effect/landmark/start/mime, +/turf/simulated/floor, +/area/groundbase/level2/nw) "Zx" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level2/sw) @@ -16610,6 +16746,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/qm, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "Zz" = ( @@ -16718,6 +16855,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 4 }, +/obj/effect/landmark/start/captain, /turf/simulated/floor/wood, /area/groundbase/command/captainq) "ZP" = ( @@ -18390,11 +18528,11 @@ xE xE xE xE -xE +Gp +Gp bY -bY -xE -xE +Gp +Gp xE xE xE @@ -18532,11 +18670,11 @@ xE xE xE xE -xE -xE -xE -xE -xE +Gp +rO +rO +rO +Gp xE xE xE @@ -18674,11 +18812,11 @@ KW xE xE xE -xE -xE -xE -xE -xE +Gp +rO +Zw +rO +Gp xE xE xE @@ -18816,11 +18954,11 @@ KW xE xE xE -xE -xE -xE -xE -xE +Gp +rO +rO +rO +Gp xE xE xE @@ -18958,11 +19096,11 @@ KW KW KW xE -xE -xE -xE -xE -xE +Gp +Gp +Gp +Gp +Gp xE xE Do @@ -18981,7 +19119,7 @@ bY OU Gp aJ -xA +QR xA fD TZ @@ -19124,7 +19262,7 @@ OU Gp aJ xA -xA +QN fD TZ bY @@ -19408,7 +19546,7 @@ OU Gp aJ xA -xA +QN fD TZ bY @@ -19549,7 +19687,7 @@ bY OU Gp aJ -xA +QR xA fD TZ @@ -20457,7 +20595,7 @@ jF IT zn ls -ls +uM Mz it Zx @@ -20663,7 +20801,7 @@ YR YR Yl Yl -lu +DZ PU Ea AK @@ -21366,7 +21504,7 @@ xE xE xE FF -PS +AS LS Ny YO @@ -21498,7 +21636,7 @@ rP Ak Ak cX -iE +zi WA XR MY @@ -21531,7 +21669,7 @@ kf WR ZZ GL -Gc +tj Sm FW qA @@ -21597,7 +21735,7 @@ Mf ag ag lW -Jq +FU cP Jq lW @@ -21642,7 +21780,7 @@ nn cX iE fT -XR +WY MY MY rP @@ -21731,7 +21869,7 @@ AZ ff bt IO -Vr +qW PZ fP xX @@ -21816,7 +21954,7 @@ WR ZZ jf CQ -zi +rL Pk QW yE @@ -21824,7 +21962,7 @@ yP BO ca im -fo +im Dv xU bY @@ -21873,7 +22011,7 @@ AZ ff bt nw -Vr +qW lw Vr Vr @@ -21926,7 +22064,7 @@ fe cX iE fW -XR +WY MY MY rP @@ -21948,7 +22086,7 @@ Gl Fp yh LS -cU +Xj rl bY sZ @@ -22015,7 +22153,7 @@ AZ yw bt ws -Vr +qW lw Vr Vr @@ -22066,7 +22204,7 @@ rP SI Gm cX -iE +zi WA XR MY @@ -22157,7 +22295,7 @@ Nb Ys bt aB -Vr +PR lw Vr Vr @@ -22299,7 +22437,7 @@ qU PD bt Ov -Vr +PR lw Vr Vr @@ -22646,7 +22784,7 @@ bY FF iB LV -Yl +wd YR YR OC @@ -23282,7 +23420,7 @@ pt RE Wn hU -nF +Hy CA AR ov @@ -23326,7 +23464,7 @@ Dw vu Yp DY -Dw +fo Yp pK Kp @@ -23605,7 +23743,7 @@ BU eC Rk iP -Dw +fo Dw jr iP @@ -24231,11 +24369,11 @@ bT Wl kp Yt -Wv +Iv Yt Iw Yt -Yt +ji Yt Bq Wl @@ -24375,7 +24513,7 @@ Yt Yt Wv Yt -WY +Yt Yt Yt Yt @@ -24488,7 +24626,7 @@ LR WO eD eD -eD +bU Hp YU Sf @@ -24659,7 +24797,7 @@ WP Yt Wv Yt -WY +Yt Yt Yt Yt @@ -24799,11 +24937,11 @@ tr PM Yt Yt -Wv +Iv Yt mC Yt -Yt +ji Yt Yt In @@ -25182,7 +25320,7 @@ bY ME DN cA -cA +mJ sU ME Kx @@ -28744,7 +28882,7 @@ VG yr za Eq -za +xP HJ Wj to @@ -29452,7 +29590,7 @@ PI PI KU KU -KU +XG KU PI PI @@ -30042,7 +30180,7 @@ rZ sW TU dt -zw +On DM ID rs @@ -31920,7 +32058,7 @@ Bo an pH gE -XG +iZ be dj pm @@ -32066,7 +32204,7 @@ iZ wh pj tJ -mJ +SE gE Et an diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index 06e3e6aeac..b65c7fd651 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -212,6 +212,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/landmark/start/chemist, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "dW" = ( @@ -259,6 +260,7 @@ /area/groundbase/medical/uhallway) "fu" = ( /obj/structure/table/bench/marble, +/obj/effect/landmark/start/chemist, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "fz" = ( @@ -709,10 +711,8 @@ /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "nN" = ( -/obj/effect/landmark/start{ - name = "Explorer" - }, /obj/machinery/light, +/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "nU" = ( @@ -728,6 +728,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/effect/landmark/start/cmo, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "og" = ( @@ -902,11 +903,9 @@ /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "qA" = ( -/obj/effect/landmark/start{ - name = "Field Medic" - }, -/turf/simulated/floor/tiled, -/area/groundbase/exploration/equipment) +/obj/effect/landmark/start/cargo, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/cargo/office) "qC" = ( /obj/machinery/station_map{ dir = 8; @@ -1124,15 +1123,14 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "uU" = ( -/obj/effect/landmark/start{ - name = "Pathfinder" - }, +/obj/effect/landmark/start/pf, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "vp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "vu" = ( @@ -1182,6 +1180,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 1 }, +/obj/effect/landmark/start/cmo, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) "wm" = ( @@ -1468,6 +1467,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/effect/landmark/start/cmo, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "BE" = ( @@ -1572,9 +1572,6 @@ /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "Ef" = ( -/obj/effect/landmark/start{ - name = "Field Medic" - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -1819,6 +1816,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "HI" = ( @@ -1926,9 +1924,6 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) "IG" = ( -/obj/effect/landmark/start{ - name = "Explorer" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -2444,19 +2439,15 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start{ - name = "Chief Medical Officer" - }, /obj/machinery/button/windowtint{ id = "cmo_office"; pixel_y = -28 }, +/obj/effect/landmark/start/cmo, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) "Tk" = ( -/obj/effect/landmark/start{ - name = "Pilot" - }, +/obj/effect/landmark/start/pilot, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) "Ts" = ( @@ -2647,6 +2638,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/effect/landmark/start/explorer, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "WF" = ( @@ -2709,6 +2701,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/fieldmedic, /turf/simulated/floor/tiled, /area/groundbase/exploration/equipment) "YK" = ( @@ -2748,6 +2741,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start/paramedic, /turf/simulated/floor/tiled/virgo3c, /area/groundbase/medical/patio) "Zn" = ( @@ -6964,7 +6958,7 @@ qO qO aa NX -qA +KG IC Pf FV @@ -14209,7 +14203,7 @@ yU Lf Lf Lf -Lf +qA Lf Lf Lf diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellardelight/ship_misc.dmm index fcdabbf9a1..c4d31e03d1 100644 --- a/maps/stellardelight/ship_misc.dmm +++ b/maps/stellardelight/ship_misc.dmm @@ -2916,6 +2916,9 @@ icon_state = "white" }, /area/holodeck/source_patient_ward) +"Ly" = ( +/turf/simulated/floor/flesh, +/area/holodeck/the_uwu_zone) "Me" = ( /turf/simulated/floor/smole/desert, /area/holodeck/source_smoleworld) @@ -2968,9 +2971,9 @@ }, /area/holodeck/source_gym) "PL" = ( -/turf/space, /turf/simulated/floor/holofloor/reinforced, -/area/space) +/turf/simulated/floor/flesh, +/area/holodeck/the_uwu_zone) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -16812,16 +16815,16 @@ fz fz fS dB -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly PL -fZ -fZ -fZ +Ly +Ly +Ly PL -fZ +Ly xp ap ap @@ -16954,16 +16957,16 @@ ei ei fJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17096,16 +17099,16 @@ fJ fz fS dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17238,16 +17241,16 @@ fJ ei fT dB -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly PL -fZ -fZ -fZ +Ly +Ly +Ly PL -fZ +Ly xp ap ap @@ -17380,16 +17383,16 @@ fJ fA fU dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17522,16 +17525,16 @@ ei ei fJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17664,16 +17667,16 @@ fA fA fU dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17806,16 +17809,16 @@ bh aG aG dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -17948,16 +17951,16 @@ dJ dK dK dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -18090,16 +18093,16 @@ dJ dJ dJ dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 60ca592b50..1815fed268 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -572,9 +572,8 @@ /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) "bN" = ( -/obj/effect/landmark/ai_multicam_room, -/turf/unsimulated/ai_visible, -/area/ai_multicam_room) +/turf/simulated/floor/flesh, +/area/holodeck/the_uwu_zone) "bQ" = ( /turf/space/internal_edge/left, /area/space) @@ -1678,6 +1677,14 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fw" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "fz" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1885,6 +1892,11 @@ /obj/structure/flora/tree/pine, /turf/simulated/floor/holofloor/snow, /area/holodeck/holodorm/source_snow) +"gp" = ( +/obj/structure/fitness/weightlifter, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "gq" = ( /obj/structure/bed/holobed, /turf/simulated/floor/holofloor/wood, @@ -1906,6 +1918,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"gD" = ( +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "gN" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -1937,6 +1952,18 @@ /obj/effect/floor_decal/industrial/danger, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"gZ" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "hg" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/landmark{ @@ -1944,6 +1971,19 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/holodorm/source_garden) +"ho" = ( +/obj/structure/table/holotable, +/obj/item/device/flashlight/lamp/green, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "hx" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/holodorm/source_seating) @@ -2115,9 +2155,29 @@ }, /turf/space/transit/west, /area/space) +"iZ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "jf" = ( /turf/space/transit/north, /area/space) +"jA" = ( +/obj/effect/landmark/ai_multicam_room, +/turf/unsimulated/ai_visible, +/area/ai_multicam_room) +"jI" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "jQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2131,6 +2191,14 @@ /obj/effect/floor_decal/sign/small_5, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"kW" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "lf" = ( /obj/effect/floor_decal/transit/orange{ dir = 8 @@ -2147,6 +2215,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"lh" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d12, +/obj/item/weapon/dice/d10, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "lu" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2163,6 +2237,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"lA" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/gladiator, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "lW" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2176,6 +2255,11 @@ }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"lX" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/fakewizard, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "mb" = ( /obj/effect/shuttle_landmark{ landmark_tag = "escape_transit"; @@ -2199,10 +2283,43 @@ }, /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) +"mG" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "nj" = ( /obj/item/toy/chess/rook_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"no" = ( +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"nu" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) +"nI" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "nV" = ( /obj/item/toy/chess/rook_black, /turf/simulated/floor/holofloor/wmarble, @@ -2288,18 +2405,55 @@ /obj/effect/floor_decal/sign/small_h, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"qS" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "qV" = ( /obj/effect/floor_decal/sign/small_6, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"rc" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "ru" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"rV" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "sb" = ( /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"sf" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/chicken, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"sk" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/pirate, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "sp" = ( /obj/effect/step_trigger/lost_in_space/tram, /obj/effect/floor_decal/transit/orange{ @@ -2318,6 +2472,14 @@ /obj/effect/overmap/bluespace_rift, /turf/unsimulated/map, /area/overmap) +"ty" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "tD" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2351,10 +2513,20 @@ /obj/effect/floor_decal/sign/small_a, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"vY" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice, +/obj/item/weapon/dice/d4, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "wa" = ( /obj/effect/floor_decal/sign/small_3, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"wc" = ( +/obj/machinery/fitness/punching_bag/clown, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "wh" = ( /obj/item/toy/chess/knight_black, /turf/simulated/floor/holofloor/bmarble, @@ -2364,6 +2536,10 @@ icon_state = "sandwater" }, /area/beach) +"xc" = ( +/obj/machinery/scale, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "ya" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2379,6 +2555,32 @@ icon = 'icons/turf/transit_vr.dmi' }, /area/space) +"yr" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"yJ" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"yW" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/cutewitch, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "zb" = ( /obj/effect/step_trigger/thrower{ direction = 1; @@ -2387,6 +2589,18 @@ }, /turf/space/transit/east, /area/space) +"zn" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Av" = ( /obj/effect/transit/light{ dir = 8 @@ -2405,6 +2619,14 @@ "Az" = ( /turf/unsimulated/beach/coastline, /area/beach) +"Ba" = ( +/turf/simulated/floor/holofloor/reinforced, +/area/holodeck/the_uwu_zone) +"Bi" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/madscientist, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "Bm" = ( /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/bmarble, @@ -2439,10 +2661,23 @@ /obj/item/weapon/reagent_containers/food/snacks/chips, /turf/unsimulated/beach/sand, /area/beach) +"DJ" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "DL" = ( /obj/effect/floor_decal/sign/small_b, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Ej" = ( +/obj/structure/table/woodentable/holotable, +/turf/space, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "El" = ( /turf/space/transit/west, /area/space) @@ -2458,6 +2693,11 @@ /obj/structure/table/standard, /turf/unsimulated/beach/sand, /area/beach) +"Fk" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "Fp" = ( /obj/effect/transit/light{ dir = 4 @@ -2478,6 +2718,10 @@ }, /turf/unsimulated/beach/sand, /area/beach) +"FQ" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "FT" = ( /turf/simulated/floor/tiled/techfloor/grid/transit, /area/space) @@ -2492,6 +2736,24 @@ /obj/effect/overlay/palmtree_l, /turf/unsimulated/beach/sand, /area/beach) +"Gx" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"Gy" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "GW" = ( /obj/item/toy/chess/king_white, /turf/simulated/floor/holofloor/bmarble, @@ -2523,6 +2785,16 @@ /obj/effect/floor_decal/sign/small_1, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"HU" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"HX" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/elpresidente, +/turf/space, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "Ik" = ( /obj/structure/table/standard, /obj/item/weapon/reagent_containers/food/drinks/cans/cola, @@ -2542,6 +2814,20 @@ }, /turf/space/transit/north, /area/space) +"IF" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"IM" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "IR" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2555,6 +2841,13 @@ /obj/item/toy/chess/bishop_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"Jw" = ( +/obj/structure/bed/chair/holochair, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "Jz" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -2588,6 +2881,17 @@ opacity = 1 }, /area/beach) +"Ka" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Kj" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -2637,6 +2941,34 @@ opacity = 1 }, /area/beach) +"NF" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"NH" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) +"NO" = ( +/obj/effect/floor_decal/corner/paleblue/full, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"NZ" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d100, +/obj/item/weapon/dice/d20, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "Oj" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -2650,6 +2982,18 @@ /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"OL" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"OS" = ( +/obj/structure/fitness/punchingbag, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "OY" = ( /turf/unsimulated/map, /area/overmap) @@ -2663,6 +3007,13 @@ }, /turf/space/transit/west, /area/space) +"Pr" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"Px" = ( +/turf/space, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -2670,6 +3021,31 @@ /obj/item/toy/chess/queen_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"QU" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"RL" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"RT" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "RV" = ( /obj/effect/step_trigger/teleporter/random{ affect_ghosts = 1; @@ -2824,6 +3200,17 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm4) +"SX" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "SZ" = ( /obj/machinery/recharge_station, /turf/simulated/shuttle/floor/alienplating, @@ -2906,6 +3293,11 @@ /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, /area/beach) +"Tv" = ( +/obj/machinery/fitness/heavy/lifter, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "Tx" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/shuttle/floor/alien, @@ -3218,6 +3610,17 @@ /obj/structure/prop/alien/power, /turf/simulated/shuttle/floor/alienplating, /area/unknown/dorm1) +"Vf" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Vy" = ( /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) @@ -3240,13 +3643,37 @@ /obj/effect/overlay/coconut, /turf/unsimulated/beach/sand, /area/beach) +"Xc" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "Xl" = ( /turf/unsimulated/map/edge, /area/overmap) +"Xn" = ( +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "Xp" = ( /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/centcom/simulated/main_hall) +"Xs" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d8, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "XO" = ( /obj/structure/signpost, /turf/unsimulated/beach/sand, @@ -3255,6 +3682,33 @@ /obj/structure/closet, /turf/unsimulated/beach/sand, /area/beach) +"Yi" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/space, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"YI" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"YT" = ( +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "YX" = ( /obj/effect/floor_decal/sign/small_e, /turf/simulated/floor/holofloor/wood, @@ -10530,25 +10984,25 @@ aI aI aI ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd ap ap ap @@ -10672,25 +11126,25 @@ Me Me Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +cd +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +cd ap ap ap @@ -10814,25 +11268,25 @@ Me Me Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +cd +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +cd ap ap ap @@ -10956,25 +11410,25 @@ PM Me Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +cd +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +cd ap ap ap @@ -11098,25 +11552,25 @@ PM Me Me fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +cd +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +cd ap ap ap @@ -11241,23 +11695,23 @@ Me Me fZ cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci cd ap ap @@ -11817,7 +12271,7 @@ ci ci ci ci -ci +jA ci ci ci @@ -12527,7 +12981,7 @@ ci ci ci ci -bN +ci ci ci ci @@ -13087,23 +13541,23 @@ ec dF fZ cd -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd +cd cd ap ap @@ -13228,25 +13682,25 @@ dF dF dF fZ -cd -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -cd +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -13370,25 +13824,25 @@ dF dF dF fZ -cd -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -cd +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -13512,25 +13966,25 @@ dF dF dF fZ -cd -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -cd +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -13654,25 +14108,25 @@ aL aL aL ar -cd -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -cd +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -13795,26 +14249,26 @@ dG fG dG dG +dB +bN +bN +bN +bN +Ba +bN +bN +bN +Ba +bN fZ -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd -cd +ap +ap +ap +ap +ap +ap +ap +ap ap ap ap @@ -13937,6 +14391,17 @@ dG dG eT dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -13984,17 +14449,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14079,6 +14533,17 @@ dG dG dG dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14126,17 +14591,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14221,6 +14675,17 @@ dG dG eJ dG +dB +bN +bN +bN +bN +Ba +bN +bN +bN +Ba +bN fZ ap ap @@ -14268,17 +14733,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14363,6 +14817,17 @@ ed dG dG fG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14410,17 +14875,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14505,6 +14959,17 @@ dG fG dG dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14552,17 +15017,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14647,6 +15101,17 @@ eJ dG eT dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14694,17 +15159,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14789,6 +15243,17 @@ dG dG dG dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14836,17 +15301,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -14931,6 +15385,17 @@ dG dG eJ dG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -14978,17 +15443,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -15073,6 +15527,17 @@ ed dG dG fG +dB +bN +bN +bN +bN +bN +bN +bN +bN +bN +bN fZ ap ap @@ -15120,17 +15585,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -15216,17 +15670,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -15357,6 +15811,17 @@ eL eL eL eL +dB +yJ +rV +rc +rV +rc +rV +rV +rV +rV +NO fZ ap ap @@ -15404,17 +15869,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -15499,6 +15953,17 @@ eK eK eK eK +dB +RL +no +no +no +no +no +no +no +no +kW fZ ap ap @@ -15546,17 +16011,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap Jz jf jf @@ -15641,6 +16095,17 @@ fn fn fO eK +dB +Vf +no +IF +no +IF +no +no +mG +no +kW fZ ap ap @@ -15688,17 +16153,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap dD dD dD @@ -15783,6 +16237,17 @@ fo fo fP eK +dB +RL +no +no +no +no +no +no +mG +OL +kW fZ ap ap @@ -15854,17 +16319,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap iO El El @@ -15925,6 +16379,17 @@ fo fo fP eK +dB +Ka +no +no +no +zn +no +no +ho +mG +zn fZ ap ap @@ -15972,17 +16437,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce ce ce @@ -16067,6 +16521,17 @@ fo fo fP eK +dB +mG +no +no +no +zn +no +no +no +NF +kW fZ ap ap @@ -16114,17 +16579,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -16209,6 +16663,17 @@ fo fo fP eK +dB +RL +no +no +no +no +no +no +no +no +kW fZ ap ap @@ -16256,17 +16721,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -16351,6 +16805,17 @@ fo fo fP eK +dB +Vf +no +IF +no +IF +no +no +no +no +kW fZ ap ap @@ -16398,17 +16863,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -16493,6 +16947,17 @@ fp fH fQ eK +dB +RL +no +no +no +no +no +no +no +no +kW fZ ap ap @@ -16540,17 +17005,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -16635,6 +17089,17 @@ eK eK eK eK +dB +SX +ty +Gy +ty +Gy +ty +ty +ty +ty +DJ fZ ap ap @@ -16682,17 +17147,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -16778,17 +17232,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -16919,22 +17373,22 @@ fz fz fz fS +dB +Xs +vY +HU +Pr +Ej +HU +Pr +lX +HX +yW fZ ap ap ap ap -VW -ap -ap -ap -VW -ap -ap -ap -ap -ap -ap ap ap ap @@ -17061,6 +17515,17 @@ ei ei ei fJ +dB +lh +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +sf fZ ap ap @@ -17108,17 +17573,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -17203,6 +17657,17 @@ ei fJ fz fS +dB +NZ +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Bi fZ ap ap @@ -17250,17 +17715,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -17345,22 +17799,22 @@ ei fJ ei fT +dB +Pr +Pr +gZ +QU +Yi +QU +QU +yr +Px +lA fZ ap ap ap ap -VW -ap -ap -ap -VW -ap -ap -ap -ap -ap -ap ap ap ap @@ -17487,6 +17941,17 @@ ei fJ fA fU +dB +Pr +Pr +Jw +FQ +FQ +FQ +FQ +Gx +Pr +sk fZ ap ap @@ -17534,17 +17999,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -17629,6 +18083,17 @@ ei ei ei fJ +dB +Pr +Pr +Jw +FQ +FQ +FQ +FQ +Gx +Pr +Pr fZ ap ap @@ -17676,17 +18141,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -17771,6 +18225,17 @@ fA fA fA fU +dB +Pr +Pr +YI +Xc +Xc +Xc +Xc +Xn +Pr +Pr fZ ap ap @@ -17818,17 +18283,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -17913,6 +18367,17 @@ aG bh aG aG +dB +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr fZ ap ap @@ -17960,17 +18425,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18055,6 +18509,17 @@ dK dJ dK dK +dB +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr fZ ap ap @@ -18102,17 +18567,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18197,6 +18651,17 @@ dJ dJ dJ dJ +dB +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr +Pr fZ ap ap @@ -18244,17 +18709,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18340,17 +18794,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -18481,6 +18935,17 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD fZ ap ap @@ -18528,17 +18993,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18623,6 +19077,17 @@ dQ fK fR fR +dB +gD +Tv +gD +gp +gD +iZ +qS +qS +nu +gD fZ ap ap @@ -18670,17 +19135,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18765,6 +19219,17 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +fw +YT +YT +IM +gD fZ ap ap @@ -18812,17 +19277,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -18907,6 +19361,17 @@ dQ fK fR fR +dB +gD +Tv +gD +gp +gD +fw +YT +YT +IM +gD fZ ap ap @@ -18954,17 +19419,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ce cf cf @@ -19049,19 +19503,19 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +NH +jI +jI +RT +gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap VW ap ap @@ -19191,19 +19645,19 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +gD +gD +gD +gD +gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap VW ap ap @@ -19333,19 +19787,19 @@ dQ fK fR fR +dB +gD +OS +gD +wc +gD +gD +gD +gD +gD +gD fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap VW ap ap @@ -19475,19 +19929,19 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +gD +gD +gD +gD +xc fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap VW ap ap @@ -19617,19 +20071,19 @@ dQ fK fR fR +dB +gD +wc +gD +OS +gD +gD +gD +gD +gD +Fk fZ ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap VW ap ap @@ -19759,6 +20213,17 @@ dQ fK fR fR +dB +gD +gD +gD +gD +gD +gD +gD +gD +gD +nI fZ ap ap @@ -19806,17 +20271,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap oI qn qn @@ -19902,17 +20356,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap