diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 65c61fce9d6..9875ec035a0 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -106,7 +106,7 @@ /obj/effect/energy_net/New() ..() - START_PROCESSING(SSobj, src) + START_PROCESSING(SSobj, src) /obj/effect/energy_net/Destroy() if(has_buckled_mobs()) @@ -136,7 +136,7 @@ /obj/effect/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/user) user.setClickCooldown(user.get_attack_speed()) visible_message("[user] begins to tear at \the [src]!") - if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY))) + if(do_after(user, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY))) if(!has_buckled_mobs()) return visible_message("[user] manages to tear \the [src] apart!") diff --git a/code/modules/fishing/fishing_vr.dm b/code/modules/fishing/fishing_vr.dm index e545cc0edfb..69d43fc2a7f 100644 --- a/code/modules/fishing/fishing_vr.dm +++ b/code/modules/fishing/fishing_vr.dm @@ -34,6 +34,50 @@ GLOBAL_LIST_INIT(indoor_fishing_junk_list, list( junk_list = GLOB.indoor_fishing_junk_list fishing_loot = GLOB.indoor_fishing_chance_list +// Ocean fishing +GLOBAL_LIST_INIT(ocean_fishing_chance_list, list(FISHING_RARE = 5, FISHING_UNCOMMON = 20, FISHING_COMMON = 30, FISHING_JUNK = 40, FISHING_NOTHING = 5)) // the ocean is teeming with life... and junk +GLOBAL_LIST_INIT(ocean_fishing_rare_list, list( + /mob/living/simple_mob/animal/passive/fish/solarfish = 1, + /mob/living/simple_mob/animal/passive/fish/measelshark = 10 + )) + +GLOBAL_LIST_INIT(ocean_fishing_uncommon_list, list( + /mob/living/simple_mob/animal/passive/crab/sif = 1, + /obj/item/weapon/reagent_containers/food/snacks/sliceable/monkfish = 10 + )) + +GLOBAL_LIST_INIT(ocean_fishing_common_list, list( + /mob/living/simple_mob/animal/passive/fish/rockfish = 5, + /mob/living/simple_mob/animal/passive/crab = 1, + /obj/item/weapon/reagent_containers/food/snacks/cuttlefish = 10, + /obj/item/weapon/reagent_containers/food/snacks/lobster = 8 + )) + +/turf/simulated/floor/water/ocean + min_fishing_time = 30 + max_fishing_time = 90 + +/turf/simulated/floor/water/ocean/handle_fish() + if(has_fish) + rare_fish_list = GLOB.ocean_fishing_rare_list + uncommon_fish_list = GLOB.ocean_fishing_uncommon_list + common_fish_list = GLOB.ocean_fishing_common_list + junk_list = GLOB.generic_fishing_junk_list + fishing_loot = GLOB.ocean_fishing_chance_list + +/turf/simulated/floor/water/deep/ocean + min_fishing_time = 20 + max_fishing_time = 80 + +/turf/simulated/floor/water/deep/ocean/handle_fish() + if(has_fish) + rare_fish_list = GLOB.ocean_fishing_rare_list + uncommon_fish_list = GLOB.ocean_fishing_uncommon_list + common_fish_list = GLOB.ocean_fishing_common_list + junk_list = GLOB.generic_fishing_junk_list + fishing_loot = GLOB.ocean_fishing_chance_list + + #undef FISHING_RARE #undef FISHING_UNCOMMON diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 91b769696d2..6d72e3cebf7 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -384,6 +384,77 @@ bitesize = 0.01 //impossible to eat reagents.add_reagent("carbon", 5) +/obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk + name = "chunk of shark meat" + desc = "still rough, needs to be cut into even smaller chunks." + icon = 'icons/obj/food_vr.dmi' + icon_state = "sharkmeat_chunk" + nutriment_amt = 15 + w_class = ITEMSIZE_LARGE + slice_path = /obj/item/weapon/reagent_containers/food/snacks/sharkmeat + slices_num = 5 + +/obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk/Initialize() + ..() + bitesize = 3 + reagents.add_reagent("protein", 20) + +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + name = "a slice of sharkmeat" + desc = "now it's small enough to cook with." + icon = 'icons/obj/food_vr.dmi' + icon_state = "sharkmeat" + nutriment_amt = 2 + toxin_amount = null + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeat/Initialize() + ..() + bitesize = 3 + reagents.add_reagent("protein", 2) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked + name = "shark steak" + desc = "finally, some food for real men." + icon = 'icons/obj/food_vr.dmi' + icon_state = "sharkmeat_cooked" + nutriment_amt = 5 + trash = /obj/item/trash/plate + nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked/Initialize() + ..() + bitesize = 3 + reagents.add_reagent("protein", 8) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip + name = "hot shark shank" + desc = "a shank of shark meat dipped in hot sauce." + icon = 'icons/obj/food_vr.dmi' + icon_state = "sharkmeat_dip" + nutriment_amt = 5 + trash = /obj/item/trash/snack_bowl + nutriment_desc = list("salt" = 1, "fish oil" = 2, "spicy shark" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip/Initialize() + ..() + bitesize = 3 + reagents.add_reagent("capsaicin", 4) + reagents.add_reagent("protein", 4) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes + name = "shark cubes" + desc = "foul scented fermented shark cubes, it's said to make men fly, or just make them really fat." + icon = 'icons/obj/food_vr.dmi' + icon_state = "sharkmeat_cubes" + nutriment_amt = 8 + trash = /obj/item/trash/plate + nutriment_desc = list("viking spirit" = 1, "rot" = 2, "fermented sauce" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes/Initialize() + ..() + bitesize = 10 + reagents.add_reagent("potatojuice", 30) // for people who want to get fat, FAST. + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index 3cc33a96bec..09c63ae3928 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -173,6 +173,29 @@ ) result = /obj/item/weapon/reagent_containers/food/snacks/monkfishcooked +/datum/recipe/sharksteak + reagents = list("blackpepper"= 1, "sodiumchloride" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcooked + +/datum/recipe/sharkdip + reagents = list("sodiumchloride" = 1) + fruit = list("chili" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatdip + +/datum/recipe/sharkcubes + reagents = list("soysauce" = 5, "sodiumchloride" = 1) + fruit = list("potato" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sharkmeat + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sharkmeatcubes + /datum/recipe/margheritapizzacargo reagents = list() items = list( diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6b218c6e5f3..14a56c8ad3e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -290,7 +290,7 @@ /mob/living/carbon/can_use_hands() if(handcuffed) return 0 - if(buckled && ! istype(buckled, /obj/structure/bed/chair)) // buckling does not restrict hands + if(buckled && istype(buckled, /obj/structure/bed/nest)) // buckling does not restrict hands return 0 return 1 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index ff04da63e0d..55daf15aa4d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1112,10 +1112,11 @@ default behaviour is: pixel_y = V.mob_offset_y else if(buckled) anchored = 1 - canmove = 0 + canmove = 1 //The line above already makes the chair not swooce away if the sitter presses a button. No need to incapacitate them as a criminally large amount of mechanics read this var as a type of stun. if(istype(buckled)) if(buckled.buckle_lying != -1) lying = buckled.buckle_lying + canmove = buckled.buckle_movable if(buckled.buckle_movable) anchored = 0 canmove = 1 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 186decf67ed..c1cef3831ae 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -57,4 +57,19 @@ return 0 M.reagents.add_reagent("toxin", 2) M.reagents.add_reagent("impedrezene", 1) - return 1 \ No newline at end of file + return 1 + +/mob/living/simple_mob/animal/passive/fish/measelshark + name = "Measel Shark" + tt_desc = "Spot Pistris" + desc = "An evil measel shark that refuses to get vaccinated, causing other fish to get fish measels." + icon = 'icons/mob/shark.dmi' + icon_state = "measelshark" + icon_living = "measelshark" + icon_dead = "measelshark-dead" + meat_amount = 6 //Big fish, tons of meat. Great for feasts. + meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk + vore_bump_chance = 100 + vore_default_mode = DM_HOLD //docile shark + vore_capacity = 5 + pixel_x = -50 \ No newline at end of file diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index add0d03d22f..3feabab1e7b 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -118,6 +118,37 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins SSnanoui.update_uis(src) +/obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle)) + if(!copyitem) + user.drop_item() + copyitem = O + O.loc = src + to_chat(user, "You insert \the [O] into \the [src].") + playsound(loc, "sound/machines/click.ogg", 100, 1) + flick(insert_anim, src) + else + to_chat(user, "There is already something in \the [src].") + else if(istype(O, /obj/item/device/multitool) && panel_open) + var/input = sanitize(input(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department)) + if(!input) + to_chat(usr, "No input found. Please hang up and try your call again.") + return + department = input + if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) && !(department == "Unknown")) + alldepartments |= department + else if(O.is_wrench()) + playsound(loc, O.usesound, 50, 1) + anchored = !anchored + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + + else if(default_deconstruction_screwdriver(user, O)) + return + else if(default_deconstruction_crowbar(user, O)) + return + + return + /obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination) if(stat & (BROKEN|NOPOWER)) return diff --git a/icons/mob/shark.dmi b/icons/mob/shark.dmi new file mode 100644 index 00000000000..16a3f335806 Binary files /dev/null and b/icons/mob/shark.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index ea92af44933..f4b35ebb2ce 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm index a3cc7e4e68b..5c73d730aa9 100644 --- a/maps/tether/submaps/beach/beach.dmm +++ b/maps/tether/submaps/beach/beach.dmm @@ -35,17 +35,17 @@ /turf/simulated/floor/beach/sand, /area/tether_away/beach) "aj" = ( -/turf/simulated/floor/water/indoors, -/area/tether_away/beach/coast) +/turf/simulated/floor/water/ocean, +/area/tether_away/beach) "ak" = ( -/turf/simulated/floor/water/deep/indoors, -/area/tether_away/beach/water) +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/coast) "al" = ( /turf/simulated/floor/tiled/asteroid_steel, /area/tether_away/beach) "am" = ( -/turf/simulated/floor/water/indoors, -/area/tether_away/beach/jungle) +/turf/simulated/floor/water/deep/ocean, +/area/tether_away/beach/water) "an" = ( /obj/effect/overlay/palmtree_r, /turf/simulated/floor/beach/sand, @@ -286,8 +286,8 @@ /turf/simulated/floor/beach/sand, /area/tether_away/beach) "bf" = ( -/turf/simulated/floor/water/indoors, -/area/tether_away/beach) +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/water) "bg" = ( /turf/unsimulated/wall/planetary/normal, /area/tether_away/beach/coast) @@ -299,8 +299,8 @@ /turf/unsimulated/wall/planetary/normal, /area/tether_away/beach/water) "bj" = ( -/turf/simulated/floor/water/indoors, -/area/tether_away/beach/water) +/turf/simulated/floor/water/ocean, +/area/tether_away/beach/jungle) "bk" = ( /turf/simulated/floor/beach/sand, /area/tether_away/beach/water) @@ -310,6 +310,10 @@ "bm" = ( /turf/simulated/floor/beach/sand/desert, /area/shuttle/excursion/away_beach) +"bn" = ( +/mob/living/simple_mob/animal/passive/fish/measelshark, +/turf/simulated/floor/water/deep/ocean, +/area/tether_away/beach/water) "bp" = ( /turf/simulated/floor/beach/sand, /area/tether_away/beach/jungle) @@ -592,34 +596,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (3,1,1) = {" @@ -734,34 +738,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (4,1,1) = {" @@ -876,34 +880,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (5,1,1) = {" @@ -1018,34 +1022,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am am -ak -ak -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +am +bj +bj +bj +bj +bj +am +am +am +am +am bi "} (6,1,1) = {" @@ -1160,34 +1164,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bj bp bp bp +bj +bj +am +am am am -ak -ak -ak -ak bi "} (7,1,1) = {" @@ -1302,34 +1306,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am -bp -bp -bp -bp -bp am -ak -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +am +bj +bj +bp +bp +bp +bp +bp +bj +am +am +am +am bi "} (8,1,1) = {" @@ -1444,34 +1448,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj bp bp bp bp ap bp +bj +bj +am am am -ak -ak -ak bi "} (9,1,1) = {" @@ -1586,34 +1590,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am -bp -bp -bp -bp -bp -bp -bp am -ak -ak -ak +am +am +am +am +am +am +am +am +am +am +bj +bj +bp +bp +bp +bp +bp +bp +bp +bj +am +am +am bi "} (10,1,1) = {" @@ -1728,22 +1732,22 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am +am +am +am +am +am +am +am +am +am +am +am +am +bj bp bp ap @@ -1752,10 +1756,10 @@ bp bp bp bp +bj +bj am am -ak -ak bi "} (11,1,1) = {" @@ -1870,22 +1874,22 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am +am +am +am +am +am +am +am +am +am +am +bj +bj bp bp bp @@ -1895,9 +1899,9 @@ bp bp ap bp +bj +am am -ak -ak bi "} (12,1,1) = {" @@ -2012,34 +2016,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am -bp -ad -ad -ad -ad -ad -ad -ad -bp -bp am -ak -ak +am +am +am +am +am +am +am +am +am +am +bj +bp +ad +ad +ad +ad +ad +ad +ad +bp +bp +bj +bn +am bi "} (13,1,1) = {" @@ -2154,21 +2158,21 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am +am +am +am +am +am +am +am +am +am +am +am +bj bp ad aq @@ -2179,9 +2183,9 @@ aw ad bp bp +bj +am am -ak -ak bi "} (14,1,1) = {" @@ -2296,21 +2300,21 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am +am +am +am +am +am +am +am +am +am +bj +bj bp ad aq @@ -2321,9 +2325,9 @@ aw ad bp bp +bj +am am -ak -ak bi "} (15,1,1) = {" @@ -2438,20 +2442,20 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am +am +am +am +am +am +am +am +am +am +am +bj bp bp ad @@ -2463,9 +2467,9 @@ aw ad bp bp +bj +am am -ak -ak bi "} (16,1,1) = {" @@ -2580,20 +2584,20 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am +am +am +am +am +am +am +am +am +am +am +bj bp ap ad @@ -2605,9 +2609,9 @@ aw ad bp bp +bj +am am -ak -ak bi "} (17,1,1) = {" @@ -2722,21 +2726,21 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am +am +am +am +am +am +am +am +am +am +bj +bj bp ad ad @@ -2747,9 +2751,9 @@ ad ad bp bp +bj +am am -ak -ak bi "} (18,1,1) = {" @@ -2864,22 +2868,22 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am +am +am +am +am +am +am +am +am +am +am +bj +bj bp bp bp @@ -2888,10 +2892,10 @@ bp bp ap bp +bj +bj am am -ak -ak bi "} (19,1,1) = {" @@ -3006,34 +3010,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am am +am +am +am +am +am +am +am +bj +bj +bj +bj +bj bp bp bp bp bp +bj +am +am am -ak -ak -ak bi "} (20,1,1) = {" @@ -3148,34 +3152,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am am am +am +am +am +am +am +am +bj +bj +bj +bj +bj +bj bp bp bp +bj +bj +am am am -ak -ak -ak bi "} (21,1,1) = {" @@ -3290,34 +3294,34 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am am am +am +am +am +am +am +am +am +bj +bj +bj +bj +bj +bj bp bp +bj +am +am +am am -ak -ak -ak -ak bi "} (22,1,1) = {" @@ -3432,22 +3436,8 @@ aa aa aa ad -bf aj ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am @@ -3456,10 +3446,24 @@ am am am am -ak -ak -ak -ak +am +am +am +am +am +am +bj +bj +bj +bj +bj +bj +bj +bj +am +am +am +am bi "} (23,1,1) = {" @@ -3574,34 +3578,34 @@ aa aa aa ad -bf aj +ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bj +bj +bj +bj +bj bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am -am -am -am -ak -ak -ak -ak bi "} (24,1,1) = {" @@ -3716,34 +3720,34 @@ aa aa aa ad -bf aj +ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bj +bj +bj +bj +bj bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am -am -am -am -ak -ak -ak -ak bi "} (25,1,1) = {" @@ -3858,34 +3862,34 @@ aa aa aa ad -bf aj +ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bj +bj bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -am -am -am -am bp +bj +bj +am am am -ak -ak -ak bi "} (26,1,1) = {" @@ -4000,34 +4004,34 @@ aa aa aa ad -bf aj +ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bp +bp +bp +bp bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am -bp -bp -bp -bp am -ak -ak -ak +am bi "} (27,1,1) = {" @@ -4142,34 +4146,34 @@ aa aa aa ad -bf aj +ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bj bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -am -am bp bp +bj +bj +am am am -ak -ak -ak bi "} (28,1,1) = {" @@ -4284,34 +4288,34 @@ aa aa aa ad -bf aj +ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +bj +bj bj bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak am am am am -ak -ak -ak -ak bi "} (29,1,1) = {" @@ -4426,34 +4430,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (30,1,1) = {" @@ -4568,34 +4572,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (31,1,1) = {" @@ -4710,34 +4714,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (32,1,1) = {" @@ -4852,34 +4856,34 @@ aa aa aa bb -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (33,1,1) = {" @@ -4994,34 +4998,34 @@ aa aa aa bc -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (34,1,1) = {" @@ -5136,34 +5140,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (35,1,1) = {" @@ -5278,34 +5282,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (36,1,1) = {" @@ -5420,34 +5424,34 @@ aa aa aa bb -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (37,1,1) = {" @@ -5562,34 +5566,34 @@ aa aa aa bc -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (38,1,1) = {" @@ -5704,34 +5708,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (39,1,1) = {" @@ -5846,34 +5850,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (40,1,1) = {" @@ -5988,34 +5992,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (41,1,1) = {" @@ -6130,34 +6134,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (42,1,1) = {" @@ -6272,34 +6276,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (43,1,1) = {" @@ -6414,34 +6418,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (44,1,1) = {" @@ -6556,34 +6560,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (45,1,1) = {" @@ -6698,34 +6702,34 @@ aa aa aa bb -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (46,1,1) = {" @@ -6840,34 +6844,34 @@ aa aa aa bc -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (47,1,1) = {" @@ -6982,34 +6986,34 @@ aa aa aa bb -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (48,1,1) = {" @@ -7124,34 +7128,34 @@ aa aa aa bc -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (49,1,1) = {" @@ -7266,34 +7270,34 @@ aa aa aa bd -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (50,1,1) = {" @@ -7408,34 +7412,34 @@ aa aa ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (51,1,1) = {" @@ -7550,34 +7554,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (52,1,1) = {" @@ -7692,34 +7696,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (53,1,1) = {" @@ -7834,34 +7838,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (54,1,1) = {" @@ -7976,34 +7980,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (55,1,1) = {" @@ -8118,34 +8122,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (56,1,1) = {" @@ -8260,34 +8264,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (57,1,1) = {" @@ -8402,34 +8406,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (58,1,1) = {" @@ -8544,34 +8548,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (59,1,1) = {" @@ -8686,34 +8690,34 @@ ad ad ad bb -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (60,1,1) = {" @@ -8828,34 +8832,34 @@ ad ad ad bc -bf aj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (61,1,1) = {" @@ -8970,34 +8974,34 @@ ad ad ad bb -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (62,1,1) = {" @@ -9112,34 +9116,34 @@ ad ad ad bc -bf aj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (63,1,1) = {" @@ -9254,34 +9258,34 @@ ad ad ad bb -bf aj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (64,1,1) = {" @@ -9396,34 +9400,34 @@ ad ad ad bc -bf aj -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (65,1,1) = {" @@ -9538,34 +9542,34 @@ ad ad ad bb -bf aj -bj -bj -bj -bj -bj -bj -ak -bj -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +bf +am +bf +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (66,1,1) = {" @@ -9680,34 +9684,34 @@ ad ad ad bc -bf aj -bj -bj -bj -bj -bj -bj -ak -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +bf +am +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (67,1,1) = {" @@ -9822,34 +9826,34 @@ ad UZ ad bb -bf aj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (68,1,1) = {" @@ -9964,34 +9968,34 @@ ad ad ad bc -bf aj -bj -bj -bj -ak -bj -bj -bj -bj -bj -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +bf +bf +bf +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (69,1,1) = {" @@ -10106,34 +10110,34 @@ ad ad ad bb -bf aj -bj -bj -bj -ak -bj -bj -bj -ak -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +bf +am +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (70,1,1) = {" @@ -10248,34 +10252,34 @@ ad ad ad bc -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (71,1,1) = {" @@ -10390,34 +10394,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (72,1,1) = {" @@ -10532,34 +10536,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -bj -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (73,1,1) = {" @@ -10674,34 +10678,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -bj -ak -bj -ak -ak -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +bf +am +am +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (74,1,1) = {" @@ -10816,34 +10820,34 @@ ad ad ai ad -bf aj -bj -bj -bj -ak -ak -bj -ak -bj -ak -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +bf +am +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (75,1,1) = {" @@ -10958,34 +10962,34 @@ ad ad aZ ad -bf aj -bj -bj -bj -ak -ak -bj -ak -bj -ak -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +bf +am +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (76,1,1) = {" @@ -11100,34 +11104,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -ak -ak -ak -bj -ak -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +am +am +bf +am +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (77,1,1) = {" @@ -11242,34 +11246,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -bj -ak -ak -bj -ak -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +am +am +bf +am +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (78,1,1) = {" @@ -11384,34 +11388,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -bj -ak -ak -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +am +am +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +bn +am +am +am +am +am +am bi "} (79,1,1) = {" @@ -11526,34 +11530,34 @@ ad ad ad ad -bf aj -bj -bj -bj -ak -bj -bj -ak -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (80,1,1) = {" @@ -11668,34 +11672,34 @@ ad ad ad bb -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (81,1,1) = {" @@ -11810,34 +11814,34 @@ ad ad ad bc -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -ak -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +am +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (82,1,1) = {" @@ -11952,34 +11956,34 @@ aa ad ad bb -bf aj -bj -bj -bj -ak -bj -bj -bj -ak -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +bf +am +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (83,1,1) = {" @@ -12094,34 +12098,34 @@ aa ad ad bc -bf aj -bj -bj -ak -ak -ak -bj -bj -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +bf +bf +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (84,1,1) = {" @@ -12236,34 +12240,34 @@ aa ad ad ad -bf aj -bj -bj -ak -ak -ak -bj -ak -bj -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +bf +am +bf +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (85,1,1) = {" @@ -12378,34 +12382,34 @@ aa aa ad ad -bf aj -bj -bj -ak -bj -ak -bj -ak -ak -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +bf +am +am +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (86,1,1) = {" @@ -12520,34 +12524,34 @@ aa aa ad ad -bf aj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +am +am +bf +am +am +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (87,1,1) = {" @@ -12662,34 +12666,34 @@ aa aa ad ad -bf aj -bj -ak -ak -bj -ak -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +am +am +bf +am +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (88,1,1) = {" @@ -12804,34 +12808,34 @@ aa aa ad ad -bf aj -bj -bj -ak -bj -ak -bj -ak -bj -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +bf +am +bf +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (89,1,1) = {" @@ -12946,34 +12950,34 @@ aa aa ad ad -bf aj -bj -bj -ak -bj -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (90,1,1) = {" @@ -13088,34 +13092,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (91,1,1) = {" @@ -13230,34 +13234,34 @@ aa aa aa be -bf aj -bj -bj -bj -bj -ak -bj -bj -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +bf +bf +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (92,1,1) = {" @@ -13372,34 +13376,34 @@ aa aa aa ad -bf aj -bj -bj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (93,1,1) = {" @@ -13514,34 +13518,34 @@ aa aa aa bb -bf aj -bj -bj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (94,1,1) = {" @@ -13656,34 +13660,34 @@ aa aa aa bc -bf aj -bj -bj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (95,1,1) = {" @@ -13798,34 +13802,34 @@ aa aa aa bb -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (96,1,1) = {" @@ -13940,34 +13944,34 @@ aa aa aa bc -bf aj -bj -bj -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (97,1,1) = {" @@ -14082,34 +14086,34 @@ aa aa aa bb -bf aj -bj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (98,1,1) = {" @@ -14224,34 +14228,34 @@ aa aa aa bc -bf aj -bj -bj -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (99,1,1) = {" @@ -14366,34 +14370,34 @@ aa aa aa ad -bf aj -bj -bj -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (100,1,1) = {" @@ -14508,34 +14512,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (101,1,1) = {" @@ -14650,34 +14654,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (102,1,1) = {" @@ -14792,34 +14796,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (103,1,1) = {" @@ -14934,34 +14938,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (104,1,1) = {" @@ -15076,34 +15080,34 @@ aa aa aa ad -bf aj -bj -bj -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (105,1,1) = {" @@ -15218,34 +15222,34 @@ aa aa aa ad -bf aj -bj -bj -ak -bj -ak -ak -ak -ak -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +am +am +am +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (106,1,1) = {" @@ -15360,34 +15364,34 @@ aa aa aa ad -bf aj -bj -bj -ak -bj -ak -ak -ak -ak -ak -ak -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +am +am +am +am +am +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (107,1,1) = {" @@ -15502,34 +15506,34 @@ aa aa aa ad -bf aj -bj -bj -ak -bj -ak -ak -ak -ak -ak -bj -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +bf +am +am +am +am +am +bf +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (108,1,1) = {" @@ -15644,34 +15648,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj ak -ak -ak -ak -ak -bj -bj +bf +bf +bf +bf +am +am +am +am +am +bf +bf bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (109,1,1) = {" @@ -15786,34 +15790,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj ak -ak -ak -ak -bj -bj +bf +bf +bf +bf +am +am +am +am +bf +bf bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (110,1,1) = {" @@ -15928,34 +15932,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -ak -bj -bj +bf +bf +bf +am +am +am +am +am +bf +bf bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (111,1,1) = {" @@ -16070,34 +16074,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -ak -bj -bj +bf +bf +bf +am +am +am +am +am +bf +bf bk bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (112,1,1) = {" @@ -16212,34 +16216,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -bj -bj -bj +bf +bf +bf +am +am +am +bf +bf +bf bk bk bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (113,1,1) = {" @@ -16354,34 +16358,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj -bj +ak +bf +bf +bf +bf +bf +bf +bf +bf +bf bk bk bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (114,1,1) = {" @@ -16496,34 +16500,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj -bj +ak +bf +bf +bf +bf +bf +bf +bf +bf +bf bk bk bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (115,1,1) = {" @@ -16638,34 +16642,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj +ak +bf +bf +bf +bf +bf +bf +bf +bf bk bk bk bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (116,1,1) = {" @@ -16780,34 +16784,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj +ak +bf +bf +bf +bf +bf +bf +bf +bf bk bk bk bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (117,1,1) = {" @@ -16922,34 +16926,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj -bj -bj -bj -bj +ak +bf +bf +bf +bf +bf +bf +bf +bf bk bk bk bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (118,1,1) = {" @@ -17064,34 +17068,34 @@ aa aa aa ad -bf aj -bj -bj -bj -bj ak -ak -bj -bj -bj +bf +bf +bf +bf +am +am +bf +bf +bf bk bk bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (119,1,1) = {" @@ -17206,34 +17210,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -bj -bj +bf +bf +bf +am +am +am +am +bf +bf bk bk bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am bi "} (120,1,1) = {" @@ -17348,34 +17352,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -bj -bj -bj +bf +bf +bf +am +am +am +am +bf +bf +bf bk bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (121,1,1) = {" @@ -17490,34 +17494,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -ak -bj -bj +bf +bf +bf +am +am +am +am +am +bf +bf bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +bn +am +am +am +am +am +am bi "} (122,1,1) = {" @@ -17632,34 +17636,34 @@ aa aa aa ad -bf aj -bj -bj -bj ak -ak -ak -ak -ak -ak -bj +bf +bf +bf +am +am +am +am +am +am +bf bk bk -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am bi "} (123,1,1) = {" @@ -17774,34 +17778,34 @@ aa aa aa ad -bf aj -bj -bj ak -ak -ak -ak -ak -ak -ak -bj +bf +bf +am +am +am +am +am +am +am +bf bk bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (124,1,1) = {" @@ -17916,34 +17920,34 @@ aa aa aa ad -bf aj -bj -bj ak -ak -ak -ak -ak -ak -ak -bj -bj +bf +bf +am +am +am +am +am +am +am +bf +bf bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (125,1,1) = {" @@ -18058,34 +18062,34 @@ aa aa aa ad -bf aj -bj -bj ak -ak -ak -ak -ak -ak -ak -bj -bj +bf +bf +am +am +am +am +am +am +am +bf +bf bk -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (126,1,1) = {" @@ -18200,34 +18204,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -bj -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +bf +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (127,1,1) = {" @@ -18342,34 +18346,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -bj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +bf +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (128,1,1) = {" @@ -18484,34 +18488,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (129,1,1) = {" @@ -18626,34 +18630,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (130,1,1) = {" @@ -18768,34 +18772,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (131,1,1) = {" @@ -18910,34 +18914,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (132,1,1) = {" @@ -19052,34 +19056,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (133,1,1) = {" @@ -19194,34 +19198,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (134,1,1) = {" @@ -19336,34 +19340,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (135,1,1) = {" @@ -19478,34 +19482,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (136,1,1) = {" @@ -19620,34 +19624,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (137,1,1) = {" @@ -19762,34 +19766,34 @@ aa aa aa ad -bf aj -bj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (138,1,1) = {" @@ -19904,34 +19908,34 @@ aa aa aa ad -bf aj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (139,1,1) = {" @@ -20046,34 +20050,34 @@ aa aa aa ad -bf aj -bj -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak -ak ak +bf +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am +am bi "} (140,1,1) = {" diff --git a/maps/tether/submaps/gateway/carpfarm.dmm b/maps/tether/submaps/gateway/carpfarm.dmm index 167369911c8..0afbdefbf05 100644 --- a/maps/tether/submaps/gateway/carpfarm.dmm +++ b/maps/tether/submaps/gateway/carpfarm.dmm @@ -143,6 +143,7 @@ /obj/item/weapon/storage/toolbox/electrical, /obj/structure/cable, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 8; name = "west bump"; pixel_x = -24 diff --git a/maps/tether/submaps/gateway/snowfield.dmm b/maps/tether/submaps/gateway/snowfield.dmm index 43efd4d2a91..01870183500 100644 --- a/maps/tether/submaps/gateway/snowfield.dmm +++ b/maps/tether/submaps/gateway/snowfield.dmm @@ -131,6 +131,7 @@ /area/awaymission/snowfield/base) "ar" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 8; name = "west bump-derelict"; operating = 0; diff --git a/maps/tether/submaps/space/_debrisfield.dm b/maps/tether/submaps/space/_debrisfield.dm index 75be8e5fbcf..388cd6c0674 100644 --- a/maps/tether/submaps/space/_debrisfield.dm +++ b/maps/tether/submaps/space/_debrisfield.dm @@ -66,4 +66,20 @@ /area/tether_away/debrisfield/derelict icon_state = "debrisexplored" - forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') \ No newline at end of file + forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') + +//TFF 26/12/19 - Sub-areas for the APCs. +/area/tether_away/debrisfield/derelict/ai_access_port + name = "POI - Abandoned Derelict AI Acess Port" + +/area/tether_away/debrisfield/derelict/ai_access_starboard + name = "POI - Abandoned Derelict AI Access Starboard" + +/area/tether_away/debrisfield/derelict/ai_chamber + name = "POI - Abandoned Derelict AI Chamber" + +/area/tether_away/debrisfield/derelict/bridge + name = "POI - Abandoned Derelict Bridge" + +/area/tether_away/debrisfield/derelict/interior + name = "POI - Abandoned Derelict Interior" \ No newline at end of file diff --git a/maps/tether/submaps/space/pois/derelict.dmm b/maps/tether/submaps/space/pois/derelict.dmm index 628653a828d..3e4bc528359 100644 --- a/maps/tether/submaps/space/pois/derelict.dmm +++ b/maps/tether/submaps/space/pois/derelict.dmm @@ -13,7 +13,7 @@ }, /obj/structure/grille, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ac" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -22,7 +22,7 @@ /obj/structure/window/reinforced, /obj/structure/grille, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ad" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -33,7 +33,7 @@ }, /obj/structure/grille, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ae" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -45,23 +45,23 @@ }, /obj/structure/grille, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "af" = ( /obj/structure/prop/alien/computer/camera, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ag" = ( /obj/structure/prop/alien/computer, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ah" = ( /obj/structure/prop/alien/dispenser, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ai" = ( /obj/structure/prop/alien/computer/camera/flipped, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "aj" = ( /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ @@ -72,14 +72,14 @@ }, /obj/structure/grille, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ak" = ( /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "al" = ( /obj/tether_away_spawner/debrisfield/derelict, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "am" = ( /obj/structure/cable{ icon_state = "0-4" @@ -91,24 +91,27 @@ pixel_y = -24 }, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "an" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ao" = ( /turf/simulated/wall/r_wall, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "ap" = ( +/turf/simulated/wall/r_wall, +/area/tether_away/debrisfield/derelict/bridge) +"aq" = ( /obj/machinery/door/airlock/alien/locked, /turf/simulated/floor/tiled/techfloor, -/area/tether_away/debrisfield/derelict) -"aq" = ( -/turf/simulated/wall, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "ar" = ( +/turf/simulated/wall, +/area/tether_away/debrisfield/derelict/bridge) +"as" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -116,18 +119,21 @@ pixel_y = 0 }, /turf/simulated/wall, -/area/tether_away/debrisfield/derelict) -"as" = ( -/turf/simulated/floor/tiled/monotile, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/bridge) "at" = ( +/turf/simulated/floor/tiled/monotile, +/area/tether_away/debrisfield/derelict/interior) +"au" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/monotile, -/area/tether_away/debrisfield/derelict) -"au" = ( -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "av" = ( +/turf/simulated/wall, +/area/tether_away/debrisfield/derelict/interior) +"aw" = ( +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/debrisfield/derelict/interior) +"ax" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /obj/structure/cable{ d1 = 2; @@ -135,8 +141,8 @@ icon_state = "2-4" }, /turf/simulated/floor/bluegrid, -/area/tether_away/debrisfield/derelict) -"aw" = ( +/area/tether_away/debrisfield/derelict/interior) +"ay" = ( /obj/structure/prop/alien/power, /obj/structure/cable, /obj/structure/cable{ @@ -153,12 +159,12 @@ invisibility = 101 }, /turf/simulated/floor/bluegrid, -/area/tether_away/debrisfield/derelict) -"ax" = ( +/area/tether_away/debrisfield/derelict/interior) +"az" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/tiled/monotile, -/area/tether_away/debrisfield/derelict) -"ay" = ( +/area/tether_away/debrisfield/derelict/interior) +"aA" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -167,8 +173,8 @@ }, /obj/item/weapon/grenade/empgrenade, /turf/simulated/floor/bluegrid, -/area/tether_away/debrisfield/derelict) -"az" = ( +/area/tether_away/debrisfield/derelict/interior) +"aB" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /obj/structure/cable{ d1 = 1; @@ -177,8 +183,8 @@ pixel_y = 0 }, /turf/simulated/floor/bluegrid, -/area/tether_away/debrisfield/derelict) -"aA" = ( +/area/tether_away/debrisfield/derelict/interior) +"aC" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -186,29 +192,29 @@ pixel_y = 0 }, /turf/simulated/floor/bluegrid, -/area/tether_away/debrisfield/derelict) -"aB" = ( -/obj/machinery/door/airlock/alien, -/turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"aC" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "aD" = ( +/obj/machinery/door/airlock/alien, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "aE" = ( /obj/machinery/door/airlock/alien, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/interior) "aF" = ( +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/interior) +"aG" = ( +/obj/machinery/door/airlock/alien, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/debrisfield/derelict/interior) +"aH" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -216,26 +222,26 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"aG" = ( +/area/tether_away/debrisfield/derelict/interior) +"aI" = ( /turf/simulated/floor/tiled/monofloor, -/area/tether_away/debrisfield/derelict) -"aH" = ( +/area/tether_away/debrisfield/derelict/interior) +"aJ" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/monofloor, -/area/tether_away/debrisfield/derelict) -"aI" = ( -/obj/structure/old_roboprinter, -/turf/simulated/floor/tiled/monofloor, -/area/tether_away/debrisfield/derelict) -"aJ" = ( -/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, -/turf/simulated/floor/tiled/monofloor, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "aK" = ( /turf/space, /area/tether_away/debrisfield/derelict) "aL" = ( +/obj/structure/old_roboprinter, +/turf/simulated/floor/tiled/monofloor, +/area/tether_away/debrisfield/derelict/interior) +"aM" = ( +/obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, +/turf/simulated/floor/tiled/monofloor, +/area/tether_away/debrisfield/derelict/interior) +"aN" = ( /obj/random/humanoidremains, /obj/structure/cable{ d1 = 1; @@ -244,92 +250,92 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"aM" = ( +/area/tether_away/debrisfield/derelict/interior) +"aO" = ( /obj/machinery/porta_turret/alien{ faction = "derelict"; use_power = 0 }, /turf/space, -/area/tether_away/debrisfield/derelict) -"aN" = ( +/area/tether_away/debrisfield/derelict/interior) +"aP" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 8 }, /turf/space, -/area/tether_away/debrisfield/derelict) -"aO" = ( +/area/tether_away/debrisfield/derelict/interior) +"aQ" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 4 }, /turf/space, -/area/tether_away/debrisfield/derelict) -"aP" = ( +/area/tether_away/debrisfield/derelict/interior) +"aR" = ( /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"aQ" = ( +/area/tether_away/debrisfield/derelict/interior) +"aS" = ( /obj/effect/decal/mecha_wreckage/gygax/adv, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"aR" = ( +/area/tether_away/debrisfield/derelict/interior) +"aT" = ( /obj/effect/map_effect/interval/effect_emitter/sparks/frequent, /obj/effect/map_effect/interval/effect_emitter/smoke, /obj/machinery/door/airlock/alien, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"aS" = ( +/area/tether_away/debrisfield/derelict/interior) +"aU" = ( /obj/effect/map_effect/interval/effect_emitter/sparks/frequent, /obj/structure/door_assembly/door_assembly_alien, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"aT" = ( +/area/tether_away/debrisfield/derelict/interior) +"aV" = ( /obj/machinery/door/airlock/alien, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"aU" = ( +/area/tether_away/debrisfield/derelict/interior) +"aW" = ( /obj/random/tool/alien, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"aV" = ( +/area/tether_away/debrisfield/derelict/interior) +"aX" = ( /obj/random/energy, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"aW" = ( +/area/tether_away/debrisfield/derelict/interior) +"aY" = ( /obj/random/humanoidremains, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"aX" = ( +/area/tether_away/debrisfield/derelict/interior) +"aZ" = ( /mob/living/simple_mob/mechanical/infectionbot{ faction = "derelict" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"aY" = ( +/area/tether_away/debrisfield/derelict/interior) +"ba" = ( /obj/random/humanoidremains, /obj/item/weapon/gun/energy/ionrifle, /turf/simulated/floor/tiled/steel_ridged, -/area/tether_away/debrisfield/derelict) -"aZ" = ( +/area/tether_away/debrisfield/derelict/interior) +"bb" = ( /turf/simulated/floor/tiled/steel_ridged, -/area/tether_away/debrisfield/derelict) -"ba" = ( +/area/tether_away/debrisfield/derelict/interior) +"bc" = ( /obj/machinery/bomb_tester, /turf/simulated/floor/tiled/steel_ridged, -/area/tether_away/debrisfield/derelict) -"bb" = ( +/area/tether_away/debrisfield/derelict/interior) +"bd" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "burst_l"; dir = 1 }, /turf/space, -/area/tether_away/debrisfield/derelict) -"bc" = ( +/area/tether_away/debrisfield/derelict/interior) +"be" = ( /obj/structure/prop/alien/computer/camera, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bd" = ( +/area/tether_away/debrisfield/derelict/interior) +"bf" = ( /obj/structure/prop/alien/power, /obj/structure/cable{ d2 = 2; @@ -341,8 +347,8 @@ invisibility = 101 }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"be" = ( +/area/tether_away/debrisfield/derelict/interior) +"bg" = ( /obj/structure/prop/alien/power, /obj/structure/cable{ icon_state = "0-4" @@ -352,18 +358,18 @@ invisibility = 101 }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bf" = ( +/area/tether_away/debrisfield/derelict/interior) +"bh" = ( /obj/structure/prop/alien/computer/camera/flipped, /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bg" = ( +/area/tether_away/debrisfield/derelict/interior) +"bi" = ( /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bh" = ( +/area/tether_away/debrisfield/derelict/interior) +"bj" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -371,53 +377,62 @@ pixel_y = 0 }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bi" = ( +/area/tether_away/debrisfield/derelict/interior) +"bk" = ( /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bj" = ( +/area/tether_away/debrisfield/derelict/interior) +"bl" = ( /obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bk" = ( +/area/tether_away/debrisfield/derelict/interior) +"bm" = ( /obj/machinery/artifact, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"bl" = ( +/area/tether_away/debrisfield/derelict/interior) +"bn" = ( /mob/living/simple_mob/mechanical/infectionbot{ faction = "derelict" }, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bm" = ( +/area/tether_away/debrisfield/derelict/interior) +"bo" = ( /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bn" = ( +/area/tether_away/debrisfield/derelict/interior) +"bp" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bo" = ( +/area/tether_away/debrisfield/derelict/interior) +"bq" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bp" = ( +/area/tether_away/debrisfield/derelict/interior) +"br" = ( /obj/tether_away_spawner/debrisfield/derelict, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bq" = ( +/area/tether_away/debrisfield/derelict/interior) +"bs" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/wall, +/area/tether_away/debrisfield/derelict/interior) +"bt" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -431,61 +446,61 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"br" = ( +/area/tether_away/debrisfield/derelict/interior) +"bu" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bs" = ( +/area/tether_away/debrisfield/derelict/interior) +"bv" = ( /obj/tether_away_spawner/debrisfield/derelict/mech_wizard, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bt" = ( +/area/tether_away/debrisfield/derelict/interior) +"bw" = ( /obj/machinery/vr_sleeper/alien, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"bu" = ( +/area/tether_away/debrisfield/derelict/interior) +"bx" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /mob/living/simple_mob/mechanical/corrupt_maint_drone{ faction = "derelict" }, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bv" = ( +/area/tether_away/debrisfield/derelict/interior) +"by" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bw" = ( +/area/tether_away/debrisfield/derelict/interior) +"bz" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bx" = ( +/area/tether_away/debrisfield/derelict/interior) +"bA" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"by" = ( +/area/tether_away/debrisfield/derelict/interior) +"bB" = ( /obj/tether_away_spawner/debrisfield/derelict, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bz" = ( +/area/tether_away/debrisfield/derelict/interior) +"bC" = ( /obj/structure/old_roboprinter, /turf/simulated/floor/tiled/steel_grid, -/area/tether_away/debrisfield/derelict) -"bA" = ( +/area/tether_away/debrisfield/derelict/interior) +"bD" = ( /obj/machinery/auto_cloner, /turf/simulated/floor/tiled/steel_ridged, -/area/tether_away/debrisfield/derelict) -"bB" = ( +/area/tether_away/debrisfield/derelict/interior) +"bE" = ( /obj/structure/old_roboprinter, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bC" = ( +/area/tether_away/debrisfield/derelict/interior) +"bF" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /obj/structure/cable{ d1 = 1; @@ -493,34 +508,34 @@ icon_state = "1-4" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bE" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bF" = ( -/obj/machinery/door/airlock/alien, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/interior) "bG" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) +/turf/simulated/floor/reinforced, +/area/tether_away/debrisfield/derelict/interior) "bH" = ( +/obj/machinery/door/airlock/alien, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/tether_away/debrisfield/derelict/interior) +"bI" = ( +/obj/machinery/door/airlock/alien, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/debrisfield/derelict/interior) +"bJ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether_away/debrisfield/derelict/interior) +"bK" = ( /obj/structure/cable{ icon_state = "2-8" }, @@ -531,8 +546,8 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bI" = ( +/area/tether_away/debrisfield/derelict/interior) +"bL" = ( /obj/structure/cable{ d1 = 2; d2 = 4; @@ -547,8 +562,8 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bJ" = ( +/area/tether_away/debrisfield/derelict/interior) +"bM" = ( /obj/effect/map_effect/interval/effect_emitter/sparks/frequent, /obj/structure/door_assembly/door_assembly_alien, /obj/structure/cable{ @@ -557,16 +572,19 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bK" = ( +/area/tether_away/debrisfield/derelict/interior) +"bN" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bL" = ( +/area/tether_away/debrisfield/derelict/interior) +"bO" = ( +/turf/template_noop, +/area/tether_away/debrisfield/explored) +"bP" = ( /obj/random/humanoidremains, /obj/structure/cable{ d1 = 4; @@ -574,8 +592,8 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bM" = ( +/area/tether_away/debrisfield/derelict/interior) +"bQ" = ( /obj/machinery/door/airlock/alien, /obj/structure/cable{ d1 = 4; @@ -583,8 +601,11 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bN" = ( +/area/tether_away/debrisfield/derelict/interior) +"bR" = ( +/turf/template_noop, +/area/tether_away/debrisfield/unexplored) +"bS" = ( /obj/machinery/door/airlock/alien, /obj/structure/cable{ d1 = 4; @@ -592,22 +613,16 @@ icon_state = "4-8" }, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bO" = ( -/turf/template_noop, -/area/tether_away/debrisfield/explored) -"bP" = ( +/area/tether_away/debrisfield/derelict/interior) +"bT" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bQ" = ( +/area/tether_away/debrisfield/derelict/interior) +"bU" = ( /obj/machinery/door/airlock/alien, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"bR" = ( -/turf/template_noop, -/area/tether_away/debrisfield/unexplored) -"bS" = ( +/area/tether_away/debrisfield/derelict/interior) +"bV" = ( /obj/item/xenos_claw, /obj/structure/cable{ d1 = 1; @@ -616,26 +631,26 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bT" = ( +/area/tether_away/debrisfield/derelict/interior) +"bW" = ( /obj/structure/old_roboprinter, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"bU" = ( +/area/tether_away/debrisfield/derelict/interior) +"bX" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /mob/living/simple_mob/mechanical/corrupt_maint_drone{ faction = "derelict" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"bV" = ( +/area/tether_away/debrisfield/derelict/interior) +"bY" = ( /obj/machinery/porta_turret/alien{ faction = "derelict"; use_power = 0 }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"bW" = ( +/area/tether_away/debrisfield/derelict/interior) +"bZ" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -648,8 +663,8 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bX" = ( +/area/tether_away/debrisfield/derelict/interior) +"ca" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -662,58 +677,58 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"bY" = ( +/area/tether_away/debrisfield/derelict/interior) +"cb" = ( /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"bZ" = ( +/area/tether_away/debrisfield/derelict/interior) +"cc" = ( /obj/machinery/implantchair, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"ca" = ( +/area/tether_away/debrisfield/derelict/interior) +"cd" = ( /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cb" = ( +/area/tether_away/debrisfield/derelict/interior) +"ce" = ( /obj/machinery/door/airlock/alien, /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cc" = ( +/area/tether_away/debrisfield/derelict/interior) +"cf" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cd" = ( +/area/tether_away/debrisfield/derelict/interior) +"cg" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"ce" = ( +/area/tether_away/debrisfield/derelict/interior) +"ch" = ( /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"cf" = ( +/area/tether_away/debrisfield/derelict/interior) +"ci" = ( /mob/living/simple_mob/mechanical/infectionbot{ faction = "derelict" }, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"cg" = ( +/area/tether_away/debrisfield/derelict/interior) +"cj" = ( /obj/machinery/dna_scannernew, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"ch" = ( +/area/tether_away/debrisfield/derelict/interior) +"ck" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -721,16 +736,16 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"ci" = ( +/area/tether_away/debrisfield/derelict/interior) +"cl" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cj" = ( +/area/tether_away/debrisfield/derelict/interior) +"cm" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -738,13 +753,13 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"ck" = ( +/area/tether_away/debrisfield/derelict/interior) +"cn" = ( /obj/machinery/optable, /obj/random/humanoidremains, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"cl" = ( +/area/tether_away/debrisfield/derelict/interior) +"co" = ( /obj/machinery/door/airlock/alien, /obj/structure/cable{ d1 = 1; @@ -753,16 +768,16 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/steel_dirty, -/area/tether_away/debrisfield/derelict) -"cm" = ( +/area/tether_away/debrisfield/derelict/interior) +"cp" = ( /obj/random/humanoidremains, /turf/simulated/floor/tiled/white, -/area/tether_away/debrisfield/derelict) -"cn" = ( +/area/tether_away/debrisfield/derelict/interior) +"cq" = ( /obj/structure/prop/prism, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"co" = ( +/area/tether_away/debrisfield/derelict/interior) +"cr" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -773,8 +788,8 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cp" = ( +/area/tether_away/debrisfield/derelict/interior) +"cs" = ( /obj/structure/cable, /obj/machinery/power/apc{ alarms_hidden = 1; @@ -783,21 +798,21 @@ pixel_y = -24 }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cq" = ( +/area/tether_away/debrisfield/derelict/interior) +"ct" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cr" = ( +/area/tether_away/debrisfield/derelict/interior) +"cu" = ( /obj/machinery/replicator, /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"cs" = ( +/area/tether_away/debrisfield/derelict/interior) +"cv" = ( /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"ct" = ( +/area/tether_away/debrisfield/derelict/interior) +"cw" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -805,94 +820,152 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"cu" = ( +/area/tether_away/debrisfield/derelict/interior) +"cx" = ( /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"cv" = ( +/area/tether_away/debrisfield/derelict/interior) +"cy" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"cw" = ( +/area/tether_away/debrisfield/derelict/interior) +"cz" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/tiled/neutral, -/area/tether_away/debrisfield/derelict) -"cx" = ( +/area/tether_away/debrisfield/derelict/interior) +"cA" = ( /obj/structure/catwalk, /turf/space, -/area/tether_away/debrisfield/derelict) -"cy" = ( +/area/tether_away/debrisfield/derelict/interior) +"cB" = ( +/turf/space, +/area/tether_away/debrisfield/derelict/interior) +"cC" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/tiled/steel_ridged, -/area/tether_away/debrisfield/derelict) -"cz" = ( +/area/tether_away/debrisfield/derelict/interior) +"cD" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cA" = ( +/area/tether_away/debrisfield/derelict/interior) +"cE" = ( /obj/random/humanoidremains, /obj/structure/cable{ icon_state = "2-8" }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cB" = ( +/area/tether_away/debrisfield/derelict/interior) +"cF" = ( /obj/effect/alien/egg, /obj/effect/alien/weeds, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cC" = ( +/area/tether_away/debrisfield/derelict/interior) +"cG" = ( +/turf/simulated/wall/r_wall, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cH" = ( +/turf/simulated/wall, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cI" = ( +/obj/machinery/door/airlock/alien, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cJ" = ( +/obj/machinery/door/airlock/alien, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cK" = ( /obj/item/weapon/gun/energy/ionrifle, /turf/space, -/area/tether_away/debrisfield/derelict) -"cD" = ( +/area/tether_away/debrisfield/derelict/interior) +"cL" = ( /obj/structure/shuttle/engine/heater, /turf/simulated/floor/reinforced, -/area/tether_away/debrisfield/derelict) -"cE" = ( +/area/tether_away/debrisfield/derelict/interior) +"cM" = ( /obj/structure/prop/alien/pod, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cF" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"cN" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cO" = ( +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cP" = ( /obj/structure/ghost_pod/manual/lost_drone, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cG" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"cQ" = ( /obj/item/weapon/grenade/empgrenade, /obj/item/weapon/grenade/empgrenade, /obj/item/weapon/grenade/empgrenade, /turf/space, -/area/tether_away/debrisfield/derelict) -"cH" = ( +/area/tether_away/debrisfield/derelict/interior) +"cR" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cI" = ( +/area/tether_away/debrisfield/derelict/interior) +"cS" = ( /obj/structure/shuttle/engine/propulsion, /turf/space, -/area/tether_away/debrisfield/derelict) -"cJ" = ( +/area/tether_away/debrisfield/derelict/interior) +"cT" = ( +/turf/simulated/floor/plating, +/area/tether_away/debrisfield/derelict/ai_access_port) +"cU" = ( /obj/machinery/door/airlock/alien/locked, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cK" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"cV" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/floor/plating, +/area/tether_away/debrisfield/derelict/interior) +"cW" = ( +/turf/simulated/wall, +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"cX" = ( +/obj/machinery/door/airlock/alien, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"cY" = ( +/turf/simulated/wall/r_wall, +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"cZ" = ( /obj/random/humanoidremains, /obj/structure/cable{ d1 = 1; @@ -901,8 +974,8 @@ pixel_y = 0 }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cL" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"da" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -910,8 +983,19 @@ pixel_y = 0 }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cM" = ( +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"db" = ( +/turf/simulated/floor/plating, +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"dc" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/tether_away/debrisfield/derelict/ai_access_port) +"dd" = ( /obj/structure/cable{ icon_state = "0-8" }, @@ -922,8 +1006,8 @@ pixel_x = 28 }, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cN" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"de" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -936,14 +1020,14 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cO" = ( +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"df" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cP" = ( +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"dg" = ( /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -955,20 +1039,23 @@ pixel_x = 28 }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cQ" = ( +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"dh" = ( /obj/tether_away_spawner/debrisfield/derelict/corrupt_maint_swarm, /turf/simulated/floor/tiled/dark, -/area/tether_away/debrisfield/derelict) -"cR" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"di" = ( /obj/structure/ghost_pod/manual/lost_drone/dogborg, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cS" = ( +/area/tether_away/debrisfield/derelict/ai_access_port) +"dj" = ( /obj/tether_away_spawner/debrisfield/derelict/mech_wizard, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cT" = ( +/area/tether_away/debrisfield/derelict/ai_access_starboard) +"dk" = ( +/turf/simulated/wall/r_wall, +/area/tether_away/debrisfield/derelict/ai_chamber) +"dl" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = null; @@ -977,8 +1064,8 @@ req_access = list(16) }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cU" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dm" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; id_tag = null; @@ -993,11 +1080,14 @@ pixel_y = 0 }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cV" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dn" = ( +/turf/simulated/floor/plating, +/area/tether_away/debrisfield/derelict/ai_chamber) +"do" = ( /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) -"cW" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dp" = ( /obj/structure/cable{ icon_state = "0-4" }, @@ -1009,47 +1099,47 @@ pixel_y = 24 }, /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) -"cX" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dq" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cY" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dr" = ( /obj/structure/cable{ icon_state = "1-8" }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"cZ" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"ds" = ( /obj/machinery/porta_turret/alien{ faction = "derelict"; use_power = 0 }, /turf/simulated/floor/plating, -/area/tether_away/debrisfield/derelict) -"da" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dt" = ( /obj/structure/prop/prism, /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) -"db" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"du" = ( /obj/structure/prop/blackbox/xenofrigate, /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) -"dc" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dv" = ( /obj/machinery/porta_turret/alien{ faction = "derelict"; use_power = 0 }, /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) -"dd" = ( +/area/tether_away/debrisfield/derelict/ai_chamber) +"dw" = ( /obj/structure/prop/fake_ai, /turf/simulated/floor/greengrid, -/area/tether_away/debrisfield/derelict) +/area/tether_away/debrisfield/derelict/ai_chamber) (1,1,1) = {" bR @@ -1155,7 +1245,7 @@ aa aa aa aa -bb +bd ao ao ao @@ -1231,35 +1321,35 @@ aa ao ao ao -bg -bg -bg -aq -bg -bg -bg -bp -aq -bB -bB -aq -bp -bg -bg -bg -bg -aq -bg -bg -bg -bg -bg -bg -bg -cD -aq -cI -aK +bi +bi +bi +av +bi +bi +bi +br +av +bE +bE +av +br +bi +bi +bi +bi +av +bi +bi +bi +bi +bi +bi +bi +cL +av +cS +cB aa aa bR @@ -1303,37 +1393,37 @@ aa ao ao ao -bc -bg -bg -aq -bg -aq -bg -bg -aq -aq -aq -bg -bg -aq -aq -aq -bg -bg -bg -aq -bg -bg -aq -aq -aq -aq -bg -bg -cD -aq -cI +be +bi +bi +av +bi +av +bi +bi +av +av +av +bi +bi +av +av +av +bi +bi +bi +av +bi +bi +av +av +av +av +bi +bi +cL +av +cS aa aa bR @@ -1377,37 +1467,37 @@ aa ao ao ao -bd -bh -bh -ar -bh -bh -bh -bh -ar -bh -bh -bC -bP -bg -bg -bg -bg -aq -bg -bg -bg -bg -aq -bp -bg -aq -bg -bg -cD -aq -cI +bf +bj +bj +bs +bj +bj +bj +bj +bs +bj +bj +bF +bT +bi +bi +bi +bi +av +bi +bi +bi +bi +av +br +bi +av +bi +bi +cL +av +cS aa aa bR @@ -1453,35 +1543,35 @@ aa ao ao ao -aq -aq -bg -bg -bg -bg -bg -bg -aq -bD -bg -aq -bg -bg -aq -aq -bg -bg -bg -bg -aq -bg -bg -bg -bg -cD -aq -cI -aK +av +av +bi +bi +bi +bi +bi +bi +av +bG +bi +av +bi +bi +av +av +bi +bi +bi +bi +av +bi +bi +bi +bi +cL +av +cS +cB aa aa bR @@ -1525,7 +1615,7 @@ aa aa aa aa -bb +bd ao ao ao @@ -1536,8 +1626,8 @@ ao ao ao ao -bE -bQ +bH +bU ao ao ao @@ -1610,8 +1700,8 @@ aa aa aa ao -bD -bg +bG +bi ao aa aa @@ -1684,8 +1774,8 @@ aa aa aa ao -bD -bg +bG +bi ao aa aa @@ -1758,8 +1848,8 @@ aa aa ao ao -bD -bg +bG +bi ao ao aa @@ -1832,8 +1922,8 @@ aa ao ao ao -bD -bg +bG +bi ao ao ao @@ -1906,16 +1996,8 @@ ao ao ao ao -bF -aE -ao -ao -ao -ao -ao -ao -ao -ao +bI +aG ao ao ao @@ -1929,6 +2011,14 @@ ao ao ao ao +cG +cG +cG +cG +cG +cG +cG +dk aa aa bO @@ -1968,42 +2058,42 @@ aa aa ao ao -aY -aZ -aD -aD -aD -aD -aq -aD -aD -aD -bi -aq -bG -au -aq -bT -aD -aD -aD -aD -aD -aq -cr -cs -aZ -aZ -cy -aq -cE -aD -aD -aD -aD -cQ -ao -ao +ba +bb +aF +aF +aF +aF +av +aF +aF +aF +bk +av +bJ +aw +av +bW +aF +aF +aF +aF +aF +av +cu +cv +bb +bb +cC +cH +cM +cO +cO +cO +cO +dh +dk +dk aa aa bO @@ -2042,43 +2132,43 @@ aa aa ao ao -aZ -aq -aD -aq -aW -aD -aq -aD -bt -aq -bi -aq -bG -au -aq -aD -aD -aD -aD -aq -aD -aq -cs -cs -aq -aq -aq -aq -aq -aD -aq -aD -aD -aq -ao -ao -ao +bb +av +aF +av +aY +aF +av +aF +bw +av +bk +av +bJ +aw +av +aF +aF +aF +aF +av +aF +av +cv +cv +av +av +av +cH +cH +cO +cH +cO +cO +cH +dk +dk +dk aa aa bO @@ -2095,15 +2185,15 @@ aa aa aa ao -as -as -as -as -aD -aD -aG -aG -aG +at +at +at +at +aF +aF +aI +aI +aI ao aa aa @@ -2115,45 +2205,45 @@ aa aa aa ao -aD -aD -aD -aD -aq -aD -aD -aD -aD -aD -aD -bi -aq -bG -au -aq -bU -aD -aq -aD -aD -aD -aq -cs -cu -aC -ch -ch -aC -ch -ch -ch -cK -ci -aP +aF +aF +aF +aF +av +aF +aF +aF +aF +aF +aF +bk +av +bJ +aw +av +bX +aF +av +aF +aF +aF +av +cv +cx +aE +ck +ck +cI +cN +cN +cN +cZ +dc cT -aP -ao -ao +dl +dn +dk +dk aa aa bO @@ -2169,15 +2259,15 @@ aa aa aa ao -as -as -aq -aq -aD -aD -aq -aq -aG +at +at +av +av +aF +aF +av +av +aI ao aa aa @@ -2189,46 +2279,46 @@ aa aa aa ao -aD -aq -aD -aD -aD -aD -aD -aW -aq -aq -aq -bi -aq -bG -au -aq -aq -aD -aq -aq -aD -aD -aq -cs +aF +av +aF +aF +aF +aF +aF +aY +av +av +av +bk +av +bJ +aw +av +av +aF +av +av +aF +aF +av cv -aq -aD -aW -aB -aD -aD -aD -aD -cM -aP -ao -aP -aP -ao -ao +cy +av +aF +aY +cJ +cO +cO +cO +cO +dd +cT +dk +dn +dn +dk +dk aa aa bO @@ -2243,67 +2333,67 @@ aa aa aa ao -at -as -as -aq -aD -aD -aq -aG -aG -ao -aa -aa -aa -aq -aR -aq -aa -aa -aa -ao -aD -aD -aD -aq -aq -aq -aD -aD -aD -aD -aD -bi -aq -bG au -aq +at +at +av +aF +aF +av +aI +aI +ao +aa +aa +aa +av +aT +av +aa +aa +aa +ao +aF +aF +aF +av +av +av +aF +aF +aF +aF +aF +bk +av +bJ +aw +av +aF +aF +aF +aF +aF +aF aD -aD -aD -aD -aD -aD -aB -cs cv -aq -aZ -aZ -aq -aD -aq -aP -aP -aq -aP -ao -aP -aP -cZ -ao -ao +cy +av +bb +bb +cH +cO +cH +cT +cT +cH +cT +dk +dn +dn +ds +dk +dk aa aa bO @@ -2317,68 +2407,68 @@ aa aa aa ao -as -ax at -aq -aD -aD -aq -aH -aJ -ao -aa -aa -aN -aq -aP -aq -aN -aa -aa -ao -aU -aD -aD -aq -bk -aD -aD -aq -aD -aD -aD -bi -aq -bG +az au -aq -aD -ca -ch -ch -ch -ch -aC -ct +av +aF +aF +av +aJ +aM +ao +aa +aa +aP +av +aR +av +aP +aa +aa +ao +aW +aF +aF +av +bm +aF +aF +av +aF +aF +aF +bk +av +bJ +aw +av +aF +cd +ck +ck +ck +ck +aE cw -aq -cy -aZ -aq -cF -aq -aP -aP -aq -cR -ao -cV -cV -cV -dc -ao -ao +cz +av +cC +bb +cH +cP +cH +cT +cT +cH +di +dk +do +do +do +dv +dk +dk aa aa bO @@ -2390,70 +2480,70 @@ ae ae ae ae -ao -aq -aq -aq -aq -aB -aB -aq -aq -aq +ap +av +av +av +av +aD +aD +av +av +av ao aa aa -aq -aq -aS -aq -aq +av +av +aU +av +av aa aa ao -aq -aq -aB -aq +av +av aD +av +aF +aF +aF +aF +aF +av +aF +bk +av +bJ +aw +av aD -aD -aD -aD -aq -aD -bi -aq -bG -au -aq -aB -cb -aq -aq -aq -aq -aq +ce +av +av +av +av +av ao ao ao ao ao -ao -ao -ao -cJ -cJ -ao -ao -ao -cV -cV -cV -cV -dc -ao -ao +cG +cG +cG +cU +cU +cG +cG +dk +do +do +do +do +dv +dk +dk aa aa "} @@ -2464,71 +2554,71 @@ af ak ak ak -ap -au -au -au -au -au -au -au -au -au +aq +aw +aw +aw +aw +aw +aw +aw +aw +aw ao aK aK -aq -aP -aP -aP -aq +av +aR +aR +aR +av aK aK ao -aV -aD -aD -aq -aq -aq -aq -aD -aD -bk -aq -by -aq -bG -au -aq -aD -cc -ci -aD -aD -cn -bV -ao -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -ao -cV -cV -cV -cV -cV -dc -ao +aX +aF +aF +av +av +av +av +aF +aF +bm +av +bB +av +bJ +aw +av +aF +cf +cl +aF +aF +cq +bY ao +cA +cA +cA +cA +cA +cA +cA +cA +cA +cA +cA +dk +do +do +do +do +do +dv +dk +dk aa "} (21,1,1) = {" @@ -2538,71 +2628,71 @@ ag ak ak ak -ap -au -au -au -au -au -au -au -au -au -ao -ao -aM aq -aQ -aP -aP -aq -aM +aw +aw +aw +aw +aw +aw +aw +aw +aw ao ao -aW -aD -aD -aq -bl -bi -bi -bi -bi -bi -by -aq -aq -bG -au -aq -bV -aD -cc -ch -ch -ci -aD +aO +av +aS +aR +aR +av +aO ao -cx -aK -aK -aK -aK -aK -aK -aK -aK -aK -cx ao -cV -cV -cV -cV -cV -cV -dc +aY +aF +aF +av +bn +bk +bk +bk +bk +bk +bB +av +av +bJ +aw +av +bY +aF +cf +ck +ck +cl +aF ao +cA +cB +cB +cB +cB +cB +cB +cB +cB +cB +cA +dk +do +do +do +do +do +do +dv +dk aa "} (22,1,1) = {" @@ -2612,71 +2702,71 @@ ah ak ak ak -aq -aq -aq -aq -aq -aE -aE -aq -aq -aq -aq +ar +av +av +av +av +aG +aG +av +av +av +av ao ao -aq -aq -aB -aq -aq -ao -ao -ao -aq -aB -aB -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -aE -aE -aq -aq -aq -aq -aq -aq -cd +av +av aD +av +av ao -cx -aK -aK -aK -aK -aK -aK -aK -aK -aK -cx ao -cV -cV -da -da -cV -cV -cV ao +av +aD +aD +av +av +av +av +av +av +av +av +av +av +aG +aG +av +av +av +av +av +av +cg +aF +ao +cA +cB +cB +cB +cB +cB +cB +cB +cB +cB +cA +dk +do +do +dt +dt +do +do +do +dk aa "} (23,1,1) = {" @@ -2686,71 +2776,71 @@ ag ak al am -aq -av -ay +ar +ax aA -aB -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -bH -bS -aF -bW -aF -aF -aF -cl +aC +aD +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +bK +bV +aH +bZ +aH +aH +aH co -cp -ao -cx -aK -aK -aK -cC -cG -cG -aK -aK -aK -cx -ao -cV -cV -db -dd -cV -cV -dc +cr +cs ao +cA +cB +cB +cB +cK +cQ +cQ +cB +cB +cB +cA +dk +do +do +du +dw +do +do +dv +dk aa "} (24,1,1) = {" @@ -2760,71 +2850,71 @@ ag ak ak an -ar -aw -az -aA +as +ay +aB aC -aF -aF -aF -aF -aF -aF -aL -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -aF -bq -aF -aF -aF -aF -aF -aF -bI -aF -aF -bX -aF -aF -aF +aE +aH +aH +aH +aH +aH +aH +aN +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +aH +bt +aH +aH +aH +aH +aH +aH +bL +aH +aH +ca +aH +aH +aH +co +ck cl -ch -ci -ao -cx -aK -aK -aK -aK -cG -cG -aK -aK -aK -cx -ao -cV -cV -db -dd -cV -cV -dc ao +cA +cB +cB +cB +cB +cQ +cQ +cB +cB +cB +cA +dk +do +do +du +dw +do +do +dv +dk aa "} (25,1,1) = {" @@ -2834,71 +2924,71 @@ ah ak ak ak -aq -aq -aq -aq -aq -aE -aE -aq -aq -aq -aq +ar +av +av +av +av +aG +aG +av +av +av +av ao ao -aq -aq -aB -aq -aq +av +av +aD +av +av ao ao ao -aq -aB -aB -aq -aq -aq -aq -aq -aq -aq -aq -aq -aq -bJ -aE -aq -aq -aq -aq -aq -aq -aW -cd -ao -cx -aK -aK -aK -aK -aK -aK -aK -aK -aK -cx -ao -cV -cV -da -da -cV -cV -cV +av +aD +aD +av +av +av +av +av +av +av +av +av +av +bM +aG +av +av +av +av +av +av +aY +cg ao +cA +cB +cB +cB +cB +cB +cB +cB +cB +cB +cA +dk +do +do +dt +dt +do +do +do +dk aa "} (26,1,1) = {" @@ -2908,71 +2998,71 @@ ag ak ak ak -ap -au -au -au -au -au -au -au -au -au -ao -ao -aM aq -aQ -aP -aP -aq -aM +aw +aw +aw +aw +aw +aw +aw +aw +aw ao ao -aX -aD +aO +av +aS +aR +aR +av +aO +ao +ao +aZ +aF +aY +aF +aF +aF +aF aW -aD -aD -aD -aD -aU -aq -bu -bz -bz -aq -bK -au -aq -bV -ca -ch -ch -ch -ch -cq -ao -cx -aK -aK -aK -aK -aK -aK -aK -aK -aK -cx -ao -cV -cV -cV -cV -cV -cV -dc +av +bx +bC +bC +av +bN +aw +av +bY +cd +ck +ck +ck +ck +ct ao +cA +cB +cB +cB +cB +cB +cB +cB +cB +cB +cA +dk +do +do +do +do +do +do +dv +dk aa "} (27,1,1) = {" @@ -2982,71 +3072,71 @@ ai ak ak ak -ap -au -au -au -au -au -au -au -au -au +aq +aw +aw +aw +aw +aw +aw +aw +aw +aw ao aa aa -aq -aP -aP -aP -aq +av +aR +aR +aR +av aa aa ao -aX -aD -aD -aD -aD -aD -aD -aD -aq -bv -bi -bi -aq -bK -au -aq -aD -cd -aD -aD -aD -cn -bV -ao -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -cx -ao -cV -cV -cV -cV -cV -dc -ao +aZ +aF +aF +aF +aF +aF +aF +aF +av +by +bk +bk +av +bN +aw +av +aF +cg +aF +aF +aF +cq +bY ao +cA +cA +cA +cA +cA +cA +cA +cA +cA +cA +cA +dk +do +do +do +do +do +dv +dk +dk aa "} (28,1,1) = {" @@ -3056,50 +3146,50 @@ aj aj aj aj -ao -aq -aq -aq -aq -aB -aB -aq -aq -aq -ao -aa -aa -aq -aq -aT -aq -aq -aa -aa -ao -aq -aq -aq -aq -aq -aq +ap +av +av +av +av aD aD +av +av +av +ao +aa +aa +av +av +aV +av +av +aa +aa +ao +av +av +av +av +av +av +aF +aF +aF +bk +bx +bx +av +bN +aw +av aD -bi -bu -bu -aq -bK -au -aq -aB -cb -aq -aq -aq -aq -aq +ce +av +av +av +av +av ao ao ao @@ -3108,18 +3198,18 @@ ao ao ao ao -cJ -cJ -ao -ao -ao cV cV -cV -cV -dc ao ao +dk +do +do +do +do +dv +dk +dk aa aa "} @@ -3131,68 +3221,68 @@ aa aa aa ao -at -as -as -aq -aD -aD -aq -aI -aI -ao -aa -aa -aO -aq -aP -aq -aO -aa -aa -ao -aU -aD -aD -aD -aU -aq -aD -aD -aq -aq -aq -aq -aq -bK au -aq -bY -ce -cj -cj -cj -cj -aC -ct -ct +at +at +av +aF +aF +av +aL +aL +ao +aa +aa +aQ +av +aR +av +aQ +aa +aa +ao +aW +aF +aF +aF +aW +av +aF +aF +av +av +av +av +av +bN +aw +av +cb ch -ci -cB -aq -aD -aD -aD -aD -aD -bk -ao -cW -cV -cV -dc -ao -ao +cm +cm +cm +cm +aE +cw +cw +ck +cl +cF +av +aF +aF +aF +aF +aF +bm +dk +dp +do +do +dv +dk +dk aa aa bO @@ -3205,67 +3295,67 @@ aa aa aa ao -as -as at -aq -aD -aD -aq -aG -aG -ao -aa -aa -aa -aq -aT -aq -aa -aa -aa -ao -aD -aD -aq -aD -aD -aD -aW -aD -aD -aD -aD -aD -aq -bK +at au -aq -bY -bY -bY -bY -bY -bY -aB -cs -cs -aD -cz -aD -aq -aD -aW -aD -aD -aD -aD -ao -cX -aP -cZ +av +aF +aF +av +aI +aI ao +aa +aa +aa +av +aV +av +aa +aa +aa ao +aF +aF +av +aF +aF +aF +aY +aF +aF +aF +aF +aF +av +bN +aw +av +cb +cb +cb +cb +cb +cb +aD +cv +cv +aF +cD +aF +av +aF +aY +aF +aF +aF +aF +dk +dq +dn +ds +dk +dk aa aa bO @@ -3279,15 +3369,15 @@ aa aa aa ao -as -as -aq -aq -aD -aD -aq -aJ -aJ +at +at +av +av +aF +aF +av +aM +aM ao aa aa @@ -3299,46 +3389,46 @@ aa aa aa ao -aD -aD -aD -aD -aD -aD -aD -aD -aD -aD -aD -aD -aq -bL -au -aq -bY -aq +aF +aF +aF +aF +aF +aF +aF +aF +aF +aF +aF +aF +av +bP +aw +av +cb +av +cn +av +cp +cb +av +cv +cv +av +cE ck -aq -cm -bY -aq -cs -cs -aq -cA -ch -aC -ch -ci -aq -aq -aq -aq -ao -cX -aP -ao -ao +aE +ck +cl +cW +cW +cW +cW +dk +dq +dn +dk +dk aa aa bO @@ -3353,15 +3443,15 @@ aa aa aa ao -as -as -as -as -aD -aD -aG -aG -aG +at +at +at +at +aF +aF +aI +aI +aI ao aa aa @@ -3373,45 +3463,45 @@ aa aa aa ao -aD -aD -aq -aD -aD -aq -aq -aq -aq -aq -aD -aq -aq -bK -au -aq -bY +aF +aF +av +aF +aF +av +av +av +av +av +aF +av +av +bN +aw +av +cb +ci +av +ci +cb +cb +av +cv +cv +av +av +av +av +aF cf -aq -cf -bY -bY -aq -cs -cs -aq -aq -aq -aq -aD -cc -aC -cL -cN -cL -cU -cY -ao -ao +cX +da +de +da +dm +dr +dk +dk aa aa bO @@ -3448,43 +3538,43 @@ aa aa ao ao -aZ -aq -bi -bi -bi -bi -bi -br -aq -aZ -aZ -aq -bK -au -aq -bY -bY -bY -bY -aq -bY -aq -cs -cs -aZ -aZ -cy -aq -aD -aD -aq -aP -cO -aP -ao -ao -ao +bb +av +bk +bk +bk +bk +bk +bu +av +bb +bb +av +bN +aw +av +cb +cb +cb +cb +av +cb +av +cv +cv +bb +bb +cC +av +aF +aF +cW +db +df +db +dk +dk +dk aa aa bO @@ -3522,42 +3612,42 @@ aa aa ao ao -ba -aq -bj -bi -bi -bi -bi -bs -aq -aZ -bA -aq -bK -au -aq -bZ -cg -bY -bY -bY -cf -aq -cr -cs -aZ -aZ -cy -aq -cH -aD -aq -aP -cP -cS -ao -ao +bc +av +bl +bk +bk +bk +bk +bv +av +bb +bD +av +bN +aw +av +cc +cj +cb +cb +cb +ci +av +cu +cv +bb +bb +cC +av +cR +aF +cW +db +dg +dj +dk +dk aa aa bO @@ -3608,13 +3698,8 @@ ao ao ao ao -bM -aE -ao -ao -ao -ao -ao +bQ +aG ao ao ao @@ -3631,6 +3716,11 @@ ao ao ao ao +cY +cY +cY +cY +dk aa aa bO @@ -3682,8 +3772,8 @@ aa ao ao ao -bn -bg +bp +bi ao ao ao @@ -3756,8 +3846,8 @@ aa aa ao ao -bn -bg +bp +bi ao ao aa @@ -3830,8 +3920,8 @@ aa aa aa ao -bn -bg +bp +bi ao aa aa @@ -3904,8 +3994,8 @@ aa aa aa ao -bn -bg +bp +bi ao aa aa @@ -3967,7 +4057,7 @@ aa aa aa aa -bb +bd ao ao ao @@ -3978,8 +4068,8 @@ ao ao ao ao -bN -bQ +bS +bU ao ao ao @@ -4043,35 +4133,35 @@ aa ao ao ao -bm -bh -bh -bh -bh -bw -aq -bm -bh bo -bg -bg -bg -aq -bp -bg -bg -bg -bg -bg -bp -aq -bg -bg -bg -cD -aq -cI -aK +bj +bj +bj +bj +bz +av +bo +bj +bq +bi +bi +bi +av +br +bi +bi +bi +bi +bi +br +av +bi +bi +bi +cL +av +cS +cB aa aa bR @@ -4115,37 +4205,37 @@ aa ao ao ao -be bg -bn -bg -bg -aq -bg -bn -aq -bn -aq -bg -bg -aq -bg -aq -aq -aq -bg -bg -bg -aq -aq -aq -bg -aq -bg -bg -cD -aq -cI +bi +bp +bi +bi +av +bi +bp +av +bp +av +bi +bi +av +bi +av +av +av +bi +bi +bi +av +av +av +bi +av +bi +bi +cL +av +cS aa aa bR @@ -4189,37 +4279,37 @@ aa ao ao ao -bf bh -bo -aq -bg -aq -bg -bn -aq -bn -aq -bg -bg -aq -bg -bg -bg -bg -bg -aq -bg -bg -bg -bg -bg -aq -bg -bg -cD -aq -cI +bj +bq +av +bi +av +bi +bp +av +bp +av +bi +bi +av +bi +bi +bi +bi +bi +av +bi +bi +bi +bi +bi +av +bi +bi +cL +av +cS aa aa bR @@ -4265,35 +4355,35 @@ aa ao ao ao -bp -aq -bg -bg -bg -bx -bh -bo -aq -bP -bP -aq -bg -bg -bg -bg -bg -aq -bg -bg -bg -bg -bg -aq -bg -cD -aq -cI -aK +br +av +bi +bi +bi +bA +bj +bq +av +bT +bT +av +bi +bi +bi +bi +bi +av +bi +bi +bi +bi +bi +av +bi +cL +av +cS +cB aa aa bR @@ -4337,7 +4427,7 @@ aa aa aa aa -bb +bd ao ao ao diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index a610f61f240..68c6a1a533a 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -5534,7 +5534,6 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "alw" = ( -/obj/effect/floor_decal/rust, /obj/structure/cable{ icon_state = "1-2" }, diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index f427bd6d2df..dca92d3c4f2 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5311,7 +5311,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/crew_quarters/recreation_area_restroom) "aiI" = ( /obj/structure/sink{ diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 08fdb5785b6..a235b0b41c5 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2899,13 +2899,27 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "afl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 1 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -3090,19 +3104,16 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4; - icon_state = "borderfloorcorner2"; - pixel_y = 0 +/obj/structure/table/reinforced, +/obj/item/device/radio{ + pixel_x = -2; + pixel_y = -2 }, -/obj/effect/floor_decal/corner/blue/bordercorner2{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/device/radio{ + pixel_x = 2; + pixel_y = 2 }, +/obj/machinery/camera/network/command, /turf/simulated/floor/tiled, /area/bridge/secondary) "afx" = ( @@ -3319,26 +3330,16 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, /obj/effect/floor_decal/corner/blue/bordercorner2{ dir = 1 }, -/obj/structure/table/reinforced, -/obj/item/device/radio{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/device/radio{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/machinery/camera/network/command, /turf/simulated/floor/tiled, /area/bridge/secondary) "afS" = ( @@ -4280,9 +4281,17 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "ahh" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, /turf/simulated/floor/tiled, @@ -4295,15 +4304,23 @@ /turf/simulated/wall/r_wall, /area/bridge/secondary/teleporter) "ahk" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Secondary Command Office" }, -/obj/machinery/disposal, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 5 }, /obj/effect/floor_decal/corner/blue/border{ - dir = 6 + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4; + icon_state = "borderfloorcorner2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/blue/bordercorner2{ + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -8077,6 +8094,8 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/bridge/secondary) "aon" = ( @@ -10402,17 +10421,16 @@ /area/crew_quarters/sleep/cryo) "asM" = ( /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/bridge/secondary) "asN" = ( @@ -12261,15 +12279,18 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway) "awg" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Secondary Command Office" +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + icon_state = "map-scrubbers"; + dir = 4 }, /turf/simulated/floor/tiled, /area/bridge/secondary) @@ -12697,7 +12718,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled, /area/bridge/secondary/teleporter) "awO" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -12868,7 +12889,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor, +/turf/simulated/floor/wood, /area/bridge/secondary/meeting_room) "axd" = ( /obj/structure/bed/chair/comfy/black, @@ -14185,13 +14206,18 @@ /turf/simulated/floor/tiled, /area/bridge/secondary) "azd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/structure/disposalpipe/trunk{ + dir = 8 }, +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/blue/bordercorner2, /turf/simulated/floor/tiled, /area/bridge/secondary) "aze" = ( @@ -14973,12 +14999,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/bridge/secondary/hallway) -"aAv" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/bridge/secondary) "aAw" = ( /obj/structure/cable{ d1 = 4; @@ -34221,7 +34241,7 @@ acT aCX aCr acV -aAv +afl agn agn agn @@ -34653,7 +34673,7 @@ aep aeJ aeT acV -afR +afw agE azc ahe @@ -34795,9 +34815,9 @@ aeu aej aeY afh -afl -ahh -azd +afR +agE +asM azg ahn avY @@ -34937,9 +34957,9 @@ aej aeK aeZ afv -afw +ahh aom -asM +awg axL afV aqx @@ -35079,10 +35099,10 @@ aev aej afa afx -awg +ahk agt agG -ahk +azd acV awh asF diff --git a/maps/tether/tether-08-mining.dmm b/maps/tether/tether-08-mining.dmm index 46baeb8736e..762bc25685a 100644 --- a/maps/tether/tether-08-mining.dmm +++ b/maps/tether/tether-08-mining.dmm @@ -265,6 +265,7 @@ pixel_x = 12; pixel_y = 24 }, +/obj/structure/closet/secure_closet/miner, /turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "aL" = ( @@ -426,14 +427,29 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "aZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9; - pixel_y = 0 +/obj/machinery/firealarm{ + dir = 2; + layer = 3.3; + pixel_x = 0; + pixel_y = 26 }, -/turf/simulated/floor/tiled/steel_grid, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/secure_closet/miner, +/turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "ba" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -493,31 +509,17 @@ /turf/simulated/floor/plating, /area/outpost/mining_main/maintenance) "bg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9; + pixel_y = 0 + }, /obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 2; - layer = 3.3; - pixel_x = 0; - pixel_y = 26 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_grid, /area/outpost/mining_main/break_room) "bh" = ( /obj/structure/table/glass, @@ -551,6 +553,9 @@ pixel_y = 3 }, /obj/item/weapon/storage/box/donkpockets, +/obj/machinery/vending/wallmed1{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/outpost/mining_main/break_room) "bj" = ( @@ -778,6 +783,45 @@ }, /turf/simulated/floor/bluegrid, /area/outpost/mining_main/airlock) +"bK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/vending/wallmed_airlock{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/break_room) +"bL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/outpost/mining_main/break_room) "bW" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, @@ -1321,44 +1365,6 @@ }, /turf/simulated/floor/wood, /area/outpost/mining_main/dorms) -"WV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/closet/secure_closet/miner, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/break_room) -"YA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/structure/closet/secure_closet/miner, -/turf/simulated/floor/tiled, -/area/outpost/mining_main/break_room) "Zn" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/borderfloorblack{ @@ -4938,7 +4944,7 @@ at qx aC aE -bg +aZ bv ZV ty @@ -5081,7 +5087,7 @@ ao ao VK aM -aZ +bg Uk Uk by @@ -5224,8 +5230,8 @@ ab VK Uy hW -YA -WV +bK +bL by US az diff --git a/maps/tether/tether-09-solars.dmm b/maps/tether/tether-09-solars.dmm index 1492f503ae7..330602aa6f3 100644 --- a/maps/tether/tether-09-solars.dmm +++ b/maps/tether/tether-09-solars.dmm @@ -394,6 +394,18 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/outpost/solars_outside) +"aQ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/purple/border{ + dir = 4 + }, +/obj/machinery/vending/wallmed_airlock{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost) "aR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/power/solar_control, @@ -6767,9 +6779,14 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "mm" = ( -/obj/structure/table/standard, +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/donkpockets, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/area/rnd/outpost/breakroom) "mn" = ( /obj/machinery/washing_machine, /obj/structure/window/reinforced{ @@ -7166,14 +7183,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "mV" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/obj/effect/floor_decal/rust, +/obj/structure/reagent_dispensers/coolanttank, +/turf/simulated/floor/tiled/steel_dirty, +/area/rnd/outpost/storage) "mW" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -7237,13 +7250,12 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "nf" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/table/woodentable, +/obj/machinery/vending/wallmed1{ + pixel_x = -30 }, /turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/area/rnd/outpost/breakroom) "ng" = ( /obj/effect/floor_decal/industrial/warning/corner, /obj/effect/floor_decal/industrial/warning/corner{ @@ -7257,11 +7269,12 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) "ni" = ( -/obj/structure/table/standard, -/obj/machinery/chemical_dispenser/full, -/obj/machinery/light, +/obj/structure/table/woodentable, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/outpost/anomaly_lab) +/area/rnd/outpost/breakroom) "nj" = ( /obj/structure/filingcabinet/chestdrawer, /obj/structure/window/reinforced{ @@ -7759,14 +7772,12 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenoarch_storage) "of" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/purple/border{ - dir = 4 +/obj/structure/table/standard, +/obj/machinery/vending/wallmed1{ + pixel_y = 30 }, /turf/simulated/floor/tiled, -/area/rnd/outpost) +/area/rnd/outpost/anomaly_lab) "og" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled, @@ -7910,10 +7921,12 @@ /turf/simulated/floor/wood, /area/rnd/outpost/breakroom) "ow" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/anomaly_lab) "ox" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -7984,10 +7997,13 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "oH" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, +/obj/structure/table/standard, +/obj/machinery/light, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/anomaly_lab) "oI" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -8073,6 +8089,17 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"oS" = ( +/obj/structure/table/standard, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/reagent_dispensers/acid{ + pixel_y = -32 + }, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/tiled, +/area/rnd/outpost/anomaly_lab) "oT" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -8117,18 +8144,6 @@ /obj/structure/sign/science, /turf/simulated/wall, /area/rnd/outpost/breakroom) -"pa" = ( -/obj/structure/table/woodentable, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -28 - }, -/obj/item/weapon/storage/box/donkpockets, -/turf/simulated/floor/tiled, -/area/rnd/outpost/breakroom) "pb" = ( /obj/machinery/alarm{ dir = 8; @@ -22502,7 +22517,7 @@ jE ml mG mU -ni +oH jx ab ab @@ -22641,10 +22656,10 @@ ng nV lH jE -mm +of mG -mV -nf +ow +oS jx ab ab @@ -24608,7 +24623,7 @@ dD ch lS oc -of +aQ fd fy fQ @@ -24626,9 +24641,9 @@ ft lc oZ oI -ow -oH -pa +mm +nf +ni oG oP oX @@ -25336,7 +25351,7 @@ iU jf jo ji -hM +mV hM ov op diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index e27ea01c407..44d57d6908e 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -15,6 +15,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -716,6 +717,7 @@ /area/mothership/armory) "bj" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -5017,6 +5019,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -6384,6 +6387,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -16842,6 +16846,7 @@ dir = 1 }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -17672,6 +17677,7 @@ /area/mothership/warden) "FX" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -17762,6 +17768,7 @@ /area/mothership/engineering) "Gl" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -18038,6 +18045,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -18856,6 +18864,7 @@ /area/mothership/telecomms2) "IP" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -18946,6 +18955,7 @@ /area/mothership/armory) "IY" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -19160,6 +19170,7 @@ dir = 4 }, /obj/machinery/power/apc{ + alarms_hidden = 1; cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; @@ -20237,6 +20248,7 @@ /obj/random/mre, /obj/random/mre, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -20429,6 +20441,7 @@ /area/unknown/dorm4) "LY" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -20695,6 +20708,7 @@ /area/mothership/dorm6) "MN" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28 @@ -21750,6 +21764,7 @@ /area/mothership/telecomms2) "Pa" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -22081,6 +22096,7 @@ /area/mothership/kitchen) "PH" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -22134,6 +22150,7 @@ /area/mothership/eva) "PM" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -22603,6 +22620,7 @@ /area/mothership/engineering) "QP" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -22951,6 +22969,7 @@ /obj/item/weapon/tank/oxygen/yellow, /obj/item/weapon/tank/vox, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -23619,6 +23638,7 @@ /area/mothership/holodeck) "Tr" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -23690,6 +23710,7 @@ /obj/item/weapon/book/manual/security_space_law, /obj/structure/closet/secure_closet/nanotrasen_warden, /obj/machinery/power/apc{ + alarms_hidden = 1; cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; @@ -23773,6 +23794,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -23928,6 +23950,7 @@ /area/mothership/hallway) "TZ" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -24529,6 +24552,7 @@ /obj/item/weapon/material/knife, /obj/item/weapon/material/knife, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -24892,6 +24916,7 @@ dir = 1 }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -25222,6 +25247,7 @@ icon_state = "0-2" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -25245,6 +25271,7 @@ /area/unknown/dorm1) "WP" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -25555,6 +25582,7 @@ dir = 8 }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -25815,6 +25843,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0; @@ -26020,6 +26049,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -26077,6 +26107,7 @@ /area/centcom/evac) "YH" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; cell_type = /obj/item/weapon/cell/super; dir = 8; name = "west bump"; @@ -26134,6 +26165,7 @@ icon_state = "0-8" }, /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 2; name = "south bump"; pixel_y = -28; @@ -26401,6 +26433,7 @@ /area/mothership/eva) "Zt" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 4; name = "east bump"; pixel_x = 24 @@ -26556,6 +26589,7 @@ /area/mothership/armory) "ZI" = ( /obj/machinery/power/apc{ + alarms_hidden = 1; dir = 1; name = "north bump"; pixel_x = 0;