diff --git a/code/bos/game/gamemodes/mini_roles/mini_roles.dm b/code/bos/game/gamemodes/mini_roles/mini_roles.dm index ed508a343b3aa..ccd8dc4f60932 100644 --- a/code/bos/game/gamemodes/mini_roles/mini_roles.dm +++ b/code/bos/game/gamemodes/mini_roles/mini_roles.dm @@ -1,4 +1,4 @@ -/datum/game_mode/mini_toles +/datum/game_mode/mini_roles name = "mini roles" round_description = "Everybody have they own targets now!" extended_round_description = "Pure chaos" @@ -7,5 +7,4 @@ required_enemies = 0 antag_tags = list(MODE_MINI_ROLES) antag_scaling_coeff = 1 - end_on_antag_death = FALSE latejoin_antag_tags = list(MODE_MINI_ROLES) diff --git a/code/bos/modules/overmap/exoplanets/planet_types/desert.dm b/code/bos/modules/overmap/exoplanets/planet_types/desert.dm index 94f96fb7fcb99..b8f387d9256bc 100644 --- a/code/bos/modules/overmap/exoplanets/planet_types/desert.dm +++ b/code/bos/modules/overmap/exoplanets/planet_types/desert.dm @@ -128,6 +128,7 @@ if(buckled_mob) overlays += buckled_mob var/image/I = image(icon,icon_state="overlay") + I.plane = GAME_PLANE_FOV_HIDDEN I.layer = ABOVE_HUMAN_LAYER overlays += I diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 802442aabae1f..56b0b9ec4cf9f 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -170,15 +170,16 @@ /datum/trader/gmb name = "Ward-Takahashi GMB" origin = "Automated Manufacturing Station" - trade_flags = TRADER_MONEY + trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL + want_multiplier = 1 speech = list(TRADER_HAIL_GENERIC = "Greetings! It's so nice to talk to a human instead of a robot... Ah, would you like to order some machine?", TRADER_HAIL_DENY = "I'm sorry, but the main AI has forbidden me to communicate with you...", TRADER_TRADE_COMPLETE = "Oh, lovely!", - TRADER_NO_BLACKLISTED = "Whoa whoa, this one is too bad, put it away.", - TRADER_NO_GOODS = "Sorry, but we take only in money.", TRADER_NOT_ENOUGH = "Sorry, but there's not enough here for this order.", + TRADER_FOUND_UNWANTED = "No-no, AI don't need this...", TRADER_HOW_MUCH = "AI say that for one entry of ITEM the price would be VALUE CURRENCY.", + TRADER_WHAT_WANT = "Oh, for our industry we need some stock parts of machinery and powercells.", TRADER_COMPLEMENT_FAILURE = "I am afraid this is beyond my competency.", TRADER_COMPLEMENT_SUCCESS = "Thank you!", @@ -186,6 +187,11 @@ TRADER_INSULT_BAD = "AI probably will be mad..." ) + wanted_items = list( + /obj/item/cell = TRADER_ALL, + /obj/item/stock_parts = TRADER_ALL + ) + possible_trading_items = list(/obj/machinery/mining/drill = TRADER_THIS_TYPE, /obj/machinery/mining/brace = TRADER_THIS_TYPE, /obj/machinery/floodlight = TRADER_THIS_TYPE, diff --git a/code/datums/trading/ship.dm b/code/datums/trading/ship.dm index b77a6d7a9f3e7..df1f691ea11fb 100644 --- a/code/datums/trading/ship.dm +++ b/code/datums/trading/ship.dm @@ -18,8 +18,8 @@ if(prob(-disposition)) return ..() - var/length = round(amt/100) + var/length = round(amt/50) //BoS, was round(amt/100) duration_of_stay += length var/datum/trade_response/tr = make_response(TRADER_BRIBE_SUCCESS, "Sure, I'll stay for TIME more minutes.", -amt, TRUE) tr.text = replacetext_char(tr.text, "TIME", length) - return tr \ No newline at end of file + return tr diff --git a/code/datums/trading/unique.dm b/code/datums/trading/unique.dm index 566907221ff42..7138c8be64614 100644 --- a/code/datums/trading/unique.dm +++ b/code/datums/trading/unique.dm @@ -141,7 +141,7 @@ trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL want_multiplier = 1 margin = 1.1 - price_rng = 3 + price_rng = 5 mob_transfer_message = "You have been teleported somewhere and have lost consciousness. When you come to, you find yourself in a clean white room attached to an operating table, surrounded by people in white coats. After the words: 'Commence surgery', you were taken apart piece by piece without anaesthesia for over an hour. Only death brought you salvation." speech = list(TRADER_HAIL_GENERIC = "Ah, greetings. We looking for some things for our corporation... All for the sake of science and human race.", @@ -161,11 +161,11 @@ ) wanted_items = list( - /mob/living/carbon/human = TRADER_ALL, - /obj/item/organ/internal = TRADER_ALL, /mob/living/carbon/human/machine = TRADER_BLACKLIST_ALL, /obj/item/organ/internal/posibrain = TRADER_BLACKLIST_ALL, - /obj/item/organ/internal/augment = TRADER_BLACKLIST_ALL + /obj/item/organ/internal/augment = TRADER_BLACKLIST_ALL, + /mob/living/carbon/human = TRADER_ALL, + /obj/item/organ/internal = TRADER_ALL ) possible_trading_items = list( @@ -175,5 +175,8 @@ /obj/item/reagent_containers/syringe/zombie = TRADER_THIS_TYPE, /obj/item/reagent_containers/glass/bottle/mutagen = TRADER_THIS_TYPE, /obj/item/reagent_containers/glass/bottle/pacid = TRADER_THIS_TYPE, - /obj/item/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE + /obj/item/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE, + /obj/item/storage/firstaid/combat = TRADER_THIS_TYPE, + /obj/item/storage/firstaid/surgery = TRADER_THIS_TYPE, + /obj/item/storage/backpack/dufflebag/syndie/med/full = TRADER_THIS_TYPE ) diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm index b4835257b43aa..7a158a5ea98bf 100644 --- a/code/datums/trading/weaponry.dm +++ b/code/datums/trading/weaponry.dm @@ -233,23 +233,29 @@ /datum/trader/ship/kaboom name = "Unknown Primitive Signature" origin = "Kadaab Deserts" - speech = list(TRADER_HAIL_GENERIC = "Ka-boom? Funny paper give you, we give you ka-boom.", - TRADER_HAIL_DENY = "No ka-boom for space demons.", + trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL + want_multiplier = 1 + speech = list(TRADER_HAIL_GENERIC = "Ka-boom? Funny paper give you, we give you ka-boom.", + TRADER_HAIL_DENY = "No ka-boom for space demons.", - TRADER_TRADE_COMPLETE = "Make more kaboom with ka-boom.", - TRADER_NO_BLACKLISTED = "Not funny and not kaboom.", - TRADER_NO_GOODS = "Where funny paper.", - TRADER_NOT_ENOUGH = "More paper!!", - TRADER_HOW_MUCH = "Orgh... One, two... VALUE.", + TRADER_TRADE_COMPLETE = "Make more kaboom with ka-boom.", + TRADER_FOUND_UNWANTED = "This not funny and not meal - we not need.", + TRADER_WHAT_WANT = "Ohm, we want eat meal. And drink wata. We not drink wata for... Orgh, many suns.", + TRADER_NOT_ENOUGH = "More paper!!", + TRADER_HOW_MUCH = "Orgh... One, two... VALUE.", - TRADER_COMPLEMENT_FAILURE = "You stoopid.", - TRADER_COMPLEMENT_SUCCESS = "Great ka-boom!", - TRADER_INSULT_GOOD = "My ka-boom is good, you bad space demon!!!", - TRADER_INSULT_BAD = "Erght... What?" + TRADER_COMPLEMENT_FAILURE = "You stoopid.", + TRADER_COMPLEMENT_SUCCESS = "Great ka-boom!", + TRADER_INSULT_GOOD = "My ka-boom is good, you bad space demon!!!", + TRADER_INSULT_BAD = "Erght... What?" ) compliment_increase = 5 insult_drop = 5 + wanted_items = list( + /obj/item/reagent_containers/food = TRADER_ALL + ) + possible_trading_items = list( /obj/item/gun/launcher/grenade = TRADER_THIS_TYPE, /obj/item/gun/projectile/rocket/oneuse = TRADER_THIS_TYPE, diff --git a/code/game/antagonist/station/mini_roles.dm b/code/game/antagonist/station/mini_roles.dm index 1a2b4b2c6f8d3..e775052a6bc31 100644 --- a/code/game/antagonist/station/mini_roles.dm +++ b/code/game/antagonist/station/mini_roles.dm @@ -6,20 +6,24 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) role_text_plural = "Mini Roles" antaghud_indicator = "hud_traitor" flags = ANTAG_RANDSPAWN | ANTAG_VOTABLE - welcome_text = "Хаха, мини роль делает пиу-пиу" + welcome_text = "Вы - мини роль. Не стоит воспринимать мини роль как типичного антагониста. Вы - не антагонист раунда. Вы - протагонист своей истории, будь она маленькая или большая. Действуйте в целях своего персонажа, думайте что выгоднее для него в долгосрочной перспективе. И конечно соблюдайте главное правило - не быть мудаком." antag_text = "Если Вы видите этот текст, то что-то сломалось. Попросите Стивена починить." blacklisted_jobs = list() skill_setter = null + hard_cap = 100 + hard_cap_round = 100 + initial_spawn_target = 100 min_player_age = 0 var/datum/mini_role/mini_role_datum //Container for last mini role var/list/datum/mini_role/all_mini_roles_datums = list() //All in round roles //Whitelists of mini roles for every branch. Don't forget put new mini roles here - var/list/regcom_roles = list(/datum/mini_role/creditor, /datum/mini_role/pyroman) - var/list/syndicate_roles = list(/datum/mini_role/rat, /datum/mini_role/creditor, /datum/mini_role/pyroman) - var/list/traders_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/rat, /datum/mini_role/creditor, /datum/mini_role/link) - var/list/scum_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/contractor, /datum/mini_role/rat, /datum/mini_role/cannibal, /datum/mini_role/pyroman, /datum/mini_role/torch, /datum/mini_role/link) //Barbars and zeki - var/list/other_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/contractor, /datum/mini_role/pyroman, /datum/mini_role/torch, /datum/mini_role/link) + var/list/regcom_roles = list(/datum/mini_role/regcom_agent, /datum/mini_role/creditor, /datum/mini_role/pyroman) + var/list/gov_roles = list(/datum/mini_role/rat, /datum/mini_role/creditor, /datum/mini_role/pyroman, /datum/mini_role/treasure_hunter) + var/list/syndicate_roles = list(/datum/mini_role/syndicate_agent, /datum/mini_role/rat, /datum/mini_role/creditor, /datum/mini_role/pyroman, /datum/mini_role/treasure_hunter) + var/list/traders_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/rat, /datum/mini_role/creditor, /datum/mini_role/link, /datum/mini_role/treasure_hunter) + var/list/scum_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/contractor, /datum/mini_role/rat, /datum/mini_role/cannibal, /datum/mini_role/pyroman, /datum/mini_role/torch, /datum/mini_role/link, /datum/mini_role/mutant, /datum/mini_role/bluespace, /datum/mini_role/treasure_hunter) //Barbars and zeki + var/list/other_roles = list(/datum/mini_role/contrabandist, /datum/mini_role/contractor, /datum/mini_role/pyroman, /datum/mini_role/torch, /datum/mini_role/link, /datum/mini_role/mutant, /datum/mini_role/bluespace, /datum/mini_role/treasure_hunter) /datum/antagonist/mini_roles/create_antagonist(var/datum/mind/target, var/move, var/gag_announcement, var/preserve_appearance) @@ -34,17 +38,17 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) var/mob/living/carbon/human/man_on_check = target.current switch(man_on_check.char_branch.name) if("Regulators") choosen_role = pick(regcom_roles) + if("Government") choosen_role = pick(gov_roles) if("Consortium of Trans-Star Corporations") choosen_role = pick(syndicate_roles) if("Free Trade Union") choosen_role = pick(traders_roles) if("Alternatively Hired") choosen_role = pick(scum_roles) - if("Aborigens") choosen_role = pick(scum_roles) + if("Military") choosen_role = pick(scum_roles) else choosen_role = pick(other_roles) else choosen_role = pick(other_roles) mini_role_datum = new choosen_role mini_role_datum.owner = target - all_mini_roles_datums += mini_role_datum if(!mini_role_datum.additional_check(target.current)) qdel(mini_role_datum) continue @@ -79,12 +83,13 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) player.special_role = mini_role_datum.name var/name = mini_role_datum.name var/desc = mini_role_datum.desc + all_mini_roles_datums += mini_role_datum to_chat(player.current, "Вы - [name]!") if(leader_welcome_text && player == leader) to_chat(player.current, "[get_leader_welcome_text(player.current)]") else to_chat(player.current, "[get_welcome_text(player.current)]") - to_chat(player.current, "[desc]") + to_chat(player.current, SPAN_INFO("[desc]")) mini_role_datum.special_act(player.current) create_objectives(player) @@ -127,9 +132,10 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) player.equip_to_slot(spawned_thing, slot) if(spawned_thing.loc == player) break - var/obj/item/storage/S = locate() in player.contents - if(istype(S)) - spawned_thing.forceMove(S) + for(var/obj/item/storage/S in player.contents) + if((istype(S)) && (S.max_storage_space >= DEFAULT_LARGEBOX_STORAGE)) //Storage space between wallet and backpack + spawned_thing.forceMove(S) + break random_count += 1 else for(var/thing in mini_role_datum.gear) @@ -138,9 +144,10 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) player.equip_to_slot(spawned_thing, slot) if(spawned_thing.loc == player) break - var/obj/item/storage/S = locate() in player.contents - if(istype(S)) - spawned_thing.forceMove(S) + for(var/obj/item/storage/S in player.contents) + if((istype(S)) && (S.max_storage_space >= DEFAULT_LARGEBOX_STORAGE)) //Storage space between wallet and backpack + spawned_thing.forceMove(S) + break ///// // MINI ROLES DATUMS @@ -185,7 +192,7 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/proc/additional_check(var/mob/living/carbon/human/target) if(no_robots) - if((target.species.name == SPECIES_IPC) || (target.species.name == SPECIES_ADHERENT) || (target.species.name == SPECIES_SHELL) || (target.species.name == SPECIES_FBP)) + if((target.species.name == SPECIES_IPC) || (target.species.name == SPECIES_ADHERENT) || (target.species.name == SPECIES_SHELL) || (target.full_prosthetic)) return FALSE if((!can_latejoin) && (round_duration_in_ticks >> 30)) //About 3 seconds after round start @@ -196,12 +203,13 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/contrabandist name = "Контрабандист" - desc = "ЧЗХ, микро трейтор?77" + desc = "Может это была Ваша случайная находка, а может Вы лично выкупили это устройство у одного из местных криминальных боссов. Как-бы то не было, в Ваши руки попал аплинк - устройство с доступом к сети SyndieNet. Вы знаете, что такие устройства запрещены в более чем 60 государствах - но соблазн слишком велик. Может быть, с помощью него Вы сможете вылезти из этого захолустья? Да и если мир полон лжецов и убийц, почему Вы должны играть против них по-честному?" objective = "Сохраните свой аплинк у себя." can_latejoin = FALSE /datum/mini_role/contrabandist/special_act(var/mob/living/carbon/human/target) var/money = target.mind.assigned_job.economic_power * 1000 + rand(-20,20) * 100 + if(money << 0) money += 3000 second_objective = "Имейте [money] кредитов к концу смены." var/TC_amount = rand(40, 80) var/obj/item/device/radio/uplink/U = new(target, null, TC_amount) @@ -211,9 +219,10 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) else if(target.put_in_hands(U)) to_chat(target, "Uplink unit appear in your hands.") + /datum/mini_role/contractor name = "Контрактник" - desc = "Эрис момент" + desc = "Может быть Вы профессиональный наёмник с сотнями голов за спиной, а может Вас просто заставили пойти на это под дулом пистолета. Как-бы то не было, Вы стали теневым работником сети SyndieNet. Всё что у Вас есть - аплинк и контракты. Простая и мирная работа. Разве кому-то мешали шпионящие программы в консолях и импланты слежения в головах?" objective = "Сохраните свой аплинк у себя. Также сохраните свою роль в секрете." can_latejoin = FALSE @@ -225,7 +234,7 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/cannibal name = "Людоед" - desc = "Есть гайских детей" + desc = "Может это уже традиция в Вашей семье, а может у Вас просто не оставалось другого выбора, когда Ваш отряд зажал враг на несколько недель в том проклятом здании. Как-бы то не было, Вы вкусили человеческую плоть - и Вам понравилось. Настолько, что желудок просит ещё. Свежей. Хотя бы взять недавно убитое кем-то другим тело - разве будет оно против?.." objective = "Опробуйте хотя бы один свежий кусочек человеческой плоти к концу смены." no_robots = TRUE gear = list(/obj/item/material/knife/kitchen/cleaver, /obj/item/handcuffs, /obj/item/tape_roll, /obj/item/device/flash, /obj/item/clothing/mask/chameleon/voice, /obj/item/beartrap) @@ -234,8 +243,8 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/rat name = "Крыса" - desc = "Доносики" - objective = "Сохраните свою роль и работодателя в тайне." + desc = "Может они держат в плену всё что Вам дорого, а может Вы уже не в первый раз вставляете нож в спину своим хозяевам. Как-бы то не было, Вы согласились найти для кое-кого компрометирующую информацию на миссию Кастельнау. Ходите, смотрите и слушайте. Эти военные преступники наверняка не заставят Вас долго ждать." + objective = "Доживите до конца смены сохранив свою роль в секрете." gear = list(/obj/item/storage/box/syndie_kit/spy, /obj/item/spacecash/bundle/c2000, /obj/item/storage/box/radiokeys, /obj/item/device/uv_light, /obj/item/device/camera, /obj/item/device/taperecorder) random_gear = 2 @@ -246,20 +255,28 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/creditor name = "Кредитор" - desc = "Где деньги" + desc = "История старая как мир. Добро и зло, кредитор и должник. Может лишить этого должника всего имущества в уплату долга? Или пусть как-то отработает? А может нанять вышибал, чтобы вернуть хотя бы часть долга? Тут нет ничего личного - что поделать, если деньги правят миром." double = TRUE /datum/mini_role/creditor/special_act(var/mob/living/carbon/human/target) var/debt debt = mini_target.assigned_job.economic_power * 1000 - rand(-40,1) * 100 + if(debt << 0) debt += 4000 objective = "[mini_target]([mini_target.assigned_job.title]) задолжал Вам [debt] кредитов. Добейтесь от должника возвращения долга до конца смены." double_text = "Вы вспоминаете, что то ли по пьяне, то ли из-за смертельной угрозы, то ли просто по случайности, но Вы должны [owner] [debt] кредитов. Не сказать, что бы Вам хотелось с ними раставаться..." double_objective = "Избегать отдачи долга в [debt] кредитов [owner]([owner.assigned_job.title])." + //Creates objective, because in time when double_act is executed, double_text is not exist + to_chat(mini_target, "[double_text]") + var/datum/objective/mini_target_obj = new + mini_target_obj.owner = mini_target + mini_target_obj.explanation_text = double_objective + mini_target.objectives |= mini_target_obj + show_objectives(mini_target) /datum/mini_role/pyroman name = "Пироман" - desc = "Ай феар нот мэн, бат..." + desc = "Дни похожи один на другой, всё это затягивается в вечный круговорот безликих людей в войне за выживание. Но среди этой постоянной резни порой просачивается луч надежды. Хаотичный, но такой приятный и греющий огонь, приносящий Вам счастье в эти тяжёлые дни. Кто же заметит, если на Кадаабе сгорит случайное здание? Может, конечно, вся эта миссия и в правду тяжело сказывается на Вашем рассудке, но разве не все говорят, что вечно смотреть можно на три вещи?.." objective = "Наслаждайтесь огнём. Сдережируйте небольшой пожар, став его главным зрителем." gear = list(/obj/item/storage/firstaid/fire, /obj/item/storage/box/beakers, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/bottle/specialwhiskey, /obj/item/flamethrower, /obj/item/clothing/mask/gas/cbrn) random_gear = 2 @@ -267,32 +284,32 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) /datum/mini_role/torch name = "Торчок" - desc = "Хе-хе" + desc = "Может в этом проклятом мире для отдыха просто не осталось других способов, а может Вы просто подумали, что эта была таблетка от головной боли. Как-бы то не было, Вы подсели на наркотики. Сильно подсели. Вам уже даже без разницы что принимать, лишь бы это могло помочь Вам отвлечься от этого мира." objective = "Запасите несколько доз на будущее. Чем больше - тем лучше." no_robots = TRUE - gear = list(/obj/item/seeds/ambrosiadeusseed, /obj/item/reagent_containers/hypospray/autoinjector/mindbreaker, /obj/item/storage/firstaid/toxin, /obj/item/storage/box/syringes, /obj/item/storage/pill_bottle/three_eye, /obj/item/gun/projectile/pistol/holdout) + gear = list(/obj/item/seeds/ambrosiadeusseed, /obj/item/reagent_containers/hypospray/autoinjector/mindbreaker, /obj/item/storage/firstaid/toxin, /obj/item/storage/box/syringes, /obj/item/storage/pill_bottle/three_eye, /obj/random/handgun) random_gear = 2 /datum/mini_role/link name = "Связной" - desc = "Шпион драмма" - objective = "Найдите агента, которому Вы должны передать информацию о том, что " + desc = "Может это Ваша не первая миссия такого рода, а может Вас ждёт утопление в озере с крокодилами, если Вы не сделайте приказанное. Как-бы то не было, Вам передали пакет важной информации о местном экипаже. Осталось найти того, кому нужно передать все эти данные." + objective = "Найдите агента, которому Вы должны передать информацию о том, что" + second_objective = "Доживите до конца смены не придав свою роль широкой огласке." double = TRUE + gear = list(/obj/random/handgun) double_text = "Где-то рядом с Вами должен находится связной, который может обладать интересной и полезной информацией. Найдите его и получите эту информацию." double_objective = "Найдите и установите контакт с связным." - gear = list() - random_gear = 2 //Put names of possible coop roles in list below - var/connected_roles = list("Крыса", "Контрактник") + var/connected_roles = list(/datum/mini_role/rat, /datum/mini_role/contractor) /datum/mini_role/link/additional_check(var/mob/living/carbon/human/target) var/try_amount = 0 var/list/unmasked_roles = list() while(try_amount != 4) var/datum/mini_role/picked_role = pick(GLOB.mini_role.all_mini_roles_datums) - if((is_type_in_list(picked_role.name, connected_roles)) || (picked_role.owner == target.mind)) + if((is_type_in_list(picked_role, connected_roles)) || (picked_role.owner == target.mind)) try_amount += 1 continue unmasked_roles += picked_role @@ -302,28 +319,27 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) return FALSE for(var/datum/mini_role/unmasked in unmasked_roles) - var/add_text = "[unmasked.owner]([unmasked.owner.assigned_job.title]) - [unmasked.name]," + var/add_text = " [unmasked.owner]([unmasked.owner.assigned_job.title]) - [unmasked.name];" objective += add_text return TRUE - /datum/mini_role/link/double_act(var/datum/mind/obj_owner) var/list/possible_targets = list() - for(var/datum/mind/possible_target in SSticker.minds) - if((ishuman(possible_target.current)) && (possible_target.current.stat != DEAD) && (is_type_in_list(possible_target.special_role, connected_roles))) - possible_targets += possible_target + for(var/datum/mini_role/maybe_target in GLOB.mini_role.all_mini_roles_datums) + if((is_type_in_list(maybe_target, connected_roles)) && (maybe_target.owner.current.stat != DEAD)) + possible_targets += maybe_target.owner if(possible_targets.len > 0) mini_target = pick(possible_targets) - to_chat(mini_target, "[double_text]") - to_chat(mini_target, "Для поиска потенциальных союзников Вы были снабжены опозновательными словами:") - to_chat(mini_target, "Кодовые слова: [GLOB.antag_code_phrase]") - to_chat(mini_target, "Кодовые ответы: [GLOB.antag_code_response]") + to_chat(mini_target.current, "[double_text]") + to_chat(mini_target.current, "Для поиска потенциальных союзников Вы были снабжены опозновательными словами:") + to_chat(mini_target.current, "Кодовые слова: [GLOB.antag_code_phrase]") + to_chat(mini_target.current, "Кодовые ответы: [GLOB.antag_code_response]") mini_target.StoreMemory("Кодовые слова: [GLOB.antag_code_phrase]", /decl/memory_options/system) mini_target.StoreMemory("Кодовые ответы: [GLOB.antag_code_response]", /decl/memory_options/system) - to_chat(owner, "Для поиска потенциальных союзников Вы были снабжены опозновательными словами:") - to_chat(owner, "Кодовые слова: [GLOB.antag_code_phrase]") - to_chat(owner, "Кодовые ответы: [GLOB.antag_code_response]") + to_chat(owner.current, "Для поиска потенциальных союзников Вы были снабжены опозновательными словами:") + to_chat(owner.current, "Кодовые слова: [GLOB.antag_code_phrase]") + to_chat(owner.current, "Кодовые ответы: [GLOB.antag_code_response]") owner.StoreMemory("Кодовые слова: [GLOB.antag_code_phrase]", /decl/memory_options/system) owner.StoreMemory("Кодовые ответы: [GLOB.antag_code_response]", /decl/memory_options/system) @@ -335,3 +351,168 @@ GLOBAL_DATUM_INIT(mini_role, /datum/antagonist/mini_roles, new) return TRUE else return FALSE + + +/datum/mini_role/regcom_agent + name = "Агент РегКома" + desc = "Краем уха Вы услышали о будущих приказах фрау Марты к Кастельнау. Если Вы сможете сделать приказ ещё до того, как он опубликуется, то Вас может ждать очень приятная награда. Конечно, лучше будет сделать вид что всё это вышло 'случайно'." + gear = list(/obj/item/storage/lockbox/loyalty, /obj/item/storage/box/syndie_kit/imp_explosive, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/spacecash/bundle/c2000, + /obj/item/spacecash/bundle/c2000, /obj/item/spacecash/bundle/c2000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000, /obj/item/spacecash/bundle/c1000) + random_gear = 3 + +/datum/mini_role/regcom_agent/special_act(var/mob/living/carbon/human/target) + var/quest = pick("РегКом желает провести акцию устрашения на Кадаабе. Вздёрните врагов на фонарные столбы, сожгите город, расставьте пики с головами.", + "РегКом желает расширения аванпоста. Отремонтируйте старые здания, перенесите укрепления, улучшите электростанции.", + "РегКом желает видеть внедрение экзоскелетов в миссию. Соберите ресурсы, организуйте мехопроизводство, создайте отряд бронированной кавалерии.", + "РегКом желает увидеть самостоятельность миссии. Пополните бюджет миссии(бюджет Кастельнау) до [1000*rand(25,40)] кредитов.", + "РегКом желает пополнить список членов миссии. Примите несколько доверенных людей с планеты или любого другого места в экипаж миссии, занеся их в манифест.") + objective = quest + + +/datum/mini_role/syndicate_agent + name = "Агент Синдиката" + desc = "Одной из влиятельных персон в Синдикате вдруг что-то потребовалось от миссии Кастельнау. Если Вы сможете выполнить это желание, то возможно сможете рассчитывать на небольшую дачу на Кингстоне." + gear = list(/obj/item/storage/fancy/supply_box/grenade, /obj/item/storage/toolbox/syndicate, /obj/item/storage/box/syndie_kit/toxin, /obj/item/storage/box/syndie_kit/silenced) + random_gear = 1 + +/datum/mini_role/syndicate_agent/special_act(var/mob/living/carbon/human/target) + var/quest = pick("Синдикат хочет видеть увеличение своего влияния на Кадаабе. Создайте оперативную базу Синдиката, вербуйте оттуда людей с планеты, развешайте корпоративные листовки.", + "Синдикат в будущем желает провести реновацию Кадааба. Взорвите несколько из старых бесполезныех зданий, очистив землю для будущих построек.", + "Синдикат размышляет над отправкой дополнительного контингента на Кадааб. Запасите для него любое оружие и патроны - создайте отдельный склад, если потребуется.", + "Синдикат желает свободной конкуренции с ВТС. Попытайтесь уменьшить доходы Скряги - откройте свой магазин или скомпроментируйте ВТС. Оставьте свою роль в тайне.", + "Синдикат разыскивает ещё не обнаруженных людей с псионическим потенциалом. Найдите таковых, пробуждайте людей триглазом если необходимо.") + objective = quest + + +/datum/mini_role/mutant + name = "Мутант" + desc = "Может это сбой в криокамерах, а может просто обычное влияние космическое радиации. Как-бы то не было, Вы уже перестали быть тем, чем были раньше. Вы не представитель своего рода, а чёртов мутант. С одной стороны, возможно даже в чём-то Вы превосходите 'нормальных', с другой можно быть уверенным, что Ваше тело с готовностью будут резать все учёные мира. К тому же, Вы стали голодать чуть быстрее чем обычно..." + objective = "Доживите до конца смены, сохранив свою роль в тайне." + second_objective = "Запасите как можно больше еды к концу смены." + no_robots = TRUE + +/datum/mini_role/mutant/special_act(var/mob/living/carbon/human/target) + var/datum/species/mutant_species = new target.species.type //Create new species for our mutant and edit it below + mutant_species.hunger_factor *= 2 + mutant_species.thirst_factor *= 2 + //"Generating" our mutant next + var/abilities = 0 + var/abilities_need = rand(2,3) + var/list/possible_abilities = list("blood_abil", "bone_abil", "crawler_abil", "weaver_abil", "fov_abil", "silent_abil") + var/picked_ability + while(abilities != abilities_need) + picked_ability = pick(possible_abilities) + switch(picked_ability) + if("blood_abil") + target.remove_blood(target.species.blood_volume) //Remove old blood to add new colored one + mutant_species.blood_color = RANDOM_RGB + mutant_species.total_health += rand(10,40) + mutant_species.blood_volume += rand(-100,100) + to_chat(target, SPAN_NOTICE("С Вашей кровью что-то не то... Кажется она эффективнее обычной, но имеет другой цвет.")) + if("bone_abil") + mutant_species.bone_material = pick(MATERIAL_BONE_FISH, MATERIAL_CRYSTAL, MATERIAL_PLATINUM, MATERIAL_RESIN, MATERIAL_PHORON, MATERIAL_GLASS) + to_chat(target, SPAN_NOTICE("В Ваших костях что-то изменилось. Вероятно, они состоят теперь из чего-то другого.")) + if("crawler_abil") + mutant_species.inherent_verbs += list(/mob/living/proc/ventcrawl) + target.can_enter_vent_with += list(/obj/item, /obj/item/clothing, /obj/effect, /obj/screen) //Can enter in vent with almost anything + to_chat(target, SPAN_NOTICE("Ваше тело стало невероятно гибким. Наверное, Вы даже сможете пролезть в вентеляцию...")) + if("weaver_abil") + mutant_species.is_weaver = TRUE + mutant_species.silk_color = RANDOM_RGB + mutant_species.inherent_verbs += list(/mob/living/carbon/human/proc/check_silk_amount, /mob/living/carbon/human/proc/toggle_silk_production, + /mob/living/carbon/human/proc/weave_structure, /mob/living/carbon/human/proc/weave_item) + to_chat(target, SPAN_NOTICE("Иногда из ниоткуда у Вас появляется шёлк ручного производства.")) + if("fov_abil") + mutant_species.datum_usefov = FALSE + for(var/obj/screen/screen_effects in target.contents) + if((istype(screen_effects, /obj/screen/fov_blocker)) || (istype(screen_effects, /obj/screen/fov_shadow))) qdel(screen_effects) + to_chat(target, SPAN_NOTICE("Ваши пять чувств вышли за все известные пределы. Никто не сможет подойти к Вам не замеченным.")) + if("silent_abil") + mutant_species.silent_steps = TRUE + mutant_species.species_flags += SPECIES_FLAG_NO_SLIP + to_chat(target, SPAN_NOTICE("Стопы приобрели странную форму. Ваши шаги бесшумны, к тому же Вы не подскальзываетесь.")) + possible_abilities -= picked_ability + abilities += 1 + + target.species = mutant_species + mutant_species.handle_post_spawn(target) + target.rejuvenate() + + +/datum/mini_role/bluespace + name = "Провидец" + desc = "Кажется, Вы нашли этот 'артефакт' во время блюспейс колебаний... Или после того как упали с лестницы - точно не вспомнить. Важно то, что артефакт приоткрыл для Вас завесу вселенной. Обычные люди даже не представляют, внутри чего они живут. Вы же увидели правду. Этот шум на окраинах, на который никто не обращает внимания; этот сектор, выходя из которого оказываешься в его противоположной стороне; это существо, которое все ищут и имя которого Вы стали бояться называть. Мир не таков, каков он кажется на первый взгляд." + objective = "Доживите до конца смены, сохранив свой артефакт и не предав свою роль широкой огласке." + second_objective = "Изучите свои спосбности и артефакт, попытайтесь найти таких же." + no_robots = TRUE + gear = list(/obj/item/summoning_stone, /obj/item/scrying, /obj/item/dice/d20/cursed, /obj/item/storage/belt/soulstone/full, /obj/item/gun/energy/staff/animate, /obj/item/gun/energy/staff) + random_gear = 1 + +/datum/mini_role/bluespace/special_act(var/mob/living/carbon/human/target) + var/list/possible_spells = list(/spell/veil_of_shadows, /spell/invisibility, /spell/portal_teleport, /spell/mark_recall, /spell/aoe_turf/conjure/forcewall, + /spell/aoe_turf/exchange_wounds, /spell/aoe_turf/conjure/carp, /spell/radiant_aura, /spell/aoe_turf/blink, /spell/targeted/swap, /spell/targeted/heal_target/sacrifice, + /spell/targeted/heal_target/trance, /spell/targeted/projectile/magic_missile) + var/spell/spell_1 + var/spell/spell_2 + + target.add_spell(new /spell/noclothes) + spell_1 = pick(possible_spells) + target.add_spell(new spell_1) + + spell_2 = pick(possible_spells) + target.add_spell(new spell_2) + + +/datum/mini_role/treasure_hunter + name = "Искатель сокровищ" + desc = "Может Вы купили это устройство у подозрительной личности с тростью за половину своих сбережений, а может просто сняли его с забытого трупа на Кадаабе. В любом случае, как Вы поняли, эта штучка указывает на некий тайник... Вероятно полный ценностей." + objective = "При помощи поискового устройства найдите и вскройте тайник." + no_robots = TRUE + gear = list(/obj/item/device/flashlight/upgraded, /obj/item/device/gps/marker, /obj/item/crowbar/prybar, /obj/item/storage/fancy/supply_box/flare) + random_gear = 1 + var/weakref/treasure + +/datum/mini_role/treasure_hunter/special_act(var/mob/living/carbon/human/target) + //Giving pinpointer + var/obj/item/pinpointer/pinpointer = new /obj/item/pinpointer/advpinpointer(get_turf(target)) + var/obj/O = target.equip_to_storage(pinpointer) + if(O) + to_chat(target, "Pinpointer can be found in your [O.name].") + else if(target.put_in_hands(pinpointer)) + to_chat(target, "Pinpointer appear in your hands.") + + //If there other hunters, then give pinpointer target on their treasure and end special_act + for(var/datum/mini_role/treasure_hunter/existing_hunter in GLOB.mini_role.all_mini_roles_datums) + if(existing_hunter.treasure) + treasure = existing_hunter.treasure + pinpointer.target = treasure + break + else //If not, then create our own treasure + var/list/turf/avalible_turfs = get_subarea_turfs(/area/cadaab/caves, list(/proc/is_turf_no_mines_and_walls)) + var/turf/selected_turf = pick(avalible_turfs) + treasure = weakref(new /obj/structure/closet/crate/secure/loot(selected_turf)) + pinpointer.target = treasure + break + +/* Tired +/datum/mini_role/cyborg + name = "Киборг" + desc = "Китайский" + objective = "Закончите смену либо с новыми аугментами, либо убрав все уже установленные." + no_robots = TRUE + +/datum/mini_role/cyborg/special_act(var/mob/living/carbon/human/target) + var/list/possible_augments = list() + + +/datum/mini_role/authority + name = "Авторитет" + desc = "Девяностые" + objective = "Доживите до конца смены вместе со всеми членами своей группировки." + gear = list(/obj/random/handgun, /obj/item/clothing/mask/balaclava, /obj/item/storage/box/syndie_kit/imp_imprinting, /obj/item/grenade/smokebomb, /obj/item/spacecash/bundle/c1000, /obj/item/melee/energy/knife) + random_gear = 2 + +/datum/mini_role/authority/special_act(var/mob/living/carbon/human/target) + var/need_members_amount = rand(2,4) + second_objective = "Завербуйте в свою группировку как минимум [need_members_amount] лица." +*/ diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index d1184ca342796..db14456abf80d 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -173,6 +173,8 @@ would spawn and follow the beaker, even if it is carried or thrown. name = "smoke" icon_state = "smoke" opacity = 1 + plane = DECORATIONS_PLANE //BoS + layer = 5 //BoS anchored = FALSE mouse_opacity = 0 var/amount = 6.0 diff --git a/code/modules/aspects/traps.dm b/code/modules/aspects/traps.dm index f61761484147f..9794be0202763 100644 --- a/code/modules/aspects/traps.dm +++ b/code/modules/aspects/traps.dm @@ -3,7 +3,7 @@ /datum/round_aspect/traps name = "Минное поле" - chance = 25 + chance = 20 weight = ASPECT_WEIGHT_TRAPS announce_text = "Ночью чёртовы пираты расставили вокруг и внутри аванпоста около сотни мин. Смотрите под ноги на Кадаабе!" var/area/spawn_area = /area/maintenance diff --git a/code/modules/client/preference_setup/antagonism/01_candidacy.dm b/code/modules/client/preference_setup/antagonism/01_candidacy.dm index dce7f57aba4b6..9eddd50d842f3 100644 --- a/code/modules/client/preference_setup/antagonism/01_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/01_candidacy.dm @@ -39,7 +39,6 @@ var/datum/antagonist/antag = all_antag_types[antag_type] if(antag.id == MODE_MINI_ROLES) //BoS continue - . += "[antag.role_text]: " if(jobban_isbanned(preference_mob(), antag.id) || (antag.id == MODE_MALFUNCTION && jobban_isbanned(preference_mob(), "AI"))) . += "\[BANNED\]
" diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index be8d54226503a..8a1e14049e55a 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -16,10 +16,12 @@ var/global/list/worths = list( /obj/item/reagent_containers/spray = -23, /obj/item/reagent_containers/food/snacks/monkeycube = -25, /obj/item/reagent_containers/food/snacks/human = -300, - /obj/item/reagent_containers/food/snacks/sliceable = -15, - /obj/item/reagent_containers/food/snacks/slice = -3, - /obj/item/reagent_containers/food/drinks/bottle = -11, - /obj/item/reagent_containers/food/drinks = -8, + /obj/item/reagent_containers/food/snacks/sliceable = -30, + /obj/item/reagent_containers/food/snacks/slice = -20, + /obj/item/reagent_containers/food/snacks/meat = -35, + /obj/item/reagent_containers/food/drinks/bottle = -20, + /obj/item/reagent_containers/food/drinks = -10, + /obj/item/reagent_containers/food = -15, /obj/item/reagent_containers/glass/rag = -5, /obj/item/reagent_containers/glass/bottle/mutagen = 1800, /obj/item/reagent_containers/glass/bottle/pacid = 700, @@ -177,11 +179,11 @@ var/global/list/worths = list( /obj/item/cell/device = 100, /obj/item/cell/crap = 30, /obj/item/cell/standard = 80, - /obj/item/cell/high = 160, - /obj/item/cell/super = 280, - /obj/item/cell/hyper = 310, + /obj/item/cell/high = 130, + /obj/item/cell/super = 250, + /obj/item/cell/hyper = 500, /obj/item/cell/infinite = 50000, - /obj/item/cell/potato = 1, + /obj/item/cell/potato = 10, /obj/item/cell/slime = 160, //SMES COILS, /obj/item/stock_parts/smes_coil/weak = 1000, diff --git a/code/modules/mechs/premade/_premade.dm b/code/modules/mechs/premade/_premade.dm index 58186830f57f5..cea6c3de655b5 100644 --- a/code/modules/mechs/premade/_premade.dm +++ b/code/modules/mechs/premade/_premade.dm @@ -129,19 +129,19 @@ var/mech_colour = super_random ? FALSE : pick(use_colours) if(!arms) - var/armstype = pick(typesof(/obj/item/mech_component/manipulators)-/obj/item/mech_component/manipulators) + var/armstype = pick(typesof(/obj/item/mech_component/manipulators)-/obj/item/mech_component/manipulators -/obj/item/mech_component/manipulators/bike) arms = new armstype(src) arms.color = mech_colour ? mech_colour : pick(use_colours) if(!legs) - var/legstype = pick(typesof(/obj/item/mech_component/propulsion)-/obj/item/mech_component/propulsion) + var/legstype = pick(typesof(/obj/item/mech_component/propulsion)-/obj/item/mech_component/propulsion -/obj/item/mech_component/propulsion/bike) legs = new legstype(src) legs.color = mech_colour ? mech_colour : pick(use_colours) if(!head) - var/headtype = pick(typesof(/obj/item/mech_component/sensors)-/obj/item/mech_component/sensors) + var/headtype = pick(typesof(/obj/item/mech_component/sensors)-/obj/item/mech_component/sensors -/obj/item/mech_component/sensors/bike) head = new headtype(src) head.color = mech_colour ? mech_colour : pick(use_colours) if(!body) - var/bodytype = pick(typesof(/obj/item/mech_component/chassis)-/obj/item/mech_component/chassis) + var/bodytype = pick(typesof(/obj/item/mech_component/chassis)-/obj/item/mech_component/chassis -/obj/item/mech_component/chassis/bike) //BoS, here and above add -bike_parts body = new bodytype(src) body.color = mech_colour ? mech_colour : pick(use_colours) . = ..() diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 0d6f4b6b7e0d8..90036dff8d2fc 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -18,7 +18,7 @@ generate_loot() -/obj/structure/closet/crate/secure/loot/proc/generate_loot() +/obj/structure/closet/crate/secure/loot/proc/generate_loot() //BoS - we change very many things here var/loot = rand(1, 100) switch(loot) if(1 to 5) // Common things go, 5% @@ -26,6 +26,7 @@ new/obj/item/reagent_containers/food/drinks/bottle/whiskey(src) new/obj/item/reagent_containers/food/snacks/grown/ambrosiadeus(src) new/obj/item/flame/lighter/zippo(src) + new/obj/item/storage/fancy/cigar(src) if(6 to 10) new/obj/item/pickaxe/drill(src) new/obj/item/device/taperecorder(src) @@ -37,36 +38,28 @@ for(var/i = 0, i < 10, i++) new/obj/item/ore/diamond(src) if(21 to 25) - for(var/i = 0, i < 3, i++) - new/obj/machinery/portable_atmospherics/hydroponics(src) + new/obj/machinery/acting/changer(src) if(26 to 30) for(var/i = 0, i < 3, i++) new/obj/item/reagent_containers/glass/beaker/noreact(src) - if(31 to 35) - spawn_money(rand(300,800), src) - if(36 to 40) - new/obj/item/melee/baton(src) - if(41 to 45) - new/obj/item/clothing/under/shorts/red(src) - new/obj/item/clothing/under/shorts/blue(src) - if(46 to 50) - new/obj/item/clothing/under/chameleon(src) - for(var/i = 0, i < 7, i++) - new/obj/item/clothing/accessory/horrible(src) + if(31 to 50) + spawn_money(rand(300,8000), src) if(51 to 52) // Uncommon, 2% each - new/obj/item/melee/classic_baton(src) + new/obj/item/material/sword/katana/vibro(src) if(53 to 54) new/obj/item/latexballon(src) if(55 to 56) - var/newitem = pick(typesof(/obj/item/toy/prize) - /obj/item/toy/prize) - new newitem(src) + for(var/i = 0, i < 3, i++) + new/obj/random/handgun(src) + new/obj/random/energy(src) if(57 to 58) - new/obj/item/toy/balloon(src) + for(var/i = 0, i < 4, i++) + new/obj/item/grenade/frag/high_yield(src) if(59 to 60) - new/obj/item/rig(src) + new/obj/item/rig/infantry/sl/equipped(src) if(61 to 62) - for(var/i = 0, i < 12, ++i) - new/obj/item/clothing/head/kitty(src) + for(var/i = 0, i < 8, ++i) + new/obj/item/stack/material/gold/ten(src) if(63 to 64) var/t = rand(4,7) for(var/i = 0, i < t, ++i) @@ -80,21 +73,28 @@ var/newitem = pick(typesof(/obj/item/stock_parts) - /obj/item/stock_parts - /obj/item/stock_parts/subspace) new newitem(src) if(69 to 70) - new/obj/item/pickaxe/silver(src) + for(var/i = 0, i < 3, i++) + new/obj/random/biggun(src) + new/obj/random/lilgun(src) if(71 to 72) - new/obj/item/pickaxe/drill(src) + new/obj/item/gun/projectile/rocket(src) + new/obj/item/ammo_casing/rocket(src) + new/obj/item/ammo_casing/rocket/point_rocket(src) + new/obj/item/ammo_casing/rocket/shrapnel_rocket(src) if(73 to 74) - new/obj/item/pickaxe/jackhammer(src) + new/obj/item/gun/projectile/rocket/oneuse(src) + new/obj/item/gun/projectile/rocket/oneuse(src) if(75 to 76) - new/obj/item/pickaxe/diamond(src) + new/obj/item/storage/backpack/chameleon/sydie_kit(src) if(77 to 78) - new/obj/item/pickaxe/diamonddrill(src) + new/obj/item/storage/lockbox/loyalty(src) if(79 to 80) new/obj/item/pickaxe/gold(src) if(81 to 82) - new/obj/item/gun/energy/plasmacutter(src) + new/obj/item/storage/box/syndie_kit/imp_imprinting(src) + new/obj/item/storage/box/syndie_kit/imp_explosive(src) if(83 to 84) - new/obj/item/toy/katana(src) + new/obj/item/card/emag(src) if(85 to 86) new/obj/item/seeds/random(src) if(87) // Rarest things, some are unobtainble otherwise, some are just robust, 1% each @@ -106,7 +106,7 @@ if(91) new/obj/item/device/soulstone(src) if(92) - new/obj/item/material/sword/katana(src) + new/obj/item/device/chameleon(src) if(93) new/obj/item/storage/firstaid/combat(src) // Probably the least OP if(94) // Why the hell not @@ -136,7 +136,7 @@ new/obj/item/storage/belt/champion(src) new/obj/item/clothing/mask/luchador(src) if(100) - new/obj/item/clothing/head/bearpelt(src) + new/obj/machinery/power/supermatter/shard(src) /obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob) if(!locked) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 0089155926353..772359a23a009 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -1,6 +1,6 @@ /mob density = TRUE - plane = GAME_PLANE_FOV_HIDDEN + plane = GAME_PLANE_FOV_HIDDEN //BoS layer = MOB_LAYER appearance_flags = PIXEL_SCALE | LONG_GLIDE diff --git a/maps/away/cadaab/icons/turfs.dmi b/maps/away/cadaab/icons/turfs.dmi index 3bf826a8a4714..995926d6199d7 100644 Binary files a/maps/away/cadaab/icons/turfs.dmi and b/maps/away/cadaab/icons/turfs.dmi differ diff --git a/maps/away/ellipse/ellipse_areas.dm b/maps/away/ellipse/ellipse_areas.dm index 15c0a28132aa8..d012d0c49b9bd 100644 --- a/maps/away/ellipse/ellipse_areas.dm +++ b/maps/away/ellipse/ellipse_areas.dm @@ -1,25 +1,25 @@ -/area/ellipse/bridge - name = "\improper Ellipse Bridge" - icon_state = "bridge" - icon = 'ellipse_icons.dmi' - req_access = list(access_ellipse) -/area/ellipse/atom - name = "\improper Ellipse Genearator Room" - icon_state = "atom" - icon = 'ellipse_icons.dmi' - req_access = list(access_ellipse) -/area/ellipse/arsenal - name = "\improper Ellipse Arsenal" - icon_state = "arsenal" - icon = 'ellipse_icons.dmi' - req_access = list(access_ellipse) -/area/ellipse/research - name = "\improper Ellipse Research Room" - icon_state = "research" - icon = 'ellipse_icons.dmi' - req_access = list(access_ellipse) -/area/ellipse/shuttle - name = "\improper Ellipse Landing Shuttle" - icon_state = "shuttle" - icon = 'ellipse_icons.dmi' +/area/ellipse/bridge + name = "\improper Ellipse Bridge" + icon_state = "bridge" + icon = 'ellipse_icons.dmi' + req_access = list(access_ellipse) +/area/ellipse/atom + name = "\improper Ellipse Genearator Room" + icon_state = "atom" + icon = 'ellipse_icons.dmi' + req_access = list(access_ellipse) +/area/ellipse/arsenal + name = "\improper Ellipse Arsenal" + icon_state = "arsenal" + icon = 'ellipse_icons.dmi' + req_access = list(access_ellipse) +/area/ellipse/research + name = "\improper Ellipse Research Room" + icon_state = "research" + icon = 'ellipse_icons.dmi' + req_access = list(access_ellipse) +/area/ellipse/shuttle + name = "\improper Ellipse Landing Shuttle" + icon_state = "shuttle" + icon = 'ellipse_icons.dmi' req_access = list(access_ellipse) \ No newline at end of file diff --git a/maps/away/ellipse/ellipse_shuttle.dm b/maps/away/ellipse/ellipse_shuttle.dm index 94c73de98dd68..f681ba89aa29c 100644 --- a/maps/away/ellipse/ellipse_shuttle.dm +++ b/maps/away/ellipse/ellipse_shuttle.dm @@ -1,31 +1,31 @@ -/obj/effect/overmap/visitable/ship/landable/landing_shuttle/land - name = "Land-042" - desc = "Small shuttle with Ellipse Fleet markings." - shuttle = "Land-042" - -/datum/shuttle/autodock/overmap/landing_shuttle/land - name = "Land-042" - shuttle_area = list(/area/ellipse/shuttle) - dock_target = "land_shuttle" - current_location = "nav_dock_land" - landmark_transition = "nav_transit_land" - logging_home_tag = "nav_dock_land" - logging_access = access_ellipse - defer_initialisation = TRUE - multiz = 1 - flags = SHUTTLE_FLAGS_PROCESS - -/obj/machinery/computer/shuttle_control/explore/land - name = "Land-042 control console" - shuttle_tag = "Land-042" - req_access = list(access_ellipse) - -/obj/effect/shuttle_landmark/land - name = "Land-042" - landmark_tag = "nav_dock_land" - base_area = /area/ellipse/shuttle - movable_flags = MOVABLE_FLAG_EFFECTMOVE - -/obj/effect/shuttle_landmark/transit/land - name = "In transit" +/obj/effect/overmap/visitable/ship/landable/landing_shuttle/land + name = "Land-042" + desc = "Small shuttle with Ellipse Fleet markings." + shuttle = "Land-042" + +/datum/shuttle/autodock/overmap/landing_shuttle/land + name = "Land-042" + shuttle_area = list(/area/ellipse/shuttle) + dock_target = "land_shuttle" + current_location = "nav_dock_land" + landmark_transition = "nav_transit_land" + logging_home_tag = "nav_dock_land" + logging_access = access_ellipse + defer_initialisation = TRUE + multiz = 1 + flags = SHUTTLE_FLAGS_PROCESS + +/obj/machinery/computer/shuttle_control/explore/land + name = "Land-042 control console" + shuttle_tag = "Land-042" + req_access = list(access_ellipse) + +/obj/effect/shuttle_landmark/land + name = "Land-042" + landmark_tag = "nav_dock_land" + base_area = /area/ellipse/shuttle + movable_flags = MOVABLE_FLAG_EFFECTMOVE + +/obj/effect/shuttle_landmark/transit/land + name = "In transit" landmark_tag = "nav_transit_land" \ No newline at end of file diff --git a/maps/away/piratestation/pirate_station_areas.dm b/maps/away/piratestation/pirate_station_areas.dm index 94d22ce8622d7..7d93c4f1f7043 100644 --- a/maps/away/piratestation/pirate_station_areas.dm +++ b/maps/away/piratestation/pirate_station_areas.dm @@ -1,69 +1,69 @@ -/area/pirate_station/cl - name = "\improper Corridor L" - icon_state = "cl" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/cr - name = "\improper Corridor R" - icon_state = "cr" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/dorm - name = "\improper Dormitory" - icon_state = "dorm" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/dathroom - name = "\improper Bathroom" - icon_state = "dat" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/med - name = "\improper Medical" - icon_state = "med" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/hangar - name = "\improper Hangar" - icon_state = "hangar" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/canteen - name = "\improper Canteen" - icon_state = "eat" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/engin - name = "\improper Engineering" - icon_state = "Eng" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/kitchen - name = "\improper Kitchen" - icon_state = "kitch" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/armory - name = "\improper Weapon Vault" - icon_state = "armory" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/brig - name = "\improper Brig" - icon_state = "brig" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/ge - name = "\improper Guarded Entrance" - icon_state = "ge" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/work - name = "\improper Workshop" - icon_state = "work" - icon = 'maps/away/piratestation/pirate_station_sprites.dmi' - -/area/pirate_station/cryo - name = "\improper Cryo storage" - icon_state = "cryo" +/area/pirate_station/cl + name = "\improper Corridor L" + icon_state = "cl" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/cr + name = "\improper Corridor R" + icon_state = "cr" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/dorm + name = "\improper Dormitory" + icon_state = "dorm" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/dathroom + name = "\improper Bathroom" + icon_state = "dat" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/med + name = "\improper Medical" + icon_state = "med" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/hangar + name = "\improper Hangar" + icon_state = "hangar" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/canteen + name = "\improper Canteen" + icon_state = "eat" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/engin + name = "\improper Engineering" + icon_state = "Eng" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/kitchen + name = "\improper Kitchen" + icon_state = "kitch" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/armory + name = "\improper Weapon Vault" + icon_state = "armory" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/brig + name = "\improper Brig" + icon_state = "brig" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/ge + name = "\improper Guarded Entrance" + icon_state = "ge" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/work + name = "\improper Workshop" + icon_state = "work" + icon = 'maps/away/piratestation/pirate_station_sprites.dmi' + +/area/pirate_station/cryo + name = "\improper Cryo storage" + icon_state = "cryo" icon = 'maps/away/piratestation/pirate_station_sprites.dmi' \ No newline at end of file diff --git a/maps/away/raidership/raider_vessel_areas.dm b/maps/away/raidership/raider_vessel_areas.dm index a38d2001b98c0..a64b0bbe6c58b 100644 --- a/maps/away/raidership/raider_vessel_areas.dm +++ b/maps/away/raidership/raider_vessel_areas.dm @@ -1,34 +1,34 @@ -/area/raider_vessel/ - name = "\improper Center Corridor" - icon_state = "corridor" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/cock - name = "\improper Cockpit" - icon_state = "command" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/barrack - name = "\improper Barrack and BSA" - icon_state = "barracks" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/armory - name = "\improper Armory" - icon_state = "armory" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/bsa - name = "\improper BSA Storage" - icon_state = "bsa" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/pod - name = "\improper Drop Pod" - icon_state = "pod" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' - -/area/raider_vessel/engin - name = "\improper Engineering" - icon_state = "Eng" - icon = 'maps/away/raidership/raider_vessel_sprites.dmi' +/area/raider_vessel/ + name = "\improper Center Corridor" + icon_state = "corridor" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/cock + name = "\improper Cockpit" + icon_state = "command" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/barrack + name = "\improper Barrack and BSA" + icon_state = "barracks" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/armory + name = "\improper Armory" + icon_state = "armory" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/bsa + name = "\improper BSA Storage" + icon_state = "bsa" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/pod + name = "\improper Drop Pod" + icon_state = "pod" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' + +/area/raider_vessel/engin + name = "\improper Engineering" + icon_state = "Eng" + icon = 'maps/away/raidership/raider_vessel_sprites.dmi' diff --git a/maps/away/solship/solship.dm b/maps/away/solship/solship.dm index 167a604cedeea..1fb4d31783193 100644 --- a/maps/away/solship/solship.dm +++ b/maps/away/solship/solship.dm @@ -8,7 +8,7 @@ #include "solship_ranks.dm" #include "solship_presets.dm" #include "solship_shuttle.dm" -#include "solship_structures.dm" +//#include "solship_structures.dm" #include "solship_uniforms.dm" /////////// @@ -16,7 +16,7 @@ /////////// /datum/map_template/ruin/away_site/solship - name = "SCGG Big Iron" + name = "LPS Diablo" id = "awaysite_solship" description = "---." suffixes = list("solship/solship.dmm") @@ -30,20 +30,19 @@ hide_from_reports = TRUE /obj/effect/overmap/visitable/ship/solship - name = "SCGG Big Iron" - desc = "Medium gunship with SCG markings." + name = "LPS Diablo" + desc = "Medium gunship with LSS markings." color = "#990000" fore_dir = WEST vessel_mass = 350 initial_restricted_waypoints = list( - "Texas Red" = list("nav_hangar_texas") + "Tersten Red" = list("nav_hangar_texas") ) /obj/effect/shuttle_landmark/solship/nav_northwest - name = "Northwest of Big Iron" + name = "Northwest of Diablo" landmark_tag = "nav_solship_northwest" /obj/effect/shuttle_landmark/solship/nav_south - name = "South of Big Iron" + name = "South of Diablo" landmark_tag = "nav_solship_south" - diff --git a/maps/away/solship/solship.dmm b/maps/away/solship/solship.dmm index a568fec18e91b..2cc2661600776 100644 --- a/maps/away/solship/solship.dmm +++ b/maps/away/solship/solship.dmm @@ -7,56 +7,52 @@ "ag" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood/walnut,/area/solship/canteen) "ah" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/wallframe_spawn/reinforced/no_grille,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/reactorroom) "ai" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/reactorroom) -"aj" = (/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/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/double/solgovflag/left{dir = 8; pixel_y = 13; pixel_x = 30},/obj/structure/sign/double/solgovflag/right{dir = 8; pixel_y = -19; pixel_x = 30},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"aj" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/bridge) "ak" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/obj/machinery/button/blast_door{id_tag = "mercship_reactor"; name = "Reactor Containment Control"; pixel_x = 6; pixel_y = 24; req_access = list("SOL_ENGINEERING_ACCESS")},/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/machinery/button/blast_door{id_tag = "mercship_reactor_access"; name = "Reactor Access Control"; pixel_x = -6; pixel_y = 24; req_access = list("SOL_ENGINEERING_ACCESS")},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/solship/reactorroom) "al" = (/obj/structure/table/standard,/obj/machinery/recharger,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "am" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"an" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/button/blast_door{dir = 1; id_tag = "merccanteenbd"; name = "Canteen Observation Blast Doors Control"; pixel_y = -24; req_access = list("MERC_MAIN_ACCESS")},/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/lino,/area/solship/canteen) +"an" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/button/blast_door{dir = 1; id_tag = "merccanteenbd"; name = "Canteen Observation Blast Doors Control"; pixel_y = -24},/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/machinery/light{dir = 8},/turf/simulated/floor/lino,/area/solship/canteen) "ao" = (/obj/machinery/door/airlock/engineering{name = "Engineering Bay"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "ap" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "aq" = (/obj/structure/bed/chair/padded/red{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/structure/sign/warning/hot_exhaust{dir = 8; pixel_x = 32},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "ar" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "as" = (/obj/machinery/door/firedoor,/obj/effect/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/solship/engineering) -"at" = (/obj/machinery/mass_driver{dir = 8; id_tag = "solshiptorpedo1"; name = "missile launcher 1"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/item/toy/plushie/kitten{pixel_y = 6; pixel_x = 7; name = "Biggus Dickus"; desc = "A plushie of a cute kitten! He looks like he took part in war crimes."},/turf/simulated/floor/plating,/area/solship/rockets) +"at" = (/obj/machinery/mass_driver{dir = 8; id_tag = "solshiptorpedo1"; name = "missile launcher 1"},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/plating,/area/solship/rockets) "au" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/conveyor/ammobelt{dir = 8; id = "solbeltofd"},/turf/simulated/floor/plating,/area/solship/rockets) "av" = (/obj/machinery/mass_driver{dir = 8; id_tag = "solshiptorpedo2"; name = "missile launcher 2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/solship/rockets) -"aw" = (/turf/simulated/wall/r_wall,/area/solship/engineering) -"ax" = (/turf/simulated/floor/airless,/turf/simulated/wall/r_wall,/area/solship/maint) -"ay" = (/obj/machinery/ion_engine{dir = 8},/obj/structure/railing/mapped{dir = 1; icon_state = "railing0-1"},/turf/simulated/floor/plating,/area/space) +"aw" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/engineering) +"ax" = (/obj/effect/paint/merc,/turf/simulated/floor/airless,/turf/simulated/wall/r_wall,/area/solship/maint) +"ay" = (/obj/machinery/ion_engine{dir = 8},/obj/structure/railing/mapped{dir = 1; icon_state = "railing0-1"},/turf/simulated/floor/plating,/area/solship/maint) "az" = (/obj/effect/wallframe_spawn/no_grille,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/surgery) "aA" = (/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) -"aB" = (/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/plating,/area/space) "aC" = (/obj/machinery/organ_printer/flesh/mapped,/obj/effect/floor_decal/floordetail/edgedrain{dir = 9},/obj/effect/floor_decal/corner/paleblue,/obj/effect/floor_decal/corner/paleblue/border{dir = 9},/turf/simulated/floor/tiled/white,/area/solship/surgery) -"aD" = (/obj/machinery/ion_engine{dir = 8},/obj/structure/railing/mapped,/turf/simulated/floor/plating,/area/space) "aH" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/sign/warning/nosmoking_burned{pixel_y = 32},/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/item/trash/cigbutt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "aK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/firealarm{pixel_y = 21},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) -"aL" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 9},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"aL" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 9},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/lord{pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "aO" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/solship/reactorroom) "aR" = (/obj/effect/floor_decal/floordetail/edgedrain{dir = 1},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/organ_printer/robot/mapped,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/surgery) -"aS" = (/turf/simulated/wall/r_wall,/area/space) -"aW" = (/obj/structure/table/standard,/obj/effect/floor_decal/floordetail/edgedrain{dir = 5},/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/solship/surgery) +"aS" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/canteen) +"aW" = (/obj/structure/table/standard,/obj/effect/floor_decal/floordetail/edgedrain{dir = 5},/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/turf/simulated/floor/tiled/white,/area/solship/surgery) "aY" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/obj/random/energy,/obj/effect/decal/cleanable/dirt,/obj/random/cash,/obj/random/cash,/obj/random/contraband,/obj/random/maintenance,/obj/random/coin,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "ba" = (/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) "bd" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/solar_assembly,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "bg" = (/obj/machinery/door/firedoor,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) "bh" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/radiation_gear,/obj/machinery/alarm{pixel_y = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "bj" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/internals,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) -"bl" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) -"bm" = (/turf/simulated/wall,/area/solship/freezer) +"bl" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"bm" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/freezer) "bn" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/floodlight,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) -"bo" = (/obj/structure/catwalk,/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/plating,/area/solship/maint) "bp" = (/obj/effect/floor_decal/borderfloorwhite/corner{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/medical) "bq" = (/obj/structure/table/steel_reinforced,/obj/item/music_player/boombox,/obj/item/music_tape/custom,/obj/machinery/recharger,/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "bs" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/solship/medical) "bt" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/solship/medical) -"bw" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/bed/chair/wood/walnut{dir = 1},/turf/simulated/floor/lino,/area/solship/capquarters) +"bw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/bed/chair/wood/walnut{dir = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "bz" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/turf/simulated/floor/tiled/techfloor,/area/solship/securearmory) "bC" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{dir = 4; id_tag = null; name = "Operating Room"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white/monotile,/area/solship/surgery) "bD" = (/obj/effect/floor_decal/floordetail/edgedrain{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/solship/surgery) -"bE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/paleblue/half,/obj/structure/closet/secure_closet{name = "Corpsman"; req_access = list("SOL_MEDIC_ACCESS")},/obj/item/storage/firstaid/combat,/obj/item/clothing/glasses/hud/health/goggle,/obj/item/storage/belt/medical/emt,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"bE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light{dir = 1},/obj/structure/closet/secure_closet{name = "Corpsman"; req_access = list("SOL_MEDIC_ACCESS")},/obj/item/storage/firstaid/combat,/obj/item/clothing/glasses/hud/health/goggle,/obj/item/storage/belt/medical/emt,/obj/effect/floor_decal/corner/red/half,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "bG" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) "bH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/solship/surgery) -"bI" = (/obj/structure/closet/crate/trashcart,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "bL" = (/obj/effect/floor_decal/floordetail/edgedrain{dir = 4},/obj/effect/floor_decal/corner/paleblue{dir = 9},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/solship/surgery) "bO" = (/obj/machinery/button/blast_door{pixel_y = 2; pixel_x = -26; name = "Protective Shutters"; id_tag = "solshipbsa"},/obj/effect/floor_decal/techfloor{dir = 10; icon_state = "techfloor_edges"},/obj/machinery/light/small{dir = 8},/obj/effect/floor_decal/industrial/loading,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) "bR" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) @@ -67,7 +63,6 @@ "cf" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "ci" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/obj/effect/decal/cleanable/dirt,/obj/item/robot_parts/robot_component/radio,/obj/item/robot_parts/robot_component/diagnosis_unit,/obj/item/robot_parts/robot_component/camera,/obj/item/robot_parts/robot_component/armour/exosuit/radproof,/obj/item/robot_parts/robot_component/armour/exosuit/em,/obj/item/robot_parts/robot_component/actuator,/obj/item/robot_parts/robot_component/actuator,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "ck" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/obj/effect/decal/cleanable/dirt,/obj/random/smokes,/obj/random/smokes,/obj/random/smokes,/obj/random/smokes,/obj/random/smokes,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) -"cl" = (/obj/structure/catwalk,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plating,/area/solship/maint) "cn" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/black/bordercorner2,/obj/effect/floor_decal/corner/black/bordercorner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "co" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/recharger/wallcharger{pixel_y = 24},/obj/item/clothing/suit/armor/pcarrier/medium/sol,/obj/item/clothing/suit/armor/pcarrier/medium/sol,/obj/item/clothing/suit/armor/pcarrier/medium/sol,/obj/item/clothing/suit/armor/pcarrier/medium/sol,/obj/structure/table/rack,/obj/item/clothing/accessory/armor_plate/ceramic,/obj/item/clothing/accessory/armor_plate/ceramic,/obj/item/clothing/accessory/armor_plate/ceramic,/obj/item/clothing/accessory/armor_plate/ceramic,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "cr" = (/obj/machinery/door/blast/regular{id_tag = "solshipbsa"},/obj/random/trash,/turf/simulated/floor/plating,/area/solship/ofd) @@ -83,18 +78,18 @@ "cP" = (/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/solship/medical) "cS" = (/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/can) "cV" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"cW" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/obj/structure/sign/warning/airlock{dir = 4; pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"cX" = (/obj/effect/paint/black,/obj/structure/sign/solgov,/turf/simulated/wall/r_wall,/area/space) -"cY" = (/obj/machinery/atmospherics/unary/tank/air{start_pressure = 4559.63},/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/light{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) +"cW" = (/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/plating,/area/exploration_shuttle/texas/airlock) +"cX" = (/obj/machinery/atmospherics/unary/tank/air{start_pressure = 4559.63},/obj/effect/floor_decal/industrial/outline/blue,/obj/effect/decal/cleanable/dirt,/obj/structure/sign/lord{pixel_y = 32},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) +"cY" = (/obj/machinery/atmospherics/unary/tank/air{start_pressure = 4559.63},/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/light{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/lord{pixel_y = 32},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "cZ" = (/obj/effect/floor_decal/borderfloorwhite/corner{dir = 8},/obj/effect/floor_decal/corner/paleblue/bordercorner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/solship/medical) "da" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/solship/medical) "db" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/solship/medical) "dc" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"dd" = (/obj/effect/floor_decal/corner/paleblue/half{dir = 8; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"dd" = (/obj/effect/floor_decal/corner/red/half{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "de" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/fabricator/hacked,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "df" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/engineering{name = "Engineering Bay"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/reactorroom) "dh" = (/obj/machinery/vitals_monitor,/obj/effect/floor_decal/floordetail/edgedrain{dir = 10},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/surgery) -"di" = (/turf/simulated/wall,/area/solship/maint) +"di" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/maint) "dj" = (/obj/structure/closet/walllocker{pixel_y = 32},/turf/simulated/floor/tiled/freezer,/area/solship/crew) "dn" = (/obj/machinery/disperser/front{dir = 8},/turf/simulated/floor/plating,/area/solship/ofd) "do" = (/obj/machinery/optable,/obj/effect/floor_decal/floordetail/edgedrain,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/effect/floor_decal/corner/paleblue/border,/obj/machinery/body_scan_display{pixel_y = -28},/turf/simulated/floor/tiled/white,/area/solship/surgery) @@ -104,14 +99,14 @@ "dv" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/power/apc/high{dir = 8; name = "west bump"; pixel_x = -25},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) "dz" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) "dA" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) -"dC" = (/obj/structure/hygiene/toilet{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/techfloor{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/jail) +"dC" = (/obj/structure/hygiene/toilet{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/techfloor{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "dE" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) "dF" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) "dG" = (/obj/structure/bed/chair/padded/brown,/obj/effect/floor_decal/spline/fancy/wood,/obj/effect/floor_decal/corner/brown{dir = 5},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "dH" = (/obj/machinery/disperser/back{dir = 8},/turf/simulated/floor/plating,/area/solship/ofd) -"dI" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) +"dI" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) "dJ" = (/obj/random/trash,/turf/simulated/floor/plating,/area/solship/ofd) -"dK" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) +"dK" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning,/obj/effect/decal/cleanable/dirt,/obj/structure/sign/warning/hot_exhaust{dir = 8; pixel_x = 32},/turf/simulated/floor/tiled/dark,/area/solship/maint) "dM" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/lino,/area/solship/capquarters) "dR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "dT" = (/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/obj/structure/table/standard,/obj/machinery/cell_charger,/turf/simulated/floor/tiled/white,/area/solship/medical) @@ -140,9 +135,9 @@ "eO" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass/medical{name = "Medical Bay"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "eP" = (/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/paleblue/border{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white,/area/solship/medical) "eQ" = (/obj/structure/table/standard,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood/walnut,/area/solship/canteen) -"eX" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/black/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/closet/emcloset,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"eX" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/black/border{dir = 5},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/closet/emcloset,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "eY" = (/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/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"eZ" = (/turf/simulated/wall/r_wall,/area/solship/freezer) +"eZ" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/freezer) "fa" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/black/border{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "fb" = (/obj/machinery/atmospherics/pipe/manifold4w/visible/cyan,/obj/machinery/meter,/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "fc" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/recharger/wallcharger{pixel_y = 24},/obj/item/clothing/glasses/tacgoggles,/obj/item/clothing/glasses/tacgoggles,/obj/item/clothing/glasses/tacgoggles,/obj/item/clothing/glasses/tacgoggles,/obj/structure/table/rack,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) @@ -150,7 +145,7 @@ "fj" = (/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/airlock) "fp" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/black/bordercorner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "fv" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/mining{name = "Warehouse"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) -"fx" = (/turf/simulated/wall/ocp_wall,/area/solship/reactorroom) +"fx" = (/obj/effect/paint/merc,/turf/simulated/wall/ocp_wall,/area/solship/reactorroom) "fA" = (/obj/machinery/fabricator/hacked,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "fB" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/ship_munition/disperser_charge/explosive,/turf/simulated/floor/plating,/area/solship/ofd) "fD" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/solship/canteen) @@ -159,19 +154,17 @@ "fH" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/med_crate/toxin,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "fJ" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/railing/mapped,/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/plating,/area/solship/maint) "fK" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate/med_crate/trauma,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) -"fN" = (/obj/structure/sign/double/solgovflag/left{pixel_y = 24},/obj/item/trash/cigbutt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) +"fN" = (/obj/item/trash/cigbutt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "fP" = (/obj/structure/bed/chair/office/dark,/turf/simulated/floor/wood/walnut,/area/solship/canteen) "fS" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 8},/obj/machinery/portable_atmospherics/canister/hydrogen,/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "ga" = (/obj/effect/floor_decal/borderfloorwhite{dir = 10},/obj/effect/floor_decal/corner/paleblue/border{dir = 10},/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 9},/obj/effect/floor_decal/corner/paleblue/bordercorner2{dir = 9},/obj/machinery/power/apc/high{name = "south bump"; pixel_y = -24},/obj/structure/table/rack,/obj/item/roller,/obj/item/roller,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/white,/area/solship/medical) -"ge" = (/turf/simulated/wall/r_wall,/area/solship/securearmory) "gf" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) -"gg" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"gg" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 9},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "gh" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "gi" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white,/area/solship/medical) "go" = (/turf/simulated/floor/plating,/area/solship/maint) "gq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"gw" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/paleblue{dir = 1},/obj/effect/submap_landmark/spawnpoint/solship,/turf/simulated/floor/tiled/white,/area/solship/cryo) -"gx" = (/turf/simulated/wall/r_wall,/area/solship/ofd) +"gw" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/submap_landmark/spawnpoint/solship,/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/cryo) "gz" = (/obj/effect/floor_decal/spline/fancy/wood/corner,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/lino,/area/solship/canteen) "gB" = (/obj/structure/table/standard,/obj/machinery/recharger,/turf/simulated/floor/wood/walnut,/area/solship/canteen) "gC" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/catwalk,/obj/machinery/button/mass_driver{pixel_y = 9; pixel_x = 25; name = "Fire Right"; desc = "A remote control switch for something. Also called the fun button."; id_tag = "solshiptorpedo1"},/obj/machinery/button/mass_driver{pixel_y = -2; pixel_x = 25; name = "Fire Left"; desc = "A remote control switch for something. Has one confirmed war crime."; id_tag = "solshiptorpedo2"},/turf/simulated/floor/plating,/area/solship/rockets) @@ -180,18 +173,19 @@ "gH" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "gM" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/black/bordercorner,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "gN" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) -"gP" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/decal/cleanable/dirt,/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/machinery/conveyor_switch/ammobelt{id = "solconv2"; name = "Second Conveyor switch"; pixel_x = 8; pixel_y = 10},/obj/machinery/conveyor_switch/ammobelt{id = "solconv1"; name = "First Conveyor switch"; pixel_x = -8; pixel_y = 10},/turf/simulated/floor/plating,/area/solship/rockets) +"gP" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/decal/cleanable/dirt,/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/machinery/conveyor_switch/ammobelt{id = "solconv2"; name = "Second Conveyor switch"; pixel_x = 8; pixel_y = 10},/obj/machinery/conveyor_switch/ammobelt{id = "solconv1"; name = "First Conveyor switch"; pixel_x = -8; pixel_y = 10},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/solship/rockets) "gR" = (/obj/machinery/door/blast/regular{id_tag = "solshipmissleplatform"},/turf/simulated/floor/plating,/area/solship/rockets) "gS" = (/obj/structure/flora/pottedplant/large,/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/black/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "gT" = (/obj/structure/catwalk,/obj/machinery/power/apc{dir = 1; pixel_y = 19},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/solship/rockets) -"gW" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/space) +"gW" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/space) "gX" = (/obj/item/storage/bible{pixel_y = 2; pixel_x = -6},/obj/item/flame/candle{pixel_y = 8; pixel_x = 6},/obj/machinery/light/small{dir = 8},/obj/machinery/button/blast_door{pixel_y = 2; pixel_x = -26; name = "Protective Shutters"; id_tag = "solshipmissleplatform"},/obj/item/device/binoculars{pixel_y = -7; pixel_x = 6},/obj/structure/table/steel,/turf/simulated/floor/plating,/area/solship/rockets) "gZ" = (/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) -"hc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/effect/floor_decal/corner/paleblue/half{dir = 8; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"hc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/effect/floor_decal/corner/red/half{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "hf" = (/obj/effect/floor_decal/techfloor,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/item/gun/projectile/automatic/l6_saw,/obj/structure/table/rack/dark,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "hg" = (/obj/machinery/door/firedoor,/obj/effect/wallframe_spawn/reinforced/no_grille,/turf/simulated/floor/plating,/area/solship/medical) "hi" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/cyan{d2 = 4; icon_state = "0-4"},/obj/structure/iv_drip,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/exploration_shuttle/texas/med) "hk" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"hn" = (/obj/structure/sign/lord{pixel_y = -32},/turf/space,/area/space) "ho" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/maint) "hp" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "hr" = (/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/light_switch{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) @@ -205,14 +199,13 @@ "hC" = (/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "hD" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/maint) "hE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/centcom{name = "Air Atmos"},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/can) -"hI" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"hJ" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"hK" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) +"hI" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"hJ" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"hK" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/black/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) "hL" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/pipedispenser,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"hM" = (/turf/simulated/wall/r_wall,/area/solship/canteen) "hN" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/wood/walnut,/area/solship/crew) "hO" = (/obj/machinery/vending/tool{dir = 4},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"hP" = (/obj/structure/closet/hydrant,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) +"hP" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/black/border{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) "hQ" = (/obj/structure/fuel_port,/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/airlock) "hS" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "hW" = (/obj/structure/table/standard,/turf/simulated/floor/wood/walnut,/area/solship/canteen) @@ -221,41 +214,39 @@ "ie" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "if" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/plating,/area/solship/reactorroom) "ij" = (/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"im" = (/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/civilian{name = "Crew Bunks"},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"ip" = (/turf/simulated/wall/r_wall,/area/solship/rockets) +"im" = (/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/civilian{name = "Crew Bunks"; id_tag = "patrol_lead"},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "it" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 9},/obj/machinery/light,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "iw" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "ix" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 10},/obj/machinery/light{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "iA" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/closet/crate/trashcart,/obj/structure/sign/warning/nosmoking_burned{pixel_x = 26},/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) -"iD" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/industrial/warning/dust{dir = 8},/turf/simulated/floor/plating,/area/solship/rockets) +"iD" = (/obj/structure/window/reinforced,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/industrial/warning/dust{dir = 8},/obj/random/lootable_mgsbox,/turf/simulated/floor/plating,/area/solship/rockets) "iE" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/window/reinforced,/obj/structure/catwalk,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/solship/rockets) "iI" = (/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/lino,/area/solship/canteen) -"iL" = (/turf/simulated/wall/r_wall,/area/solship/cryo) "iQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "iS" = (/obj/structure/table/marble,/obj/machinery/reagent_temperature/cooler,/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/solship/canteen) "iT" = (/obj/structure/bed/chair/padded/brown,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "iV" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "iW" = (/obj/machinery/door/airlock/hatch{name = "Maintenance Access"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) -"jf" = (/obj/structure/table/standard,/obj/item/tableflag,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) +"jf" = (/obj/structure/table/standard,/obj/item/tableflag/antar,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "jg" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/centcom{id_tag = "mercship_cell2"; name = "Cell Two"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/jail) -"jo" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/sign/warning{pixel_x = 32},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) +"jo" = (/obj/structure/sign/warning{pixel_x = 32},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) "jp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/black/border{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "jq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/centcom{name = "Medical Wing"},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/exploration_shuttle/texas/med) "jr" = (/obj/structure/bed/chair/padded/brown{dir = 8},/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "jt" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/civilian{id_tag = "mercshower"; name = "Shower"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"jv" = (/obj/structure/table/steel_reinforced,/obj/item/paper/solinf,/obj/item/device/binoculars{pixel_y = -7; pixel_x = 6},/obj/effect/floor_decal/techfloor,/obj/machinery/button/blast_door{id_tag = "bhunter_external"; name = "Protective Shutters Control"; req_access = null},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"jv" = (/obj/structure/table/steel_reinforced,/obj/item/device/binoculars{pixel_y = -7; pixel_x = 6},/obj/effect/floor_decal/techfloor,/obj/machinery/button/blast_door{id_tag = "bhunter_external"; name = "Protective Shutters Control"; req_access = null},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "jw" = (/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "jz" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/solship/canteen) -"jC" = (/obj/structure/bed/chair/office/comfy/brown{dir = 1},/obj/machinery/button/windowtint{dir = 1; id = "merccap_windows"; pixel_x = 6; pixel_y = -24},/obj/machinery/button/blast_door{dir = 1; id_tag = "mercship_captain_observation"; name = "Window Blast Doors Control"; pixel_x = -8; pixel_y = -24; req_access = list("MERC_CAPTAIN_ACCESS")},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"jE" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/tableflag,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) +"jC" = (/obj/structure/bed/chair/office/comfy/brown{dir = 1},/obj/machinery/button/windowtint{dir = 1; id = "patrol_cabinet_windows"; pixel_x = 6; pixel_y = -24},/obj/machinery/button/blast_door{dir = 1; id_tag = "mercship_captain_observation"; name = "Window Blast Doors Control"; pixel_x = -8; pixel_y = -24},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"jE" = (/obj/structure/table/standard,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "jG" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/canteen) "jH" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"jM" = (/obj/effect/wallframe_spawn/reinforced/titanium,/obj/machinery/door/blast/regular/open{density = 0; id_tag = "bhunter_external"},/obj/effect/paint/black,/turf/simulated/floor,/area/exploration_shuttle/texas/pass) -"jN" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"jM" = (/obj/effect/wallframe_spawn/reinforced,/obj/machinery/door/blast/regular/open{density = 0; id_tag = "bhunter_external"},/turf/simulated/floor,/area/exploration_shuttle/texas/pass) +"jN" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "jP" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/centcom{id_tag = "mercship_cell1"; name = "Cell One"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/decal/cleanable/dirt,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/jail) "jQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "jR" = (/obj/machinery/shield_diffuser,/turf/simulated/floor/plating,/area/solship/ofd) -"ka" = (/obj/machinery/light_switch{dir = 1; pixel_y = -28},/turf/simulated/wall,/area/solship/cryo) +"ka" = (/obj/machinery/light_switch{dir = 1; pixel_y = -28},/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/cryo) "kc" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/black/bordercorner{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "kd" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "ke" = (/obj/machinery/door/airlock/centcom{name = "Gunship Leader"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/monotile,/area/solship/capquarters) @@ -272,43 +263,43 @@ "kC" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "kD" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/door/airlock/hatch{name = "Missile Platform"; req_access = newlist()},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/rockets) "kI" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"kJ" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/machinery/door/airlock/external/glass/bolted/cycling{frequency = 1911; id_tag = "mercship_airlock_inner"; name = "Fore Dock Airlock"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/fronthall) +"kJ" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "kK" = (/obj/machinery/light/small,/turf/simulated/floor/plating,/area/solship/maint) -"kL" = (/obj/structure/railing/mapped{dir = 8},/obj/structure/railing/mapped,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/plating,/area/solship/bridge) +"kL" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/sign/double/lordflag/left{pixel_y = 32},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "kM" = (/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/black/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 9},/obj/structure/closet/crate/trashcart,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "kS" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/techfloor/orange/corner,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "kV" = (/obj/machinery/door/blast/regular{dir = 2; id_tag = "solshipmissleplatform"},/turf/simulated/floor/plating,/area/solship/rockets) "kW" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv1"},/turf/simulated/floor/plating,/area/solship/rockets) "kZ" = (/obj/machinery/atmospherics/binary/pump/on{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) -"la" = (/obj/machinery/light/small{dir = 1},/obj/structure/bed/padded,/obj/item/bedsheet/hop,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"la" = (/obj/structure/bed/padded,/obj/item/bedsheet/hos,/obj/structure/sign/booker{pixel_y = 32},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "ld" = (/obj/machinery/body_scanconsole{dir = 4},/obj/effect/floor_decal/borderfloorwhite/corner{dir = 4},/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/bordercorner{dir = 4},/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/tiled/white,/area/solship/medical) "li" = (/obj/machinery/cryopod{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/cryo) -"lj" = (/obj/machinery/computer/cryopod{pixel_x = -32},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/effect/submap_landmark/spawnpoint/solship,/turf/simulated/floor/tiled/white,/area/solship/cryo) +"lj" = (/obj/machinery/computer/cryopod{pixel_x = -32},/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/submap_landmark/spawnpoint/solship,/turf/simulated/floor/tiled/white,/area/solship/cryo) "lm" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/maintenance{name = "Munitious"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) "ln" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/lino,/area/solship/canteen) "lo" = (/obj/machinery/reagentgrinder,/obj/item/stack/material/phoron/ten,/obj/structure/railing/mapped{dir = 1},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) -"lp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue/half{dir = 8; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"lp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/half{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "lq" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"lr" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/effect/submap_landmark/spawnpoint/solship/captain,/turf/simulated/floor/tiled/white,/area/solship/cryo) -"lt" = (/turf/simulated/wall,/area/solship/reactorroom) +"lr" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/submap_landmark/spawnpoint/solship/captain,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/tiled/white,/area/solship/cryo) +"lt" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/reactorroom) "lv" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/solship/maint) -"lx" = (/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/walnut,/area/solship/crew) +"lx" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 1},/turf/simulated/floor/wood/walnut,/area/solship/crew) "ly" = (/obj/machinery/cryopod{dir = 2},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/cryo) -"lz" = (/obj/structure/table/woodentable/walnut,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"lz" = (/obj/structure/table/woodentable/walnut,/obj/item/storage/slide_projector,/obj/item/device/flashlight/lamp,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "lB" = (/obj/structure/cable,/obj/machinery/light/small,/obj/machinery/power/port_gen/pacman/super/potato,/turf/simulated/floor/plating,/area/solship/reactorroom) "lC" = (/obj/structure/ship_munition/disperser_charge/explosive,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) -"lD" = (/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "bhunter_shuttle_inner"; name = "Dropship Airlock"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) +"lD" = (/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "bhunter_shuttle_inner"; name = "Dropship Airlock"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) "lF" = (/obj/effect/wallframe_spawn/reinforced,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/blast/shutters/open{id_tag = "mercship_cell2_bd"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/jail) -"lG" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 6},/obj/structure/table/woodentable/walnut,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"lJ" = (/turf/simulated/wall,/area/solship/equiproom) +"lG" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/cryo) +"lJ" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/equiproom) "lK" = (/obj/structure/hygiene/shower{dir = 8; pixel_x = -5},/obj/structure/curtain/open/shower,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light/small,/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/solship/crew) "lN" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 6},/obj/machinery/firealarm{dir = 1; pixel_y = -20},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "lQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/maint) "lR" = (/obj/structure/flora/pottedplant/minitree,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "lS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/freezer,/area/solship/freezer) -"lX" = (/turf/simulated/wall,/area/solship/cryo) -"ma" = (/obj/structure/railing/mapped{dir = 8},/obj/structure/railing/mapped{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/plating,/area/solship/bridge) -"me" = (/obj/effect/paint/black,/obj/structure/sign/solgov,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/airlock) +"lX" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/fronthall) +"ma" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/structure/table/steel_reinforced,/obj/machinery/photocopier/faxmachine,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"me" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/medical) "mk" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/effect/floor_decal/techfloor{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/maint) "mm" = (/obj/machinery/chem_master,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "mo" = (/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/railing/mapped,/turf/simulated/floor/plating,/area/solship/maint) @@ -326,39 +317,39 @@ "mV" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/solship/canteen) "mX" = (/obj/effect/wallframe_spawn/reinforced/no_grille,/obj/machinery/door/blast/regular/open{id_tag = "mercship_bridge"; name = "Bridge Lockdown"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/bridge) "mY" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/solship/canteen) -"mZ" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/lino,/area/solship/capquarters) +"mZ" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/closet/cabinet,/obj/item/clothing/under/pj/red,/obj/item/clothing/shoes/sneakers,/turf/simulated/floor/lino,/area/solship/capquarters) "nb" = (/obj/effect/floor_decal/techfloor{dir = 9},/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Shotgun"},/obj/item/gun/projectile/shotgun/pump/combat,/obj/item/gun/projectile/shotgun/pump/combat,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"nc" = (/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) +"nc" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) "nd" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/tiled/white,/area/solship/canteen) "ne" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/lino,/area/solship/canteen) "ni" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/lino,/area/solship/canteen) -"nj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/cryo) +"nj" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/corner/red{dir = 9},/turf/simulated/floor/tiled/white,/area/solship/cryo) "np" = (/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/med) "nq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/exploration_shuttle/texas/med) "nt" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"nx" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "bhunter_shuttle_outer"; name = "Dropship Airlock"},/obj/machinery/access_button/airlock_exterior{frequency = 1911; master_tag = "bhunter_shuttle"; pixel_x = 10; pixel_y = 24; id_tag = "mercship_airlock_outer"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) +"nx" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "lord_dock_outer"; name = "Fore Dock Airlock"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/fronthall) "ny" = (/obj/machinery/door/airlock/hatch{name = "Maintenance Access"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) "nA" = (/obj/machinery/atmospherics/pipe/manifold/hidden,/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/solship/medical) "nI" = (/obj/structure/closet/secure_closet/brig{req_access = list("MERC_MAIN_ACCESS")},/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/decal/cleanable/dirt,/obj/machinery/firealarm{dir = 1; pixel_y = -20},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "nO" = (/obj/structure/table/woodentable/walnut,/obj/item/modular_computer/laptop/preset/custom_loadout/advanced{dir = 4},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "nP" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "nR" = (/obj/machinery/door/airlock/civilian{name = "Kitchen"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/white/monotile,/area/solship/canteen) -"nS" = (/obj/structure/table/standard,/obj/item/tableflag,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"nS" = (/obj/structure/table/standard,/obj/item/tableflag/antar,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "nU" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "nV" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/solship/canteen) "nW" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light{dir = 1},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 1; pixel_y = 19},/turf/simulated/floor/tiled/freezer,/area/solship/freezer) "nZ" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/turf/simulated/floor/lino,/area/solship/canteen) "oc" = (/obj/effect/floor_decal/techfloor,/turf/simulated/floor/tiled/techfloor,/area/solship/maint) -"oe" = (/obj/structure/mattress/dirty,/obj/effect/floor_decal/techfloor{dir = 10; icon_state = "techfloor_edges"},/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/jail) +"oe" = (/obj/structure/mattress/dirty,/obj/effect/floor_decal/techfloor{dir = 10; icon_state = "techfloor_edges"},/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/obj/item/toy/plushie/kitten{pixel_y = 6; pixel_x = 7; name = "Biggus Dickus"; desc = "A plushie of a cute kitten! He looks like he took part in war crimes."},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "of" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "oh" = (/turf/simulated/floor/wood/walnut,/area/solship/canteen) -"ol" = (/turf/simulated/wall,/area/solship/medical) +"ol" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/medical) "on" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/lino,/area/solship/canteen) "oq" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/corner_techfloor_grid{dir = 1},/obj/effect/floor_decal/techfloor/corner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "oz" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/button/blast_door{dir = 1; id_tag = "merc_eng_storage"; name = "Storage Shutters"; pixel_x = 26; pixel_y = -24; req_access = list("SOL_ENGINEERING_ACCESS")},/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "oC" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/effect/decal/cleanable/flour,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/white,/area/solship/canteen) "oD" = (/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/med) -"oF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/structure/catwalk,/obj/machinery/hologram/holopad/longrange,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/airlock) +"oF" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/structure/catwalk,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/airlock) "oN" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/tiled/white,/area/solship/canteen) "oO" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/wood/walnut,/area/solship/canteen) "oT" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/machinery/fabricator/hacked,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) @@ -366,7 +357,6 @@ "pc" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/lino,/area/solship/canteen) "pe" = (/obj/structure/table/standard,/obj/machinery/recharger,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "pi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/light{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"pj" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/fronthall) "pn" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/firedoor,/obj/machinery/door/airlock/centcom{id_tag = null; name = "Brig Section"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/jail) "po" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/civilian{name = "Bathroom"},/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark/monotile,/area/solship/crew) "pq" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/bed/chair/shuttle/blue,/obj/machinery/recharger/wallcharger{pixel_y = 24},/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) @@ -381,30 +371,27 @@ "pS" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "qa" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/computer/ship/sensors{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "qb" = (/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"qc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/shuttle_landmark/texas,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"qg" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"qc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/shuttle_landmark/solship/texas,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"qg" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "qp" = (/obj/item/stack/material/rods,/turf/simulated/floor/plating,/area/solship/maint) "qs" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 5},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/medical) "qv" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) "qy" = (/obj/structure/girder,/obj/item/stack/material/steel,/turf/simulated/floor/plating,/area/solship/maint) "qA" = (/obj/machinery/door/airlock/centcom{name = "Bridge"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/blast/regular/open{dir = 4; id_tag = "mercship_bridge"; name = "Bridge Lockdown"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) -"qB" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/ship_munition/disperser_charge/explosive,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) -"qP" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "qQ" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "qW" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/black/border{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 10},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"qY" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/light/small{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/walnut,/area/solship/crew) -"qZ" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/bed,/obj/machinery/flasher{dir = 8; id_tag = "mercship_cell1_flash"; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) -"ra" = (/obj/machinery/constructable_frame/computerframe{dir = 4},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"qY" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/walnut,/area/solship/crew) +"qZ" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/bed,/obj/machinery/flasher{dir = 8; id_tag = "mercship_cell1_flash"; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) +"ra" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/computer/ship/helm{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "rc" = (/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "rd" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/empty,/obj/effect/floor_decal/industrial/outline/red,/obj/machinery/light{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "ri" = (/obj/machinery/hologram/holopad/longrange,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/button/blast_door{dir = 4; id_tag = "mercship_bridge"; name = "Bridge Lockdown Control"; pixel_x = -24; pixel_y = -6},/obj/machinery/button/blast_door{dir = 4; id_tag = "mercship_bridge_observation"; name = "Observation Blast Doors Control"; pixel_x = -24; pixel_y = 6},/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "rr" = (/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/airlock) -"rs" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/newscaster{pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/table/standard,/obj/item/paper,/obj/effect/decal/cleanable/dirt,/obj/item/tableflag,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) +"rs" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/newscaster{pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/table/standard,/obj/item/paper,/obj/effect/decal/cleanable/dirt,/obj/item/tableflag/antar,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "rz" = (/obj/machinery/door/blast/regular{dir = 4; id_tag = "mercship_bridge_observation"; name = "Observation Blast Doors"},/obj/effect/floor_decal/industrial/hatch/red,/turf/simulated/floor/reinforced/airless,/area/solship/bridge) "rD" = (/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/pass) -"rG" = (/turf/simulated/wall,/area/solship/fronthall) "rI" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"rN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/floodlight,/obj/effect/decal/cleanable/dirt,/obj/structure/sign/warning/hot_exhaust{dir = 8; pixel_x = 32},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) +"rN" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/floodlight,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/solship/maint) "rO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/vault{name = "Secure Armory"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "rP" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/freezer,/area/solship/crew) "rQ" = (/obj/machinery/door/blast/shutters{dir = 2; id_tag = "merc_eng_storage"; name = "Storage"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/floor_decal/techfloor/corner{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) @@ -420,102 +407,104 @@ "sv" = (/obj/structure/closet/secure_closet/freezer/meat,/turf/simulated/floor/tiled/freezer,/area/solship/freezer) "sy" = (/obj/structure/bed/chair/padded/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "sE" = (/obj/effect/floor_decal/techfloor/orange{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) -"sK" = (/turf/simulated/wall,/area/solship/canteen) +"sK" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "sN" = (/obj/structure/table/rack,/obj/item/storage/belt/holster/security/tactical,/obj/item/storage/belt/holster/security/tactical,/obj/item/storage/belt/holster/security/tactical,/turf/simulated/floor/tiled/techfloor,/area/solship/equiproom) -"sO" = (/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/jail) -"sP" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled/white,/area/solship/cryo) +"sP" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/effect/floor_decal/corner/red/three_quarters{dir = 4},/turf/simulated/floor/tiled/white,/area/solship/cryo) "sR" = (/obj/structure/railing/mapped{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) "sW" = (/turf/space,/area/space) -"tl" = (/turf/simulated/wall/r_wall,/area/solship/jail) +"tl" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/jail) "tv" = (/obj/structure/bed/chair/padded/brown{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "tx" = (/obj/machinery/cryopod{dir = 2},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/cryo) "tH" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor/corner{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) -"tO" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/machinery/light_switch{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/white,/area/solship/cryo) -"tR" = (/obj/machinery/mech_recharger,/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/floor_decal/techfloor{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"tO" = (/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/effect/floor_decal/corner/red{dir = 8},/turf/simulated/floor/tiled/white,/area/solship/cryo) +"tR" = (/obj/machinery/mech_recharger,/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "tS" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "tW" = (/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = -15},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = 10},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = 2},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = -6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "tY" = (/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = -15},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = 10},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = 2},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = -6},/obj/effect/decal/cleanable/liquid_fuel,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) -"ue" = (/turf/simulated/wall/r_wall,/area/solship/capquarters) "um" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_alc/full{pixel_y = 8},/turf/simulated/floor/lino,/area/solship/canteen) "uo" = (/obj/effect/floor_decal/techfloor,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light{dir = 1},/obj/item/clothing/head/helmet,/obj/item/clothing/head/helmet,/obj/item/clothing/head/helmet,/obj/item/clothing/head/helmet,/obj/structure/table/rack,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "up" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/securearmory) "uq" = (/obj/structure/table/woodentable/walnut,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"ur" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "ux" = (/obj/machinery/button/alternate/door/bolts{dir = 1; id_tag = "mercship_cell2"; name = "Cell Two Lock"; pixel_x = -6; pixel_y = -24; req_access = list("MERC_MAIN_ACCESS")},/obj/machinery/button/blast_door{dir = 1; id_tag = "mercship_cell2_bd"; name = "Cell Two Shutters"; pixel_x = 6; pixel_y = -24; req_access = list("MERC_MAIN_ACCESS")},/obj/machinery/button/flasher{id_tag = "mercship_cell2_flash"; pixel_y = -34; req_access = list("MERC_MAIN_ACCESS")},/obj/structure/bed/chair/padded/red{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "uB" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "uI" = (/obj/effect/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/solship/ofd) "uS" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/machinery/computer/ship/missiles{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) "uW" = (/obj/machinery/atmospherics/binary/pump{dir = 4},/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) -"uY" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/bedsheet/blue,/turf/simulated/floor/lino,/area/solship/crew) +"uY" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/item/bedsheet/hos,/turf/simulated/floor/lino,/area/solship/crew) "vm" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/effect/floor_decal/corner/brown{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "vn" = (/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "vp" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "vF" = (/obj/machinery/power/shield_generator,/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/reactorroom) -"vM" = (/turf/simulated/wall/r_wall,/area/solship/armory) -"vN" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/structure/table/rack/dark,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) +"vM" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/armory) +"vN" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/structure/table/rack/dark,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/plastique,/obj/item/gun/projectile/rocket/oneuse,/obj/item/gun/projectile/rocket/oneuse,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "vT" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/rack/dark,/obj/item/gun/energy/xray,/obj/item/gun/energy/xray,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "vU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"vW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/alarm{pixel_y = 24},/obj/effect/floor_decal/techfloor{dir = 5},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/jail) +"vW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/alarm{pixel_y = 24},/obj/effect/floor_decal/techfloor{dir = 5},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "we" = (/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{pixel_y = 24},/turf/simulated/floor/wood/walnut,/area/solship/crew) -"wf" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/curtain/open/bed,/turf/simulated/floor/tiled/dark/monotile,/area/solship/crew) +"wf" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood/walnut,/area/solship/crew) "wk" = (/obj/machinery/button/blast_door{id_tag = "merc_eng_storage"; name = "Storage Shutters"; pixel_x = 26; pixel_y = 24; req_access = list("SOL_ENGINEERING")},/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "wl" = (/obj/item/trash/salo,/turf/simulated/floor/plating,/area/solship/rockets) "wr" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/power/apc{dir = 4; pixel_y = 3; pixel_x = 27},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) "ww" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) -"wx" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue/half{dir = 4; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"wx" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/half{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "wy" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal,/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/pass) "wB" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "wF" = (/obj/machinery/cryopod{dir = 2},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/cryo) "wL" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/empty,/obj/effect/floor_decal/industrial/outline/red,/obj/structure/railing/mapped{dir = 8},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "wN" = (/obj/machinery/atmospherics/unary/tank/air{dir = 1},/obj/effect/floor_decal/industrial/outline/blue,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/can) -"wS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"wS" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "wZ" = (/obj/machinery/atmospherics/unary/cryo_cell,/obj/effect/floor_decal/corner/paleblue/mono,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "xb" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/jukebox,/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) -"xc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"xc" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/lord{pixel_y = -32},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "xf" = (/obj/structure/bed/chair/shuttle/blue,/obj/machinery/recharger/wallcharger{pixel_y = 24},/obj/effect/floor_decal/techfloor{dir = 10; icon_state = "techfloor_edges"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) -"xo" = (/obj/effect/floor_decal/techfloor/orange,/obj/structure/ship_munition/disperser_charge/emp,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) +"xt" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "xu" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/black/bordercorner{dir = 4},/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"xv" = (/obj/structure/railing/mapped{dir = 1; icon_state = "railing0-1"},/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/plating,/area/solship/maint) "xw" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/machinery/light{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "xx" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled/white,/area/solship/canteen) -"xB" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/cobweb{dir = 1},/obj/effect/floor_decal/industrial/warning/dust{dir = 1},/obj/structure/sign/warning{pixel_y = 3; dir = 8; pixel_x = 35},/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv2"},/turf/simulated/floor/plating,/area/solship/rockets) +"xB" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/decal/cleanable/cobweb{dir = 1},/obj/effect/floor_decal/industrial/warning/dust{dir = 1},/obj/structure/sign/warning{pixel_y = 3; dir = 8; pixel_x = 35},/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv2"},/obj/machinery/light/small,/turf/simulated/floor/plating,/area/solship/rockets) "xC" = (/obj/effect/wallframe_spawn/no_grille,/turf/simulated/floor/plating,/area/solship/medical) "xF" = (/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/pass) "xI" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/solship/canteen) +"xT" = (/obj/structure/railing/mapped,/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/plating,/area/solship/maint) "yb" = (/obj/structure/hygiene/sink,/obj/effect/decal/cleanable/blood/splatter,/turf/simulated/floor/tiled/freezer,/area/solship/crew) "yh" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/techfloor/corner{dir = 4},/obj/effect/floor_decal/techfloor/corner,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/atmos{name = "Atmospherics"},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "yi" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"yk" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/firealarm{dir = 1; pixel_y = -20},/turf/simulated/floor/lino,/area/solship/capquarters) +"yk" = (/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/random/lootable_mgsbox,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "yo" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "yw" = (/obj/effect/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/solship/rockets) "yy" = (/obj/machinery/portable_atmospherics/canister/air/airlock{start_pressure = 1900},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) -"yz" = (/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/table/steel,/obj/item/tableflag,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) -"yB" = (/obj/effect/floor_decal/industrial/warning{dir = 8; icon_state = "warning"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/solship/cryo) +"yz" = (/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/structure/table/steel,/obj/item/tableflag/antar,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) +"yB" = (/obj/effect/floor_decal/industrial/warning{dir = 8; icon_state = "warning"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled/white,/area/solship/cryo) "yC" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/railing/mapped,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/solship/maint) "yG" = (/obj/effect/floor_decal/industrial/hatch/red,/obj/machinery/door/blast/regular{dir = 4; id_tag = "mercship_bridge_observation"; name = "Observation Blast Doors"},/turf/simulated/floor/reinforced/airless,/area/solship/bridge) "yH" = (/obj/structure/table/standard,/obj/machinery/chemical_dispenser/bar_coffee/full{pixel_y = 8},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/lino,/area/solship/canteen) "yT" = (/obj/effect/wallframe_spawn/reinforced/no_grille,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/canteen) -"yU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light,/obj/effect/floor_decal/corner/paleblue{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"yU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/light,/obj/effect/floor_decal/corner/red{dir = 4},/obj/random/lootable_mgsbox,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "yY" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "yZ" = (/obj/structure/closet/cabinet,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/clothing/under/pj/red,/obj/item/clothing/shoes/slippers/worn,/turf/simulated/floor/lino,/area/solship/crew) -"zf" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/machinery/access_button/airlock_interior{master_tag = "mercship_airlock"; name = "interior access button"; pixel_x = -8; pixel_y = 24; id_tag = "mercship_airlock_inner"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"zf" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/embedded_controller/radio/airlock/airlock_controller{dir = 2; frequency = 1911; id_tag = "lord_dock"; name = "Fore Dock Airlock Controller"; pixel_x = -8; pixel_y = 24; req_access = list("SOL_MAIN_ACCESS")},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "zp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 6},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "zr" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/alarm{pixel_y = 24},/obj/machinery/optable,/turf/simulated/floor/tiled/white,/area/exploration_shuttle/texas/med) -"zs" = (/obj/machinery/door/airlock/external/bolted/cycling{frequency = 1911; id_tag = "mercship_airlock_outer"; name = "Fore Dock Airlock"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/fronthall) -"zw" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 10},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"zA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"zs" = (/obj/structure/catwalk,/obj/effect/floor_decal/industrial/warning/full,/obj/machinery/light/small{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/vent/high_volume{dir = 4; id_tag = "lord_dock_pump"},/turf/simulated/floor/plating,/area/solship/fronthall) +"zw" = (/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"zA" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/cyan{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "zC" = (/obj/structure/table/standard,/obj/random/smokes,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "zD" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "zP" = (/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/light/small{dir = 1},/obj/machinery/power/port_gen/pacman/super/potato,/turf/simulated/floor/plating,/area/solship/reactorroom) "zQ" = (/obj/machinery/sealgen/away{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 8; icon_state = "warning"},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) -"zR" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/sign/double/solgovflag/right{dir = 1; pixel_x = -13; pixel_y = -27},/obj/structure/sign/double/solgovflag/left{dir = 1; pixel_y = -27; pixel_x = 19},/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv2"},/turf/simulated/floor/plating,/area/solship/rockets) +"zR" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv2"},/turf/simulated/floor/plating,/area/solship/rockets) "zT" = (/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "Aj" = (/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/oxygen/prechilled,/obj/effect/floor_decal/industrial/outline/blue,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "Ak" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "Ao" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/table/rack,/obj/item/stack/material/plasteel/fifty,/obj/item/stack/material/ocp/ten,/obj/item/stack/material/ocp/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/item/stack/material/glass/phoronrglass/ten,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) +"AC" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "bhunter_shuttle_outer"; name = "Fore Dock Airlock"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) "AH" = (/obj/structure/table/marble,/obj/machinery/microwave{pixel_y = 4},/obj/effect/floor_decal/corner/green/diagonal,/turf/simulated/floor/tiled/white,/area/solship/canteen) -"AJ" = (/turf/simulated/wall/r_wall,/area/solship/surgery) +"AJ" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/surgery) "AO" = (/obj/effect/floor_decal/corner/brown{dir = 5},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/structure/table/standard,/obj/machinery/recharger,/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "AY" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/ofd) -"AZ" = (/obj/structure/catwalk,/obj/effect/floor_decal/industrial/warning/full,/obj/machinery/embedded_controller/radio/airlock/airlock_controller{dir = 1; frequency = 1911; id_tag = "mercship_airlock"; name = "Fore Dock Airlock Controller"; pixel_x = 8; pixel_y = -24},/obj/machinery/airlock_sensor{frequency = 1911; id_tag = "mercship_airlock_sensor"; master_tag = "mercship_airlock"; pixel_x = -6; pixel_y = -24},/obj/machinery/light/small{dir = 1},/obj/structure/sign/solgov{pixel_y = 31},/turf/simulated/floor/plating,/area/solship/fronthall) +"AZ" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/external/bolted_open{frequency = 1911; id_tag = "lord_dock_inner"; name = "Fore Dock Airlock"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/fronthall) "Ba" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/rack,/obj/item/barrier,/obj/item/barrier,/obj/item/barrier,/obj/item/barrier,/obj/item/barrier,/obj/item/barrier,/obj/item/barrier,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) "Bi" = (/obj/structure/ship_munition/disperser_charge/emp,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) "Bn" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/reagent_dispensers/fueltank,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) @@ -523,22 +512,22 @@ "Bx" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/computer/ship/navigation/telescreen{pixel_y = 27},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating,/area/solship/rockets) "BA" = (/turf/simulated/floor/plating,/area/solship/ofd) "BL" = (/obj/effect/floor_decal/techfloor,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/light{dir = 1},/obj/item/clothing/glasses/meson,/obj/item/clothing/glasses/material,/obj/structure/table/rack,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"BN" = (/turf/simulated/wall/r_wall,/area/solship/equiproom) +"BN" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/equiproom) "BO" = (/obj/machinery/atmospherics/portables_connector,/obj/effect/floor_decal/industrial/outline/blue,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "BQ" = (/obj/machinery/door/airlock/hatch{name = "Maintenance Access"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "BS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/centcom{name = "Air Atmos"},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/airlock) -"Cb" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/corner/paleblue,/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Energy Sidearms"},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"Cb" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/firealarm{pixel_y = 24},/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Energy Sidearms"},/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/item/gun/energy/gun,/obj/effect/floor_decal/corner/red,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "Cd" = (/obj/effect/floor_decal/corner_techfloor_grid,/obj/effect/floor_decal/corner_techfloor_grid{dir = 8},/obj/effect/floor_decal/techfloor/corner{dir = 8},/obj/effect/floor_decal/techfloor/corner,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "Cg" = (/obj/structure/table/standard,/obj/machinery/reagent_temperature,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) -"Cl" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/capquarters) +"Cl" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/capquarters) "Cq" = (/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/industrial/loading{dir = 8},/obj/structure/sign/warning{pixel_y = 32},/turf/simulated/floor/plating,/area/solship/rockets) -"Cx" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/black/bordercorner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"Cx" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/black/bordercorner{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "CI" = (/obj/structure/plasticflaps/airtight,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv2"},/turf/simulated/floor/plating,/area/solship/rockets) "CK" = (/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/black/bordercorner{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"CP" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"CP" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/effect/decal/cleanable/dirt,/obj/structure/closet/emcloset,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "CT" = (/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/can) "CX" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Sidearms"},/obj/item/gun/projectile/pistol/military,/obj/item/gun/projectile/pistol/military,/obj/item/gun/projectile/pistol/military,/obj/item/gun/projectile/pistol/military,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"Db" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/bed,/obj/machinery/flasher{dir = 8; id_tag = "mercship_cell2_flash"; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) +"Db" = (/obj/effect/floor_decal/techfloor{dir = 5},/obj/structure/bed,/obj/machinery/flasher{dir = 8; id_tag = "mercship_cell2_flash"; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "De" = (/obj/effect/shuttle_landmark/solship/nav_northwest,/turf/space,/area/space) "Dh" = (/obj/effect/floor_decal/corner/brown/full,/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "Dl" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) @@ -548,36 +537,35 @@ "DE" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/obj/item/stack/material/glass/fifty,/obj/item/stack/material/glass/fifty,/obj/item/stack/material/glass/reinforced/fifty,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/steel/fifty,/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "DI" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/railing/mapped,/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "DK" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/blast/regular{dir = 4; id_tag = "mercship_reactor_access"; name = "Reactor Access Blast Door"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/reactorroom) -"DP" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/power/apc/high{name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/structure/table/rack/dark,/obj/item/rig/military/sol,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) +"DP" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/power/apc/high{name = "south bump"; pixel_y = -24},/obj/structure/cable/green,/obj/structure/table/rack/dark,/obj/item/rig/infantry/equipped,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "DQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "DS" = (/obj/structure/table/rack,/obj/item/mech_component/manipulators/combat,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) "DW" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"DZ" = (/obj/machinery/light/small,/turf/simulated/floor/wood/walnut,/area/solship/crew) +"DZ" = (/obj/machinery/light,/turf/simulated/floor/wood/walnut,/area/solship/crew) "Eb" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/lino,/area/solship/canteen) -"Ek" = (/turf/simulated/floor/lino,/area/solship/canteen) +"Ek" = (/obj/structure/lordbanner,/turf/simulated/floor/lino,/area/solship/canteen) "Eo" = (/obj/machinery/bodyscanner{dir = 4},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/medical) "Es" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/curtain/open/bed,/obj/machinery/door/firedoor,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "Ev" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Ey" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/turf/simulated/floor/tiled/white,/area/solship/medical) "EA" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/table/rack/dark,/obj/item/storage/box/fragshells,/obj/item/gun/launcher/grenade,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) -"EB" = (/obj/structure/table/rack,/obj/item/stack/material/aluminium/ten,/obj/item/stack/material/plastic/ten,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/glass/fifty,/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"EB" = (/obj/structure/table/rack,/obj/item/stack/material/aluminium/ten,/obj/item/stack/material/plastic/ten,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/glass/fifty,/obj/effect/floor_decal/techfloor{dir = 1},/obj/item/lordbanner,/obj/item/lordbanner,/obj/item/lordbanner,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "ED" = (/obj/structure/table/standard,/obj/random/contraband,/obj/random/coin,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"EF" = (/obj/effect/floor_decal/industrial/hatch/red,/obj/machinery/door/blast/regular{dir = 2; id_tag = "merccanteenbd"; name = "Canteen Observation Blast Doors"},/turf/simulated/floor/reinforced/airless,/area/space) +"EF" = (/obj/effect/floor_decal/industrial/hatch/red,/obj/machinery/door/blast/regular{dir = 2; id_tag = "merccanteenbd"; name = "Canteen Observation Blast Doors"},/turf/simulated/floor/plating,/area/solship/canteen) "EI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/lino,/area/solship/canteen) -"EJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue/half{dir = 4; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"ES" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 5},/turf/simulated/wall,/area/solship/capquarters) -"EX" = (/turf/space,/area/solship/ofd) +"EJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/half{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"ES" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/light_switch{dir = 4; pixel_x = -24; pixel_y = 6},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "EZ" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/obj/effect/floor_decal/industrial/outline/red,/obj/structure/railing/mapped,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "Fe" = (/obj/effect/wallframe_spawn/reinforced,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/bridge) "Fg" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/maint) -"Fj" = (/turf/simulated/wall,/area/solship/surgery) +"Fj" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/surgery) "Fo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "Fp" = (/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/black/bordercorner{dir = 8},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/bluecross_1{pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Fr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Fu" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/lino,/area/solship/canteen) -"Fx" = (/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) +"Fx" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) "FH" = (/obj/effect/wallframe_spawn/reinforced,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/door/blast/shutters/open{id_tag = "mercship_cell1_bd"},/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/jail) -"FJ" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/alarm{pixel_y = 24},/obj/item/bedsheet/blue,/turf/simulated/floor/lino,/area/solship/crew) +"FJ" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/alarm{pixel_y = 24},/obj/item/bedsheet/hos,/turf/simulated/floor/lino,/area/solship/crew) "FM" = (/obj/machinery/power/apc/high{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "FT" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/wood/walnut,/area/solship/canteen) "FX" = (/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) @@ -585,81 +573,77 @@ "Gc" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small,/turf/simulated/floor/tiled/dark,/area/solship/ofd) "Gl" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/railing/mapped{dir = 8},/obj/structure/ship_munition/disperser_charge/emp,/turf/simulated/floor/plating,/area/solship/ofd) "Gs" = (/obj/structure/catwalk,/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/solship/maint) -"Gw" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/ofd) +"Gw" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/ofd) "Gx" = (/obj/effect/floor_decal/spline/fancy/wood/corner,/turf/simulated/floor/lino,/area/solship/canteen) "GB" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light/small,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/ofd) "GC" = (/obj/machinery/computer/ship/helm{dir = 4},/obj/effect/floor_decal/techfloor{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) -"GD" = (/turf/simulated/wall/r_wall,/area/solship/bridge) "GE" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/corner/black/bordercorner2,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "GF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techmaint,/area/solship/engineering) "GH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "GU" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/vending/dinnerware,/turf/simulated/floor/tiled/white,/area/solship/canteen) "GY" = (/obj/structure/table/marble,/obj/machinery/door/firedoor,/obj/item/stack/material/plastic/ten{pixel_x = -4; pixel_y = -4},/obj/item/stack/material/aluminium/ten{pixel_y = -4},/obj/item/stack/material/glass/ten{pixel_x = 4; pixel_y = -4},/obj/machinery/fabricator/micro,/turf/simulated/floor/tiled/white/monotile,/area/solship/canteen) -"Ha" = (/turf/simulated/wall/r_wall,/area/solship/medical) "Hb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/effect/floor_decal/spline/fancy/wood,/obj/effect/floor_decal/corner/brown{dir = 5},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) -"He" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/effect/floor_decal/corner_techfloor_grid,/obj/effect/floor_decal/techfloor/orange/corner,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"He" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/effect/floor_decal/techfloor/orange/corner,/obj/effect/floor_decal/corner_techfloor_grid,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "Hi" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "Hk" = (/obj/effect/floor_decal/techfloor,/obj/structure/table/rack,/obj/item/stack/material/steel/fifty,/obj/item/stack/material/glass/fifty,/obj/item/stack/material/aluminium/fifty,/obj/item/stack/material/plastic/fifty,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"Hr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/corner/paleblue/half{dir = 4; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"Hu" = (/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/airless,/area/exploration_shuttle/texas/airlock) -"HA" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/thruster/point,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) +"Hr" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/corner/red/half{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"Hu" = (/obj/machinery/ion_engine{dir = 8},/turf/simulated/floor/plating,/area/solship/maint) +"HA" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/thruster/point,/obj/machinery/light/small,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "HC" = (/obj/machinery/shield_diffuser,/turf/simulated/floor/plating,/area/solship/rockets) "HQ" = (/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = -15},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = 10},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = 2},/obj/structure/missile{dir = 1; pixel_y = -8; pixel_x = -6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) -"HR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/double/solgovflag/left{dir = 8; pixel_y = 13; pixel_x = 30},/obj/structure/sign/double/solgovflag/right{dir = 8; pixel_y = -19; pixel_x = 30},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"HW" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/lino,/area/solship/canteen) +"HR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"HW" = (/obj/machinery/light{dir = 8},/obj/structure/lordbanner,/turf/simulated/floor/lino,/area/solship/canteen) "Ia" = (/obj/structure/kitchenspike,/obj/effect/decal/cleanable/blood/splatter,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/freezer,/area/solship/freezer) -"Ib" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/corner/paleblue,/obj/effect/submap_landmark/spawnpoint/solship/engineer,/turf/simulated/floor/tiled/white,/area/solship/cryo) -"Ij" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/obj/effect/floor_decal/corner/paleblue/half{dir = 1; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"Ib" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/submap_landmark/spawnpoint/solship/engineer,/turf/simulated/floor/tiled/white,/area/solship/cryo) +"Ij" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 8},/obj/effect/floor_decal/corner/red/half{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "Im" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 8},/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "In" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/structure/closet/crate/trashcart,/turf/simulated/floor/lino,/area/solship/canteen) "Ip" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"Iq" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/item/bedsheet/blue,/turf/simulated/floor/lino,/area/solship/crew) +"Iq" = (/obj/structure/bed,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/item/bedsheet/hos,/turf/simulated/floor/lino,/area/solship/crew) "Iy" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"Iz" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/green/diagonal,/obj/item/tableflag,/turf/simulated/floor/tiled/white,/area/solship/canteen) +"Iz" = (/obj/random/lootable_mgsbox,/turf/simulated/floor/plating,/area/solship/maint) "IA" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/solship/reactorroom) "IM" = (/obj/effect/floor_decal/techfloor{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/effect/decal/cleanable/dirt,/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) -"IO" = (/obj/machinery/constructable_frame/computerframe{dir = 1},/obj/effect/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) -"IP" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/bridge) +"IO" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/computer/ship/engines{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "IR" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) -"IX" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/structure/sign/solgov{pixel_y = 31},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) -"IY" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/lino,/area/solship/capquarters) +"IX" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/cryo) +"IY" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/light{dir = 4},/turf/simulated/floor/lino,/area/solship/capquarters) "IZ" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/thruster/hunter,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "Ja" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/thruster/planet,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) -"Jf" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/obj/structure/table/rack/dark,/obj/item/rig/military/sol,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) +"Jf" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/obj/structure/table/rack/dark,/obj/item/rig/infantry/equipped,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "Jg" = (/obj/effect/wallframe_spawn/reinforced,/obj/machinery/door/firedoor,/turf/simulated/floor/plating,/area/solship/canteen) -"Jh" = (/turf/simulated/wall/r_wall,/area/solship/fronthall) +"Jh" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/fronthall) "Jj" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/walnut,/area/solship/crew) -"Jn" = (/obj/structure/railing/mapped{dir = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/plating,/area/solship/bridge) -"Js" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 9},/turf/simulated/wall,/area/solship/capquarters) +"Jn" = (/obj/machinery/light{dir = 4},/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "Jx" = (/obj/structure/table/marble,/obj/effect/floor_decal/corner/green/diagonal,/turf/simulated/floor/tiled/white,/area/solship/canteen) "Jy" = (/obj/machinery/atmospherics/pipe/simple/visible/red{dir = 10},/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "JB" = (/turf/simulated/floor/plating,/area/space) "JD" = (/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/lino,/area/solship/canteen) "JG" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/black_vest,/obj/item/clothing/accessory/storage/brown_vest,/obj/item/clothing/accessory/storage/brown_vest,/turf/simulated/floor/tiled/techfloor,/area/solship/equiproom) "JH" = (/obj/machinery/door/airlock/maintenance,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) -"JJ" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/curtain/open/bed,/turf/simulated/floor/tiled/dark/monotile,/area/solship/crew) +"JJ" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/curtain/open/bed,/turf/simulated/floor/wood/walnut,/area/solship/crew) "JK" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/structure/sign/warning/docking_area{dir = 4; pixel_x = -32},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"JQ" = (/obj/structure/railing/mapped,/obj/machinery/light{dir = 4},/turf/simulated/floor/plating,/area/solship/bridge) +"JQ" = (/obj/machinery/light{dir = 4},/obj/structure/sign/double/lordflag/right{pixel_y = 32},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/firecloset,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "JZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) "Ki" = (/turf/simulated/floor/tiled/techfloor,/area/solship/securearmory) "Kl" = (/obj/structure/table/marble,/obj/machinery/reagent_temperature,/obj/effect/floor_decal/corner/green/diagonal,/turf/simulated/floor/tiled/white,/area/solship/canteen) -"Kn" = (/obj/machinery/door/airlock/centcom{id_tag = null; name = "Cell"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/jail) +"Kn" = (/obj/machinery/door/airlock/centcom{id_tag = null; name = "Cell"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "Ku" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"Kv" = (/obj/effect/floor_decal/techfloor/orange,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) +"Kv" = (/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/solship/ofd) "KH" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/light/small,/turf/simulated/floor/tiled/freezer,/area/solship/crew) "KI" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/machinery/light,/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "KL" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/empty,/obj/effect/floor_decal/industrial/outline/red,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "KN" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "KQ" = (/obj/structure/bed/chair/padded/brown{dir = 1},/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "KV" = (/turf/simulated/floor/tiled/techfloor,/area/solship/equiproom) -"KW" = (/turf/simulated/wall,/area/solship/engineering) +"KW" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/engineering) "Le" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 9},/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "Li" = (/obj/machinery/light{dir = 1},/obj/structure/bed/chair/padded/brown,/turf/simulated/floor/wood/mahogany,/area/solship/canteen) "Lk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/solship/crew) "Ll" = (/obj/structure/flora/pottedplant/fern,/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/turf/simulated/floor/lino,/area/solship/canteen) "Ln" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/crate,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"Lt" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 4},/obj/effect/floor_decal/techfloor/orange/corner,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/overmap/visitable/ship/solship,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) -"Lv" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/floor_decal/corner/paleblue{dir = 5},/obj/effect/submap_landmark/spawnpoint/solship,/turf/simulated/floor/tiled/white,/area/solship/cryo) +"Lt" = (/obj/effect/floor_decal/techfloor/orange/corner{dir = 4},/obj/effect/floor_decal/techfloor/orange/corner,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/overmap/visitable/ship/solship,/obj/effect/floor_decal/corner_techfloor_grid{dir = 4},/obj/effect/floor_decal/corner_techfloor_grid,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"Lv" = (/obj/effect/floor_decal/industrial/warning,/obj/effect/submap_landmark/spawnpoint/solship,/obj/effect/floor_decal/corner/red{dir = 5},/turf/simulated/floor/tiled/white,/area/solship/cryo) "Lw" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/multi_tile/civilian{name = "Equipment Room"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark/monotile,/area/solship/equiproom) "Lz" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/machinery/door/airlock/multi_tile/civilian{name = "Canteen"},/obj/effect/floor_decal/spline/fancy/wood/corner{dir = 8},/turf/simulated/floor/tiled/dark/monotile,/area/solship/canteen) "LK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/obj/machinery/light,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/airlock) @@ -667,18 +651,19 @@ "LX" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/machinery/firealarm{pixel_y = 24},/turf/simulated/floor/lino,/area/solship/canteen) "LZ" = (/obj/structure/table/steel_reinforced,/obj/item/inflatable_dispenser,/obj/item/inflatable_dispenser,/obj/effect/floor_decal/techfloor{dir = 8},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "Me" = (/obj/effect/floor_decal/borderfloorwhite/corner{dir = 4},/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/paleblue/border{dir = 8},/turf/simulated/floor/tiled/white,/area/solship/medical) -"Mf" = (/obj/structure/table/reinforced,/obj/structure/railing/mapped{dir = 1},/obj/item/tableflag,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) -"Mi" = (/turf/simulated/wall/r_wall,/area/solship/rockets/stor) -"Ml" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/effect/floor_decal/corner_techfloor_grid{dir = 4},/obj/effect/floor_decal/techfloor/orange/corner{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) -"Mn" = (/obj/machinery/shipsensors,/turf/simulated/floor/reinforced/airless,/area/exploration_shuttle/texas/jail) +"Mf" = (/obj/structure/table/reinforced,/obj/structure/railing/mapped{dir = 1},/obj/item/tableflag/antar,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) +"Mi" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/rockets/stor) +"Ml" = (/obj/structure/bed/chair/comfy/black{dir = 8},/obj/effect/floor_decal/techfloor/orange/corner{dir = 4},/obj/effect/floor_decal/corner_techfloor_grid{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"Mn" = (/obj/machinery/shipsensors,/turf/simulated/floor/reinforced/airless,/area/exploration_shuttle/texas/pass) "Mo" = (/obj/effect/floor_decal/corner/green/diagonal,/obj/effect/decal/cleanable/flour,/turf/simulated/floor/tiled/white,/area/solship/canteen) "Mq" = (/obj/structure/table/marble,/obj/machinery/reagentgrinder/juicer{pixel_y = 8},/obj/effect/floor_decal/corner/green/diagonal,/turf/simulated/floor/tiled/white,/area/solship/canteen) "Mw" = (/obj/machinery/cryopod{dir = 1},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/cryo) "My" = (/obj/machinery/atmospherics/unary/outlet_injector{use_power = 1},/turf/simulated/floor/reinforced/airless,/area/exploration_shuttle/texas/pass) "Mz" = (/obj/structure/hygiene/toilet{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/light/small{dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -20},/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"MC" = (/obj/structure/mattress,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/obj/effect/floor_decal/techfloor{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/jail) -"MG" = (/turf/simulated/wall,/area/solship/crew) -"MH" = (/obj/effect/wallframe_spawn/reinforced/titanium,/obj/machinery/door/blast/regular/open{density = 0; dir = 4; id_tag = "bhunter_external"},/obj/effect/paint/black,/turf/simulated/floor,/area/exploration_shuttle/texas/pass) +"MB" = (/obj/machinery/ion_engine{dir = 8},/obj/effect/paint/merc,/turf/simulated/floor/plating,/area/solship/maint) +"MC" = (/obj/structure/mattress,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4; level = 2},/obj/effect/floor_decal/techfloor{dir = 9},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"MG" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/crew) +"MH" = (/obj/effect/wallframe_spawn/reinforced,/obj/machinery/door/blast/regular/open{density = 0; dir = 4; id_tag = "bhunter_external"},/turf/simulated/floor,/area/exploration_shuttle/texas/pass) "MI" = (/obj/structure/catwalk,/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/plating,/area/solship/rockets) "ML" = (/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "MP" = (/obj/effect/floor_decal/corner/green/diagonal,/turf/simulated/floor/tiled/white,/area/solship/canteen) @@ -689,23 +674,23 @@ "MZ" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Na" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) "Nk" = (/obj/structure/closet/secure_closet/freezer/kitchen{req_access = list()},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/solship/freezer) -"No" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) -"Nx" = (/obj/structure/lattice,/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/rockets) +"No" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) +"Nx" = (/obj/structure/lattice,/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/rockets) "Ny" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/structure/catwalk,/obj/machinery/firealarm{dir = 1; pixel_y = -20},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/solship/reactorroom) "NR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/lino,/area/solship/canteen) "Oe" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/civilian{id_tag = "mercstall"; name = "Stall"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/firedoor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/solship/crew) "Ok" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark/monotile,/area/solship/fronthall) "On" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/button/alternate/door/bolts{id_tag = "mercstall"; name = "Door Lock"; pixel_x = -6; pixel_y = 24},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"Oo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"Oo" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Ot" = (/obj/structure/closet/crate/munitions/payload/diffuser,/obj/effect/floor_decal/techfloor{dir = 6},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "Oy" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/powered/pump/filled,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/maint) "Oz" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) -"OF" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/sign/solgov{pixel_y = -31},/turf/simulated/floor/tiled/dark,/area/solship/ofd) +"OF" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/securearmory) "OG" = (/obj/machinery/atmospherics/pipe/simple/hidden/cyan{dir = 10},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 23},/obj/structure/cable/cyan{d2 = 8; icon_state = "0-8"},/obj/structure/catwalk,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/can) "OH" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/computer/modular{dir = 4},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) "OI" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techfloor,/area/solship/securearmory) "OO" = (/obj/machinery/door/firedoor,/obj/effect/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/solship/capquarters) -"OS" = (/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"OS" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "OX" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/button/alternate/door/bolts{id_tag = "mercshower"; name = "Door Lock"; pixel_x = -6; pixel_y = 24},/obj/machinery/alarm{dir = 1; pixel_y = -20},/turf/simulated/floor/tiled/freezer,/area/solship/crew) "Pd" = (/obj/structure/table/rack,/obj/item/clothing/accessory/storage/bandolier,/obj/item/clothing/accessory/storage/bandolier,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/obj/item/device/binoculars,/turf/simulated/floor/tiled/techfloor,/area/solship/equiproom) "Pg" = (/obj/structure/plasticflaps/airtight,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/conveyor/ammobelt{dir = 8; id = "solconv1"},/turf/simulated/floor/plating,/area/solship/rockets) @@ -715,27 +700,28 @@ "Pv" = (/obj/machinery/atmospherics/unary/freezer{icon_state = "freezer"},/obj/effect/floor_decal/corner/paleblue/mono,/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "PC" = (/obj/machinery/smartfridge/secure/medbay{dir = 4; req_access = list("MERC_MEDIC_ACCESS")},/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) "PH" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/hatch{name = "Maintenance Access"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/solship/freezer) +"PQ" = (/obj/machinery/embedded_controller/radio/airlock/airlock_controller{dir = 2; frequency = 1911; id_tag = "lord_dock"; name = "Fore Dock Airlock Controller"; pixel_x = 8; pixel_y = 24; req_access = list("SOL_MAIN_ACCESS")},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/solship/fronthall) "PW" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/payload/antimissile,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) -"Qj" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/cyan{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"Qf" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 5},/obj/effect/floor_decal/borderfloor/corner2,/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 6},/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/machinery/portable_atmospherics/canister/air/airlock,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Ql" = (/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/black/border{dir = 5},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"Qo" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/table/steel,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) -"Qw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals6,/obj/effect/floor_decal/corner/paleblue/half{dir = 1; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"Qo" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/table/steel_reinforced,/obj/item/stack/sandbag_empty/random_amount,/obj/item/stack/sandbag_empty/random_amount,/obj/item/stack/sandbag_empty/random_amount,/obj/item/stack/sandbag_empty/random_amount,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) +"Qw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/steeldecal/steel_decals6,/obj/effect/floor_decal/corner/red/half{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "Qy" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light_switch{dir = 1; pixel_y = -28},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/ofd) -"QH" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/effect/submap_landmark/spawnpoint/solship/medic,/turf/simulated/floor/tiled/white,/area/solship/cryo) +"QH" = (/obj/effect/floor_decal/industrial/warning{dir = 1; icon_state = "warning"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/submap_landmark/spawnpoint/solship/medic,/obj/effect/floor_decal/corner/red{dir = 10},/turf/simulated/floor/tiled/white,/area/solship/cryo) "QJ" = (/obj/structure/safe{tumbler_1_open = 45; tumbler_1_pos = 40; tumbler_2_open = 30; tumbler_2_pos = 40},/obj/machinery/light{dir = 1},/obj/effect/floor_decal/corner/brown/three_quarters{dir = 8},/obj/item/gun/energy/incendiary_laser,/obj/item/gun/projectile/shotgun/sabotgun,/obj/item/ammo_magazine/shotholder/sabot,/obj/item/ammo_magazine/shotholder/sabot,/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) -"QQ" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/obj/machinery/power/smes/buildable/preset/torch/engine_main,/turf/simulated/floor/plating,/area/solship/reactorroom) +"QQ" = (/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/light/small{dir = 1},/obj/machinery/power/smes/buildable/preset/on_full,/turf/simulated/floor/plating,/area/solship/reactorroom) "QR" = (/obj/structure/bed/chair/office/dark{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/wood/walnut,/area/solship/canteen) "QS" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "QZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/black/bordercorner{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "Rb" = (/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = -15},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = 10},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = 2},/obj/structure/missile{dir = 1; pixel_y = -19; pixel_x = -6},/obj/effect/decal/cleanable/liquid_fuel,/obj/machinery/light/small{dir = 4},/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) -"Rf" = (/obj/effect/floor_decal/techfloor{dir = 1; icon_state = "techfloor_edges"},/obj/machinery/computer/ship/navigation,/obj/structure/sign/double/solgovflag/left{pixel_x = -16; pixel_y = 28},/obj/structure/sign/double/solgovflag/right{pixel_y = 28; pixel_x = 16},/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) +"Rf" = (/obj/effect/floor_decal/techfloor{dir = 1; icon_state = "techfloor_edges"},/obj/machinery/computer/ship/navigation,/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) "Rh" = (/obj/effect/floor_decal/borderfloorwhite{dir = 5},/obj/effect/floor_decal/corner/paleblue/border{dir = 5},/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/vending/medical{req_access = list("SOL_MEDIC_ACCESS")},/turf/simulated/floor/tiled/white,/area/solship/medical) -"Rj" = (/obj/effect/floor_decal/corner/brown{dir = 9},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) +"Rj" = (/obj/effect/floor_decal/corner/brown{dir = 9},/obj/structure/sign/booker{pixel_x = -32},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "Rl" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/catwalk,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/plating,/area/solship/reactorroom) "Rm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/centcom{name = "Cockpit"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"Ro" = (/obj/machinery/door/firedoor,/obj/effect/wallframe_spawn/reinforced,/obj/effect/wallframe_spawn/reinforced,/turf/simulated/floor/plating,/area/solship/capquarters) +"Ro" = (/obj/machinery/door/firedoor,/obj/effect/wallframe_spawn/reinforced/polarized{id = "patrol_cabinet_windows"},/turf/simulated/floor/plating,/area/solship/capquarters) "Rs" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"RO" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/cyan,/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"RO" = (/obj/effect/floor_decal/techfloor,/obj/effect/decal/cleanable/dirt,/obj/machinery/power/terminal,/obj/structure/cable/cyan{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable/green,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "RQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "RT" = (/obj/structure/table/marble,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/white/monotile,/area/solship/canteen) "RX" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/machinery/light{dir = 4},/turf/simulated/floor/lino,/area/solship/canteen) @@ -744,7 +730,7 @@ "SF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "SO" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "SP" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/powered/scrubber,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/machinery/light,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"SR" = (/obj/structure/table/standard,/obj/item/tableflag,/turf/simulated/floor/wood/walnut,/area/solship/canteen) +"SR" = (/obj/structure/table/standard,/obj/item/tableflag/antar,/turf/simulated/floor/wood/walnut,/area/solship/canteen) "SZ" = (/obj/machinery/button/alternate/door/bolts{dir = 1; id_tag = "mercship_cell1"; name = "Cell One Lock"; pixel_x = -6; pixel_y = -24; req_access = list("MERC_MAIN_ACCESS")},/obj/machinery/button/blast_door{dir = 1; id_tag = "mercship_cell1_bd"; name = "Cell One Shutters"; pixel_x = 6; pixel_y = -24; req_access = list("MERC_MAIN_ACCESS")},/obj/machinery/button/flasher{id_tag = "mercship_cell1_flash"; pixel_y = -34; req_access = list("MERC_MAIN_ACCESS")},/obj/structure/flora/pottedplant/flower,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "Th" = (/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "Tl" = (/obj/machinery/embedded_controller/radio/airlock/docking_port{cycle_to_external_air = 1; dir = 1; frequency = 1911; id_tag = "bhunter_shuttle"; pixel_y = -24; tag_exterior_sensor = "bhunter_shuttle_sensor_external"},/obj/effect/floor_decal/techfloor{dir = 10; icon_state = "techfloor_edges"},/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/texas/airlock) @@ -762,86 +748,85 @@ "Ub" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/turf/simulated/floor/wood/walnut,/area/solship/crew) "Ue" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/turf/simulated/floor/tiled/dark/monotile,/area/solship/equiproom) "Uf" = (/obj/effect/floor_decal/techfloor/corner{dir = 1},/obj/item/gun/projectile/hornetsniper,/obj/structure/table/rack/dark,/obj/item/ammo_casing/rifle/military/large,/obj/item/ammo_casing/rifle/military/large,/obj/item/ammo_casing/rifle/military/large,/obj/item/ammo_casing/rifle/military/large,/obj/item/ammo_casing/rifle/military/large,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) -"Ug" = (/obj/effect/paint/black,/turf/simulated/wall/titanium,/area/exploration_shuttle/texas/jail) -"Ul" = (/obj/effect/floor_decal/techfloor{dir = 5; icon_state = "techfloor_edges"},/obj/item/device/binoculars{pixel_y = -6; pixel_x = -6},/obj/structure/table/steel,/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/item/clothing/accessory/ribbon/solgov/peace{pixel_y = 10; desc = "A military decoration, awarded for service during a peacekeeping operation. Now it has lost all meaning."},/obj/item/tableflag,/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) +"Ul" = (/obj/effect/floor_decal/techfloor{dir = 5; icon_state = "techfloor_edges"},/obj/item/device/binoculars{pixel_y = -6; pixel_x = -6},/obj/structure/table/steel,/obj/machinery/light_switch{dir = 8; pixel_x = 24},/obj/item/clothing/accessory/ribbon/solgov/peace{pixel_y = 10; desc = "A military decoration, awarded for service during a peacekeeping operation. Now it has lost all meaning."},/obj/structure/sign/booker{pixel_y = 32},/obj/item/clothing/accessory/ribbon/solgov/peace{pixel_y = 10; desc = "A military decoration, awarded for service during a peacekeeping operation. Now it has lost all meaning."},/obj/item/tableflag/antar,/turf/simulated/floor/tiled/techfloor,/area/solship/ofd) "Up" = (/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 1},/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/corner_techfloor_grid{dir = 4},/obj/effect/floor_decal/techfloor/corner{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) "UB" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/structure/hygiene/sink,/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"UE" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/corner/paleblue/mono,/turf/simulated/floor/tiled/dark/monotile,/area/solship/equiproom) +"UE" = (/obj/machinery/recharge_station,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark/monotile,/area/solship/equiproom) "UG" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "UJ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloor{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 5},/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "US" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/black/border{dir = 8},/obj/effect/floor_decal/borderfloor/corner2{dir = 10},/obj/effect/floor_decal/corner/black/bordercorner2{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "UT" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood/walnut,/area/solship/canteen) -"UW" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/power/apc{dir = 2; name = "south bump"; operating = 1; pixel_y = -28},/obj/structure/cable/cyan,/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/jail) -"Ve" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/light,/obj/structure/table/rack/dark,/obj/item/rig/military/sol,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) +"UW" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/machinery/power/apc{dir = 2; name = "south bump"; operating = 1; pixel_y = -28},/obj/structure/cable/cyan,/obj/structure/cable/cyan{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) +"Ve" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/machinery/light,/obj/structure/table/rack/dark,/obj/item/rig/infantry/equipped,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "Vf" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/closet/radiation,/obj/machinery/power/apc/high{name = "south bump"; pixel_y = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled/techfloor,/area/solship/reactorroom) "Vi" = (/obj/machinery/computer/ship/sensors{dir = 4},/obj/effect/floor_decal/techfloor{dir = 6},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) -"Vn" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/lino,/area/solship/capquarters) +"Vn" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/lino,/area/solship/capquarters) "Vr" = (/obj/effect/floor_decal/steeldecal/steel_decals_central7,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/effect/submap_landmark/joinable_submap/solship,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) -"Vu" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/table/standard,/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/item/tableflag,/turf/simulated/floor/tiled/freezer,/area/solship/crew) +"Vu" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/structure/table/standard,/obj/machinery/light/small{dir = 8},/obj/effect/decal/cleanable/dirt,/obj/item/tableflag/antar,/turf/simulated/floor/tiled/freezer,/area/solship/crew) "VE" = (/obj/machinery/chemical_dispenser/full,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/turf/simulated/floor/tiled/white/monotile,/area/solship/medical) -"VF" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/newscaster{pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/obj/item/tableflag,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) +"VF" = (/obj/effect/floor_decal/techfloor{dir = 6},/obj/machinery/newscaster{pixel_x = 26},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/table/standard,/obj/effect/decal/cleanable/dirt,/obj/item/tableflag/antar,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "VK" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/techfloor/orange,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) "VR" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/solship/jail) -"VS" = (/obj/effect/floor_decal/techfloor/orange{dir = 5},/obj/structure/solbanner,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) +"VS" = (/obj/effect/floor_decal/techfloor/orange{dir = 5},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/bridge) "VU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/vault{name = "Armory"},/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/firedoor,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "VZ" = (/obj/effect/floor_decal/techfloor,/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Plasma"},/obj/item/gun/energy/k342{req_access = list()},/obj/item/gun/energy/k342{req_access = list()},/obj/item/gun/energy/k342{req_access = list()},/obj/item/gun/energy/k342{req_access = list()},/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/obj/item/cell/guncell/medium,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) -"Wc" = (/obj/machinery/light{dir = 4},/obj/structure/table/steel,/obj/random/powercell,/obj/random/powercell,/obj/machinery/cell_charger,/obj/effect/floor_decal/techfloor{dir = 9},/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) -"Wg" = (/turf/simulated/wall/r_wall,/area/solship/maint) +"Wc" = (/obj/machinery/light{dir = 4},/obj/random/powercell,/obj/random/powercell,/obj/machinery/cell_charger,/obj/effect/floor_decal/techfloor{dir = 9},/obj/structure/table/steel_reinforced,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/securearmory) +"Wg" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/maint) "Wp" = (/obj/effect/floor_decal/spline/fancy/wood,/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/machinery/light{dir = 1},/turf/simulated/floor/lino,/area/solship/canteen) -"Wq" = (/obj/structure/closet/firecloset,/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/alarm{dir = 8; pixel_x = 24},/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"Wq" = (/obj/machinery/alarm{dir = 8; pixel_x = 24},/obj/structure/table/steel_reinforced,/obj/item/pen,/obj/item/paper_bin,/obj/item/paper/lordinf,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "Wv" = (/obj/structure/mopbucket,/obj/machinery/alarm{dir = 1; pixel_y = -20},/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"Ww" = (/obj/effect/floor_decal/industrial/hatch/red,/obj/machinery/door/blast/regular{dir = 4; id_tag = "mercship_bridge_observation"; name = "Observation Blast Doors"},/turf/simulated/floor/reinforced/airless,/area/space) +"Ww" = (/obj/effect/floor_decal/industrial/hatch/red,/obj/machinery/door/blast/regular{dir = 4; id_tag = "mercship_bridge_observation"; name = "Observation Blast Doors"},/turf/simulated/floor/reinforced/airless,/area/solship/capquarters) "Wz" = (/obj/effect/paint/black,/turf/simulated/wall/r_titanium,/area/exploration_shuttle/texas/can) -"WC" = (/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -20},/turf/simulated/floor/lino,/area/solship/capquarters) +"WC" = (/obj/machinery/alarm{dir = 1; pixel_y = -20},/obj/structure/table/rack/dark,/obj/random/hat,/obj/random/gloves,/obj/random/glasses,/obj/random/lilgun,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "WF" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 23},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white/monotile,/area/solship/cryo) -"WS" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/canteen) -"WT" = (/obj/structure/closet/emcloset,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) +"WS" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/canteen) +"WT" = (/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) "WU" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal{dir = 4},/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) -"WW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/corner/paleblue/half{dir = 8; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"WX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/button/alternate/door/bolts{dir = 4; id_tag = "merc_bunk2"; name = "Door Lock"; pixel_x = -26; pixel_y = -24},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"Xa" = (/obj/machinery/power/smes/buildable/preset{_fully_charged = 1; _input_maxed = 1; _input_on = 1; _output_maxed = 1; _output_on = 1},/obj/structure/cable/cyan,/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"WW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/corner/red/half{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"WX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/machinery/button/alternate/door/bolts{dir = 4; id_tag = "patrol_lead"; name = "Door Lock"; pixel_x = -26; pixel_y = -24},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"Xa" = (/obj/machinery/power/smes/buildable/preset{_fully_charged = 1; _input_maxed = 1; _input_on = 1; _output_maxed = 1; _output_on = 1},/obj/machinery/light,/obj/structure/cable/cyan,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "Xb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/effect/overmap/visitable/ship/landable/exploration_shuttle/texas,/obj/effect/decal/cleanable/dirt,/obj/machinery/hologram/holopad/longrange,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) -"Xh" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/table/rack/dark,/obj/item/rig/military/sol,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) +"Xh" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/table/rack/dark,/obj/item/rig/infantry/equipped,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "Xm" = (/obj/effect/floor_decal/techfloor{dir = 4},/obj/effect/floor_decal/techfloor{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) "Xn" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/cyan{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "Xr" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"Xt" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 5},/obj/effect/paint/black,/obj/machinery/light,/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) +"Xt" = (/obj/structure/bed/chair/shuttle/blue{dir = 1},/obj/effect/floor_decal/techfloor{dir = 5},/obj/machinery/light,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/techfloor,/area/exploration_shuttle/texas/pass) "Xw" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/equipment/autoarm,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "XA" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "XE" = (/obj/effect/floor_decal/techfloor/orange{dir = 1},/obj/effect/floor_decal/techfloor/orange,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/light_switch{dir = 8; pixel_x = 24; pixel_y = 24},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/bridge) -"XG" = (/obj/structure/table/woodentable/walnut,/obj/effect/decal/cleanable/dirt,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"XP" = (/turf/simulated/wall/r_wall,/area/solship/crew) +"XG" = (/obj/structure/table/woodentable/walnut,/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/item/toy/figure/booker,/obj/item/reagent_containers/food/drinks/bottle/specialwhiskey,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"XP" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/crew) "XQ" = (/obj/effect/floor_decal/techfloor,/obj/structure/dispenser/oxygen,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "XR" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) -"XS" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"XS" = (/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/black/border{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "XU" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/black/bordercorner,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "XV" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/munitions/payload/explosive,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/rockets/stor) "XW" = (/obj/effect/shuttle_landmark/solship/nav_south,/turf/space,/area/space) "XZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/freezer,/area/solship/crew) -"Yc" = (/obj/machinery/light/small,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"Yc" = (/obj/effect/decal/cleanable/dirt,/obj/structure/table/rack/dark,/obj/random/glasses,/obj/random/technology_scanner,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) "Yh" = (/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/reagent_dispensers/watertank,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"Yj" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/catwalk,/obj/machinery/button/blast_door{dir = 8; id_tag = "mercship_reactor_access"; name = "Reactor Access Control"; pixel_x = 24; pixel_y = -6; req_access = list("SOL_ENGINEERING_ACCESS")},/turf/simulated/floor/plating,/area/solship/reactorroom) -"Yk" = (/obj/structure/closet/cabinet,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/clothing/under/pj/blue,/obj/item/clothing/shoes/slippers/worn,/turf/simulated/floor/lino,/area/solship/crew) +"Yj" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/structure/catwalk,/obj/machinery/button/blast_door{dir = 8; id_tag = "mercship_reactor_access"; name = "Reactor Access Control"; pixel_x = 24; pixel_y = -6; req_access = list("SOL_ENGINEERING_ACCESS")},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/solship/reactorroom) +"Yk" = (/obj/structure/sign/lord{pixel_y = 32},/turf/space,/area/space) "Yn" = (/obj/structure/railing/mapped{dir = 4},/obj/effect/floor_decal/industrial/outline/yellow,/obj/machinery/portable_atmospherics/powered/scrubber,/obj/structure/extinguisher_cabinet{dir = 8; pixel_y = -22},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/engineering) -"Yo" = (/obj/structure/sign/double/solgovflag/right{pixel_y = 24},/obj/effect/decal/cleanable/liquid_fuel,/obj/structure/sign/warning/caution{pixel_y = 1; pixel_x = 28},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) -"Yq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/table/woodentable/walnut,/obj/item/tableflag,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) -"Yr" = (/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"YC" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/effect/decal/cleanable/dirt,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/fronthall) +"Yo" = (/obj/effect/decal/cleanable/liquid_fuel,/obj/structure/sign/warning/caution{pixel_y = 1; pixel_x = 28},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/rockets/stor) +"Yq" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/table/woodentable/walnut,/obj/item/tableflag/antar,/turf/simulated/floor/wood/walnut,/area/solship/capquarters) +"Yr" = (/obj/structure/lordbanner,/obj/effect/floor_decal/corner/red{dir = 8},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"YC" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/black/border{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals10{dir = 10},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "YJ" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green,/obj/effect/floor_decal/spline/fancy/wood{dir = 8},/obj/effect/floor_decal/corner/brown{dir = 6},/turf/simulated/floor/tiled/steel_grid,/area/solship/capquarters) "YO" = (/obj/effect/floor_decal/techfloor{dir = 9},/obj/machinery/atmospherics/unary/vent_scrubber/on,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/jail) "YS" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/floor_decal/corner_techfloor_grid,/obj/effect/floor_decal/techfloor/corner,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) -"YV" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 23},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/effect/floor_decal/corner/paleblue/half,/obj/structure/closet/secure_closet{name = "Technician"; req_access = list("SOL_ENGINEERING_ACCESS")},/obj/item/storage/belt/utility/full,/obj/item/rcd,/obj/item/rcd_ammo/large,/obj/item/rcd_ammo/large,/obj/item/clothing/glasses/meson,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"YZ" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/slippers/worn,/obj/item/clothing/under/pj/blue,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/lino,/area/solship/crew) +"YV" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 23},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/obj/structure/closet/secure_closet{name = "Technician"; req_access = list("SOL_ENGINEERING_ACCESS")},/obj/item/storage/belt/utility/full,/obj/item/rcd,/obj/item/rcd_ammo/large,/obj/item/rcd_ammo/large,/obj/item/clothing/glasses/meson,/obj/effect/floor_decal/corner/red/half,/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"YZ" = (/obj/structure/closet/cabinet,/obj/item/clothing/shoes/slippers/worn,/obj/item/clothing/under/pj/red,/obj/effect/floor_decal/spline/fancy/wood{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/lino,/area/solship/crew) "Zj" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) -"Zp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light,/obj/machinery/light_switch{dir = 1; pixel_y = -28},/obj/effect/floor_decal/corner/paleblue{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) -"Zq" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/rockets) +"Zp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/light,/obj/machinery/light_switch{dir = 1; pixel_y = -28},/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"Zq" = (/obj/effect/paint/merc,/turf/simulated/wall/r_wall,/area/solship/rockets) "Zr" = (/obj/structure/table/standard,/obj/item/storage/firstaid/surgery,/obj/item/reagent_containers/ivbag/blood/OMinus,/obj/item/stack/nanopaste,/obj/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/white,/area/exploration_shuttle/texas/med) -"Zs" = (/turf/simulated/wall,/area/solship/capquarters) -"Zt" = (/obj/effect/paint/black,/turf/simulated/wall/r_wall,/area/solship/maint) +"Zs" = (/obj/effect/paint/merc,/turf/simulated/wall,/area/solship/capquarters) +"Zt" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/dark,/area/exploration_shuttle/texas/pass) "ZE" = (/obj/effect/floor_decal/techfloor{dir = 1},/obj/structure/closet/secure_closet/guncabinet{req_access = list(); name = "Ion"},/obj/item/gun/energy/ionrifle/small,/obj/item/gun/energy/ionrifle,/turf/simulated/floor/tiled/techfloor/grid,/area/solship/armory) "ZF" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/black/border,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/dark,/area/solship/fronthall) "ZH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/alarm{dir = 4; pixel_x = -24},/turf/simulated/floor/tiled/techfloor,/area/solship/armory) -"ZS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/paleblue/half{dir = 4; icon_state = "bordercolorhalf"},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) +"ZS" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/corner/red/half{dir = 4},/turf/simulated/floor/tiled/dark,/area/solship/equiproom) "ZX" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/freezer{name = "Freezing Room"},/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white/monotile,/area/solship/freezer) "ZY" = (/obj/machinery/atmospherics/pipe/simple/visible/cyan{dir = 5},/obj/effect/floor_decal/techfloor{dir = 1},/obj/effect/floor_decal/corner_techfloor_grid{dir = 8},/obj/effect/floor_decal/techfloor/corner{dir = 8},/obj/machinery/light{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/techfloor,/area/solship/engineering) @@ -879,45 +864,45 @@ sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWhnsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWHaHaHaHaHaHaAJAJAJAJWgWgWgWgWgWgWgWgWgaxaysWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWHaPvwZAjldEoRhazaCaRaWdiaYbdbhbjbnbnWgboaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWHaMeqsnAEybpbsbtbCbDbHbLdifSbZcickbnrNWgclaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWPCcwcNcOcPcZdadbazdhdodudidvdzdEdEdFdKnyTXaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWcXgWgWgWgWgWgWgWgWgWgWgWgWgWiLiLiLBNBNBNBNBNBNvMvMvMvMvMvMHalodRMfxCdTdXdYFjFjFjFjdiFgdZeeeeejeqWgTXaxaDsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWkjuIaeRfUlgxBilCbYbYiLiLiLiLWFPmlXlRCbbEYVYrUEvMuocoPufcBLvMTUexVExCeJeNePolfafffpfvhofEeeeefHfKWgZtZtaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWdJcruIabaAwrgxxoqBKvjolXlywFtxyBtOkazTZSKVKVddbIvMXRbGDDbGJZvMCggZmmxCgagigGolgHgMgSWgWgWgWgWgWgWgZtcXsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWGwGwGwGwGwGwGwGwgxbOsotHGcAYOFGBQyDCIbQHlrsPnjkneKHrJGPdhcofvMVZCXpGnbZEvMgegegegegeeOhgoljHhkJhgWgWgWgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWjRkjBABAdndrdHacadacafGlfBgxgxgxgxgxiLljLvLvLvgwlXbREJsNsNWWeIVUrWsRpGdeHkXQgeBahfvTgeFpeXrGUShpJhgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWBAGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwiLliMwMwMwlilXEDwxKVKVlpnSvMZHcKNawwcKqvrObzcCDAgejHSOhshyhIJhgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWBAMUIPGDGDGDGDGDGDpeyUIjQwZpTBvMJfXhXhDPVecVgeQoOIWcgejHDWrGhKhPJhgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWEXBArzFeGCjwkLJQGDeflJLwUelJefvMvMvMvMvMvMvMgeKiuprcgehSpiMGMGMGXPueueueueClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWoDoDoDoDMyrrrrrrrrEXrzFeViMlVSWTGDqWcGvpXArIdUOkwBFMzDStKNQlgeEAvNUfgeebhZMGFJlxIqZsmZlaIYuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFoDZrzroDwyrrTtyyrrHuIPGDriVrLtXEqAkCXUkIitFXcngfGEXrapMLQZlqgegegegegeebibMGTRJjYkZsdMyiVnuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFfAnphinqjqqbBSLKoFrrHuyGFeuSHesjWqGDkzegltltahltfxfxfxfxfxGHuBKNKNRsMZeddqDQMGMGJJMGZsJsEsESuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFjMxFxFbqEBIprDrDrDrDgqfjfjfjrrHurzFeOHsEmaJnGDeoTsltvFaiQQfxzPfxzPfxjpxcfFfFZFaLbgkcZjShweUbqYimWXyYXGuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHMHjvPtxFLZcAkdxfpqGbpRjQhQbaslmepjpjJhGDmXmXGDGDxwajltBuIAYjfxTKfxTKfxfxawasasasawawxwRQMGMGwfMGZszwmKlGuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHracAXbRmHiqcQjFoXnhAFozAlDncFxnxzsAZkJzfhJYCjNdICxOoltVfaONyDKifakRlehfxkikiBOkicYawntHRMGYZhNyZZsdMtSbwuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHMHIOqaxFpQOSwSggblqgXtjQfjTlzQmepjpjJhcWCPEvKIOkCKegltltdfltfxTKfxTKfxfxZYyofbYSLeasiwFrMGuYDZIqZsWCYcykuegWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFjMxFxFTutRROrDrDrDrDgqCTCTCTrrHugWueZsRoOOZsZsJKTsKWaleYamfxlBfxlBfxIyWUkZAkuWTrasebghMGMGMGMGMGMGMGMGXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFXaUgMCvWKnUWhEcBOGrrHugWueQJxbAOTAOOebTsaoardchCfxfxfxfxfxDIWUhuqQshEZasjHUJMGVudjdjvUjtOXlKXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFsOoedCsOsOWzcSwNWzHugWueRjDhdAhrZsUSpKKWhOijiVmDGFGFccyhkBoqCdImUpJyasjHKupoezXZLkrPMGMGMGXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsOsOsOsOMnWzWzWzWzsWWwOOvmdGHbgNkeUGXSKWmOnPozoTpbpMiAawSPYnXmwLKLrdawixzpMGWvybUBKHOeOnMzXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWWwOOlzuqYqYJZskznUKWKWrQrYKWKWKWKWawawawBQawawawawLzkksKsKsKhMXPXPXPXPgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWuenOjCMRlNOOkMxuKWYhbSwkAoKWTXTXsgGsTXTXnyGxWpLXJDiInZLiiThMgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWwlZqZqZqZqZqZqZqZqZqZqZqZqZqZqgWgWgWgWaSZsZsZsZsdididiiWKWBneDDlDEKWTXdididididisKEbtvjfjrjzlnzCjEhMgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWHCgRatPgkWkWaukWkWCqgTBxgPipMiMiMiMiMiMTOtfNYodihwTJkmKWhLvnIRLnKWTXbmsvnWpDbmEIFukokqsykvnZKQKQhMgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWZqNxZqZqZqZqZqZqipgXMIhvkDcfgFaKIXaHcLkShBVKlmlvhDlQKWKWKWKWKWKWTXbmNklSbmsKnRsKsKsKyTpJyTyTsKhMgWgWgWgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWJBkVywiDiEgCipqPThOzThieThThtWRbdimRocmkJHmzmzfJmomoyCPHmrmwbmrRmGjGGUsKHWNREkmFumyHhMtltltltltltlgWcXsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWenavCIzRxBipXVPWeHXwHAJaIZtYHQdiDSmLyzdiOyMSgoqpkKgobmIamQZXmVmYndMPRTgzLMnenesaniLltlYOqZtlYODbWgZtZtaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWcXgWgWgWgWgWgWgWgWgWgWgWgWgWaSWgWgWgWgWgWgWgqygoWgWgeZeZeZeZKlfDMqMoRTEbohfPfPfPagontlpSrstlIMVFWgTXaxaysWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWaSiSnVIzMPRTnZFThWhWgBQRRXtljPFHtljglFWgboaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWaSJxoCoNxIGYnZFTSRhWeQoOpcpniQVRNoSFQSnyTXaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWhMJxxxAHsKanohUTUTUTohIntlSZnIpvuxaqWgclaxaBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWWShMhMhMhMhMJgJgJgJgJghMtltltltltltlWgWgaxaDsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWEFEFEFEFEFgWgWgWgWgWgWgWgWgWgWaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW -sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWmemememememeAJAJAJAJWgWgWgWgWgWgWgWgWgaxxvsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWmePvwZAjldEoRhazaCaRaWdiaYbdbhbjbnbnWgWgaxHusWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWhnsWsWsWsWgWmeMeqsnAEybpbsbtbCbDbHbLdifSbZcickbnrNWgWgaxHusWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWhnsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWPCcwcNcOcPcZdadbazdhdodudidvdzdEdEdFdKWgWgaxHusWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWIXIXIXBNBNBNBNBNBNvMvMvMvMvMvMmelodRMfxCdTdXdYFjFjFjFjdiFgdZeeeeejeqWgWgaxxTsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWkjuIaeRfUlGwBilCbYbYIXIXIXIXWFPmlGlRCbbEYVYrUEvMuocoPufcBLvMTUexVExCeJeNePolfafffpfvhofEeeeefHfKWgWgWgaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWdJcruIabaAwrGwBilCKvjolGlywFtxyBtOkazTZSKVKVddzTvMXRbGDDbGJZvMCggZmmxCgagigGolgHgMgSWgWgWgWgWgWgWgWggWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWGwGwGwGwGwGwGwGwGwbOsotHGcAYAYGBQyDCIbQHlrsPnjkneKHrJGPdhcofvMVZCXpGnbZEvMOFOFOFOFOFeOhgoljHhkJhgWgWgWgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWjRkjBABAdndrdHacadacafGlfBGwGwGwGwGwIXljLvLvLvgwlGbREJsNsNWWeIVUrWsRpGdeHkXQOFBahfvTOFFpeXlXUShpJhgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWBAGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwGwIXliMwMwMwlilGEDwxKVKVlpnSvMZHcKNawwcKqvrObzcCDAOFjHSOhshyhIJhgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWJBMUajajajajajajajpeyUIjQwZpTBvMJfXhXhDPVecVOFQoOIWcOFjHDWlXhKhPJhgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWJBrzFeGCjwkLJQajeflJLwUelJefvMvMvMvMvMvMvMOFKiuprcOFhSpiMGMGMGMGClClClClClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWoDoDoDoDMyrrrrrrrrsWsWsWrzFeViMlVSWTajqWcGvpXArIdUOkwBFMzDStKNQlOFEAvNUfOFebhZMGFJlxIqZsmZlaIYClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFoDZrzroDwyrrTtyyrrcWsWsWajajriVrLtXEqAkCXUkIitFXcngfGEXrapMLQZlqOFOFOFOFOFebibMGTRJjyZZsdMyiVnClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFfAnphinqjqqbBSLKoFrrcWsWsWyGFeuSHesjWqajkzegltltahltfxfxfxfxfxGHuBKNKNRsMZeddqDQMGMGJJMGZsZsEsZsClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFjMxFxFbqEBIprDrDrDrDgqfjfjfjrrcWsWsWrzFeOHsEmaJnajeoTsltvFaiQQfxzPfxzPfxjpxcfFfFZFaLbgkcZjShweUbqYimWXyYXGClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHMHjvPtxFLZcAkdxfpqGbpRjQhQbaslrrJhJhJhJhajajmXmXajajxwTsltBuIAYjfxTKfxTKfxfxawasasasawawurRQMGMGwfMGZszwmKuqClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHracAXbRmHiqcXnFoXnhAFozAlDncFxACPQnxzsAZzfhJxtYCjNdICxOoltVfaONyDKifakRlehfxcXkiBOkicYawntHRMGYZhNyZZsEStSbwClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWMHMHIOqaxFpQOSwSggblqgXtZtfjTlzQrrJhJhJhJhQfCPkJEvKIOkCKegltltdfltfxTKfxTKfxfxZYyofbYSLeasiwFrMGuYDZIqZsWCYcykClgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFjMxFxFTutRROrDrDrDrDgqCTCTCTrrcWsWsWClClZsRoRoZsZsJKTsKWaleYamfxlBfxlBfxIyWUkZAkuWTrasebghMGMGMGMGMGMGMGMGXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFXarDMCvWKnUWhEcBOGrrcWsWsWClClQJxbAOTARoebTsaoardchCfxfxfxfxfxDIWUhuqQshEZasjHUJMGVudjdjvUjtOXlKXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFoedCxFxFWzcSwNWzcWsWsWClClRjDhdAhrZsUSpKKWhOijiVmDGFGFccyhkBoqCdImUpJyasjHKupoezXZLkrPMGMGMGXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWxFxFxFxFMnWzWzWzWzsWsWsWWwOOvmdGHbgNkeUGXSKWmOnPozoTpbpMiAawSPYnXmwLKLrdawixzpMGWvybUBKHOeOnMzXPgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWWwOOlzuqYqYJZskznUKWKWrQrYKWKWKWKWawawawBQawawawawLzkkaSaSaSWSXPXPXPXPgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWClClnOjCMRlNRokMxuKWYhbSwkAoKWTXTXsgGsTXTXnyGxWpLXJDiInZLiiTWSgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWwlZqZqZqZqZqZqZqZqZqZqZqZqZqZqgWgWgWgWClZsZsZsZsdididiiWKWBneDDlDEKWTXdididididiaSEbtvjfjrjzlnzCjEWSgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWHCgRatPgkWkWaukWkWCqgTBxgPZqMiMiMiMiMiMTOtfNYodihwTJkmKWhLvnIRLnKWTXbmsvnWpDbmEIFukokqsykvnZKQKQWSgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWZqNxZqZqZqZqZqZqZqgXMIhvkDcfgFaKcLaHcLkShBVKlmlvhDlQKWKWKWKWKWKWTXbmNklSbmaSnRaSaSaSyTpJyTyTaSWSgWgWgWgWgWgWgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWJBkVywiDiEgCZqsKThOzThieThThtWRbdimRocmkJHmzmzfJmomoyCPHmrmwbmrRmGjGGUaSHWNREkmFumyHWStltltltltltlgWgWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWenavCIzRxBZqXVPWeHXwHAJaIZtYHQdiDSmLyzdiOyMSgoqpkKIzbmIamQZXmVmYndMPRTgzLMnenesaniLltlYOqZtlYODbWgWgWgaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWWgWgWgWgWgWgWgqyIzWgWgeZeZeZeZKlfDMqMoRTEbohfPfPfPagontlpSrstlIMVFWgWgaxaysWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWYksWsWsWsWsWsWsWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWgWiSnVJxMPRTnZFThWhWgBQRRXtljPFHtljglFWgWgaxHusWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWYksWsWsWsWgWgWJxoCoNxIGYnZFTSRhWeQoOpcpniQVRNoSFQSWgWgaxMBsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWgWWSJxxxAHaSanohUTUTUTohIntlSZnIpvuxaqWgWgaxHusWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWgWWSWSWSWSWSWSJgJgJgJgJgWStltltltltltlWgWgaxxTsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWWSWSWSWSWSWSEFEFEFEFEFWSgWgWgWgWgWgWgWgWgWaasWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW +sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWYksWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW sWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsWsW diff --git a/maps/away/solship/solship_areas.dm b/maps/away/solship/solship_areas.dm index 5561d60696d19..79a70dc92df54 100644 --- a/maps/away/solship/solship_areas.dm +++ b/maps/away/solship/solship_areas.dm @@ -1,5 +1,5 @@ /area/solship - name = "\improper SCG Vessel" + name = "\improper LPS Vessel" icon = 'maps/away/solship/solship_sprites.dmi' icon_state = "shuttle2" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED @@ -15,7 +15,7 @@ req_access = list(access_away_solship_main) /area/solship/bridge - name = "\improper Bridge" + name = "\improper LPS Diablo Bridge" icon_state = "com" req_access = list(access_away_solship_main) @@ -35,7 +35,7 @@ req_access = list(access_away_solship_captain) /area/solship/capquarters - name = "\improper Solship Leader" + name = "\improper Diablo Leader" icon_state = "com" req_access = list(access_away_solship_captain) @@ -98,24 +98,17 @@ /////////// /area/exploration_shuttle/texas - name = "\improper Texas Cockpit" - icon_state = "texas" - -/area/exploration_shuttle/texas/cockpit - name = "\improper Texas Cockpit" + name = "\improper Tersten Cockpit" icon_state = "texas" /area/exploration_shuttle/texas/pass - name = "\improper Texas Passengers" + name = "\improper Tersten Red - Main" /area/exploration_shuttle/texas/med - name = "\improper Texas Medical" + name = "\improper Tersten Medical" /area/exploration_shuttle/texas/can - name = "\improper Texas Canisters" - -/area/exploration_shuttle/texas/jail - name = "\improper Texas Jail" + name = "\improper Tersten Canisters" /area/exploration_shuttle/texas/airlock - name = "\improper Texas Airlock" \ No newline at end of file + name = "\improper Tersten Airlock" diff --git a/maps/away/solship/solship_crew.dm b/maps/away/solship/solship_crew.dm index e3844b73d5105..1b1a4b0b1ab66 100644 --- a/maps/away/solship/solship_crew.dm +++ b/maps/away/solship/solship_crew.dm @@ -1,10 +1,10 @@ /obj/effect/submap_landmark/joinable_submap/solship - name = "SCGG Big Iron" + name = "LPS Diablo" archetype = /decl/submap_archetype/solship /decl/submap_archetype/solship - descriptor = "SCG Gunship" - map = "Big Iron" + descriptor = "LSS Patrol Ship" + map = "Patrol Ship" crew_jobs = list( /datum/job/submap/solship, /datum/job/submap/solship/medic, @@ -13,37 +13,35 @@ ) /obj/effect/submap_landmark/spawnpoint/solship - name = "Gunship Trooper" + name = "Orbital Trooper" movable_flags = MOVABLE_FLAG_EFFECTMOVE /obj/effect/submap_landmark/spawnpoint/solship/captain - name = "Gunship Leader" + name = "Patrol Ship Captain" /obj/effect/submap_landmark/spawnpoint/solship/medic - name = "Gunship Corpsman" + name = "Patrol Ship Corpsman" /obj/effect/submap_landmark/spawnpoint/solship/engineer - name = "Gunship Technician" + name = "Patrol Ship Technician" /* JOBS * ======= */ /datum/job/submap/solship - title = "Gunship Trooper" + title = "Orbital Trooper" total_positions = 2 outfit_type = /decl/hierarchy/outfit/job/solship/crew/fleet/troop - supervisors = "leader" + supervisors = "captain" loadout_allowed = TRUE is_semi_antagonist = TRUE info = "--" - required_language = LANGUAGE_HUMAN_EURO + required_language = LANGUAGE_HUMAN_LORD whitelisted_species = list(SPECIES_HUMAN) - allowed_branches = list( - /datum/mil_branch/fleet - ) - allowed_ranks = list( - /datum/mil_rank/fleet/e4 - ) + + branch = /datum/mil_branch/larmarine + rank = /datum/mil_rank/larmarine/e3 + min_skill = list(SKILL_COMBAT = SKILL_BASIC, SKILL_WEAPONS = SKILL_BASIC, SKILL_HAULING = SKILL_BASIC, @@ -52,14 +50,13 @@ access = list(access_away_solship_main) /datum/job/submap/solship/captain - title = "Gunship Leader" + title = "Patrol Ship Captain" total_positions = 1 outfit_type = /decl/hierarchy/outfit/job/solship/crew/fleet/captain - supervisors = "SCGDF" + supervisors = "LSS Command" info = "---" - allowed_ranks = list( - /datum/mil_rank/fleet/o4 - ) + branch = /datum/mil_branch/larfleet + rank = /datum/mil_rank/larfleet/o4 min_skill = list(SKILL_COMBAT = SKILL_BASIC, SKILL_WEAPONS = SKILL_BASIC, SKILL_HAULING = SKILL_BASIC, @@ -68,14 +65,13 @@ access = list(access_away_solship_main, access_away_solship_eng, access_away_solship_captain, access_away_solship_med) /datum/job/submap/solship/medic - title = "Gunship Corpsman" + title = "Patrol Ship Corpsman" total_positions = 1 outfit_type = /decl/hierarchy/outfit/job/solship/crew/fleet/medic - supervisors = "leader" - info = "--." - allowed_ranks = list( - /datum/mil_rank/fleet/e5 - ) + supervisors = "captain" + info = "---" + branch = /datum/mil_branch/larfleet + rank = /datum/mil_rank/larfleet/e4 min_skill = list(SKILL_COMBAT = SKILL_BASIC, SKILL_WEAPONS = SKILL_BASIC, SKILL_HAULING = SKILL_ADEPT, @@ -86,13 +82,12 @@ access = list(access_away_solship_main, access_away_solship_med) /datum/job/submap/solship/engineer - title = "Gunship Technician" + title = "Patrol Ship Technician" total_positions = 1 outfit_type = /decl/hierarchy/outfit/job/solship/crew/fleet/engineer info = "---" - allowed_ranks = list( - /datum/mil_rank/fleet/e5 - ) + branch = /datum/mil_branch/larfleet + rank = /datum/mil_rank/larfleet/e4 min_skill = list(SKILL_COMBAT = SKILL_BASIC, SKILL_WEAPONS = SKILL_BASIC, SKILL_HAULING = SKILL_ADEPT, @@ -105,6 +100,13 @@ SKILL_DEVICES = SKILL_BASIC) access = list(access_away_solship_main, access_away_solship_eng) +/*Give military branches +/datum/job/submap/solship/equip(mob/living/carbon/human/H, alt_title, datum/mil_branch/branch, datum/mil_rank/grade) + . = ..() + var/obj/item/card/id/id = locate(/obj/item/card/id) in H.contents + id.handle_set_var(id, var_value = pick(allowed_branches)) + id.handle_set_var(id, var_value = pick(allowed_ranks))*/ + /* ACCESS * ======= */ @@ -116,21 +118,20 @@ /datum/access/access_away_solship_main id = access_away_solship_main - desc = "Gunship Main Access" + desc = "Patrol Ship Main Access" region = ACCESS_REGION_NONE /datum/access/access_away_solship_eng id = access_away_solship_eng - desc = "Gunship Engineering Access" + desc = "Patrol Ship Engineering Access" region = ACCESS_REGION_NONE /datum/access/access_away_solship_captain id = access_away_solship_captain - desc = "Gunship Captain Access" + desc = "Patrol Ship Captain Access" region = ACCESS_REGION_NONE /datum/access/access_away_solship_med id = access_away_solship_med - desc = "Gunship Medical Access" + desc = "Patrol Ship Medical Access" region = ACCESS_REGION_NONE - diff --git a/maps/away/solship/solship_items.dm b/maps/away/solship/solship_items.dm index c2a9be884915c..885c1491ce819 100644 --- a/maps/away/solship/solship_items.dm +++ b/maps/away/solship/solship_items.dm @@ -3,43 +3,45 @@ */ /obj/item/card/id/solship - desc = "An identification card issued to SolGov crewmembers." + desc = "An identification card issued to LSS crewmembers." icon_state = "base" color = "#666666" access = list(access_away_solship_main) /obj/item/card/id/solship/engineer - desc = "An identification card issued to SolGov crewmembers." + desc = "An identification card issued to LSS crewmembers." access = list(access_away_solship_main, access_away_solship_eng, access_engine_equip) /obj/item/card/id/solship/medic - desc = "An identification card issued to SolGov crewmembers." + desc = "An identification card issued to LSS crewmembers." access = list(access_away_solship_main, access_away_solship_med) /obj/item/card/id/solship/captain - desc = "An identification card issued to SolGov crewmembers." + desc = "An identification card issued to LSS crewmembers." access = list(access_away_solship_main, access_away_solship_eng, access_away_solship_med, access_away_solship_captain) + military_branch = /datum/mil_branch/larfleet + military_rank = /datum/mil_rank/larfleet/o4 /* RADIOHEADS * ======== */ /obj/item/device/radio/headset/gunship - name = "gunship team radio headset" - desc = "The headset of the gunship team member." + name = "patrol team radio headset" + desc = "The headset of the patrol team member." icon_state = "com_headset" item_state = "headset" ks2type = /obj/item/device/encryptionkey/gunship /obj/item/device/encryptionkey/gunship - name = "\improper gunship radio encryption key" + name = "\improper patrol radio encryption key" icon_state = "cargo_cypherkey" channels = list("Response Team" = 1) /* CLOTHING * ======== */ - +/* /obj/item/clothing/under/solgov/utility/fleet/command/captain accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet, /obj/item/clothing/accessory/solgov/specialty/pilot, /obj/item/clothing/accessory/solgov/rank/fleet/officer/o4, /obj/item/clothing/accessory/solgov/fleet_patch/fifth) @@ -51,21 +53,38 @@ /obj/item/clothing/under/solgov/utility/fleet/away_solship accessories = list(/obj/item/clothing/accessory/solgov/department/command/fleet, /obj/item/clothing/accessory/solgov/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/solgov/fleet_patch/fifth) += No more Sol = */ + +/obj/item/clothing/under/lordan/utility/green/lss_ship_marine + accessories = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted/e3, /obj/item/clothing/accessory/badge/lordan/tags/marine) + +/obj/item/clothing/under/lordan/utility/fleet/lss_ship_medick + accessories = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/lordan/department/medical/fleet) + +/obj/item/clothing/under/lordan/utility/fleet/lss_ship_engineer + accessories = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/lordan/department/engineering/fleet) + +/obj/item/clothing/suit/storage/toggle/lordan/service/fleet/officer/lss_ship_lead + accessories = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer/o4, /obj/item/clothing/accessory/lordan/department/command/fleet) /* MISC * ======== */ -/obj/item/paper/solinf - name = "note" +/obj/item/paper/lordinf + name = "command briefing" + language = LANGUAGE_HUMAN_LORD info = {" -
-Центральное командование Пограничного Фронта ЛК-31 ЦПСС
+
+Центральное командование пограничных войск ЛСС
-Ваше судно уже два месяца не приносит никаких результатов, поэтому с сожалением сообщаем, что платы в консолях Texas-Red были реквизированы для более приоритетных объектов. -Мы живём в трудное время, надеемся на понимание. -Челнок всё ещё способен подлетать к объектам, так что приятных полётов! +Ваш корабль направлен на патрулирование системы Мьёльнир. Напомним вам, что в ней, на спутнике планеты Инакс, работают нанятные правительством наёмники - регуляторы. +Для вас лучше всего будет не вмешиваться в их дела, только если их не уличат в антилорданианской деятельности. Пусть эти отбросы проливают свою кровь за нас. +Основной целью патруля является поиск и устранения ксеноугроз в секторе, а также защита внепланетной собственности ЛСС. +
+Мы надеемся, что лорданианский патрульный корабль Диабло, его экипаж и орбитальный десант готовы справиться с сложностями Мьёльнира. +Диабло переоборудован из захваченного у ЦПСС корабля. Пришло время очистить его имя свершениями во славу Лордании.
-This paper has been stamped with the stamp of SCG LC-31 Central Command. +This paper has been stamped with the stamp of LSS Central Command. "} /obj/item/rig/military/sol @@ -84,7 +103,7 @@ /decl/hierarchy/outfit/sol_military name = "SOL military solder" - uniform = /obj/item/clothing/under/solgov/utility/fleet/away_solship + uniform = /obj/item/clothing/under/solgov/utility/fleet head = /obj/item/clothing/head/solgov/utility/fleet shoes = /obj/item/clothing/shoes/dutyboots l_ear = /obj/item/device/radio/headset/gunship @@ -98,4 +117,4 @@ /obj/effect/landmark/corpse/sol_military name = "SOL military solder" corpse_outfits = list(/decl/hierarchy/outfit/sol_military) - spawn_flags = CORPSE_SPAWNER_NO_RANDOMIZATION \ No newline at end of file + spawn_flags = CORPSE_SPAWNER_NO_RANDOMIZATION diff --git a/maps/away/solship/solship_ranks.dm b/maps/away/solship/solship_ranks.dm index eb46d905e3013..784a74b4a487c 100644 --- a/maps/away/solship/solship_ranks.dm +++ b/maps/away/solship/solship_ranks.dm @@ -1,3 +1,4 @@ +/* /datum/mil_branch/army name = "SCG Army" name_short = "SCGA" @@ -379,3 +380,203 @@ name_short = "FADM" accessory = list(/obj/item/clothing/accessory/solgov/rank/fleet/flag/o10_alt, /obj/item/clothing/accessory/solgov/specialty/officer) sort_order = 20 + +== Replace solship ranks with ranks from Antares == +== Cut most of the high ranks because they not exist in game == +*/ + +/datum/mil_branch/larmarine + name = "Lordanian Marine Corps" + name_short = "LMC" + email_domain = "lord.oorah.mil" + + rank_types = list( + /datum/mil_rank/larmarine/e1, + /datum/mil_rank/larmarine/e2, + /datum/mil_rank/larmarine/e3, + /datum/mil_rank/larmarine/e4, + /datum/mil_rank/larmarine/e5, + /datum/mil_rank/larmarine/o1, + /datum/mil_rank/larmarine/o2, + /datum/mil_rank/larmarine/o3, + /datum/mil_rank/larmarine/o4, + /datum/mil_rank/larmarine/o5 + ) + + spawn_rank_types = list( + /datum/mil_rank/larmarine/e2, + /datum/mil_rank/larmarine/e3, + /datum/mil_rank/larmarine/e4, + /datum/mil_rank/larmarine/e5, + /datum/mil_rank/larmarine/o1, + /datum/mil_rank/larmarine/o2, + /datum/mil_rank/larmarine/o3, + /datum/mil_rank/larmarine/o4, + /datum/mil_rank/larmarine/o5 + ) + + min_skill = list( SKILL_HAULING = SKILL_BASIC, + SKILL_WEAPONS = SKILL_BASIC, + SKILL_COMBAT = SKILL_BASIC, + SKILL_EVA = SKILL_BASIC) + +/datum/mil_branch/larfleet + name = "Lordanian Sovereign Systems Fleet" + name_short = "LSSF" + email_domain = "lss.fleet.mil" + + rank_types = list( + /datum/mil_rank/larfleet/e1, + /datum/mil_rank/larfleet/e2, + /datum/mil_rank/larfleet/e3, + /datum/mil_rank/larfleet/e4, + /datum/mil_rank/larfleet/e5, + /datum/mil_rank/larfleet/o1, + /datum/mil_rank/larfleet/o2, + /datum/mil_rank/larfleet/o3, + /datum/mil_rank/larfleet/o4, + /datum/mil_rank/larfleet/o5 + ) + + spawn_rank_types = list( + /datum/mil_rank/larfleet/e2, + /datum/mil_rank/larfleet/e3, + /datum/mil_rank/larfleet/e4, + /datum/mil_rank/larfleet/e5, + /datum/mil_rank/larfleet/o1, + /datum/mil_rank/larfleet/o2, + /datum/mil_rank/larfleet/o3, + /datum/mil_rank/larfleet/o4, + /datum/mil_rank/larfleet/o5 + ) + + min_skill = list( SKILL_HAULING = SKILL_BASIC, + SKILL_WEAPONS = SKILL_BASIC, + SKILL_EVA = SKILL_ADEPT) + +// RANKS \\ +// Fleet \\ + +/datum/mil_rank/larfleet/e1 + name = "Crewman Recruit" + name_short = "CR" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted, /obj/item/clothing/accessory/lordan/specialty/enlisted) + sort_order = 1 + +/datum/mil_rank/larfleet/e2 + name = "Crewman Apprentice" + name_short = "CA" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e2, /obj/item/clothing/accessory/lordan/specialty/enlisted) + sort_order = 2 + +/datum/mil_rank/larfleet/e3 + name = "Crewman" + name_short = "CN" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e3, /obj/item/clothing/accessory/lordan/specialty/enlisted) + sort_order = 3 + +/datum/mil_rank/larfleet/e4 + name = "Petty Officer Third Class" + name_short = "PO3" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e4, /obj/item/clothing/accessory/lordan/specialty/enlisted) + sort_order = 4 + +/datum/mil_rank/larfleet/e5 + name = "Petty Officer Second Class" + name_short = "PO2" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/enlisted/e5, /obj/item/clothing/accessory/lordan/specialty/enlisted) + sort_order = 5 + + +/datum/mil_rank/larfleet/o1 + name = "Ensign" + name_short = "ENS" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer, /obj/item/clothing/accessory/lordan/specialty/officer) + sort_order = 11 + +/datum/mil_rank/larfleet/o2 + name = "Sub-lieutenant" + name_short = "SLT" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer/o2, /obj/item/clothing/accessory/lordan/specialty/officer) + sort_order = 12 + +/datum/mil_rank/larfleet/o3 + name = "Lieutenant" + name_short = "LT" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer/o3, /obj/item/clothing/accessory/lordan/specialty/officer) + sort_order = 13 + +/datum/mil_rank/larfleet/o4 + name = "Lieutenant Commander" + name_short = "LCDR" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer/o4, /obj/item/clothing/accessory/lordan/specialty/officer) + sort_order = 14 + +/datum/mil_rank/larfleet/o5 + name = "Commander" + name_short = "CDR" + accessory = list(/obj/item/clothing/accessory/lordan/rank/fleet/officer/o5, /obj/item/clothing/accessory/lordan/specialty/officer) + sort_order = 15 + +// Marines \\ + +/datum/mil_rank/larmarine/e1 + name = "Private" + name_short = "Pvt" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted) + sort_order = 1 + +/datum/mil_rank/larmarine/e2 + name = "Private First Class" + name_short = "PFC" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted/e2) + sort_order = 2 + +/datum/mil_rank/larmarine/e3 + name = "Lance Corporal" + name_short = "LCpl" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted/e3) + sort_order = 3 + +/datum/mil_rank/larmarine/e4 + name = "Corporal" + name_short = "Cpl" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted/e4) + sort_order = 4 + +/datum/mil_rank/larmarine/e5 + name = "Sergeant" + name_short = "Sgt" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/enlisted/e5) + sort_order = 5 + + +/datum/mil_rank/larmarine/o1 + name = "Second Lieutenant" + name_short = "2ndLt" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/officer) + sort_order = 16 + +/datum/mil_rank/larmarine/o2 + name = "First Lieutenant" + name_short = "1stLt" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/officer/o2) + sort_order = 17 + +/datum/mil_rank/larmarine/o3 + name = "Marine Captain" + name_short = "CPT" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/officer/o3) + sort_order = 18 + +/datum/mil_rank/larmarine/o4 + name = "Major" + name_short = "Maj" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/officer/o4) + sort_order = 21 + +/datum/mil_rank/larmarine/o5 + name = "Lieutenant Colonel" + name_short = "LtCol" + accessory = list(/obj/item/clothing/accessory/lordan/rank/marine/officer/o5) + sort_order = 22 diff --git a/maps/away/solship/solship_shuttle.dm b/maps/away/solship/solship_shuttle.dm index 5c5d5913d644d..f84aa456452b1 100644 --- a/maps/away/solship/solship_shuttle.dm +++ b/maps/away/solship/solship_shuttle.dm @@ -1,32 +1,31 @@ /obj/effect/overmap/visitable/ship/landable/exploration_shuttle/texas - name = "Texas Red" - desc = "Small shuttle with SCG markings." - shuttle = "Texas-Red" + name = "Tersten Red" + desc = "Small shuttle with LSS markings." + shuttle = "Tersten Red" /datum/shuttle/autodock/overmap/exploration_shuttle/texas - name = "Texas-Red" - shuttle_area = list(/area/exploration_shuttle/texas, /area/exploration_shuttle/texas/pass,/area/exploration_shuttle/texas/med, /area/exploration_shuttle/texas/can, /area/exploration_shuttle/texas/jail, /area/exploration_shuttle/texas/airlock) + name = "Tersten Red" + range = 1 + shuttle_area = list(/area/exploration_shuttle/texas/pass, /area/exploration_shuttle/texas/med, /area/exploration_shuttle/texas/can, /area/exploration_shuttle/texas/airlock) dock_target = "texas_shuttle" current_location = "nav_hangar_texas" landmark_transition = "nav_transit_texas" logging_home_tag = "nav_hangar_texas" logging_access = access_away_solship_main defer_initialisation = TRUE - multiz = 1 flags = SHUTTLE_FLAGS_PROCESS /obj/machinery/computer/shuttle_control/explore/texas - name = "Texas Red control console" - shuttle_tag = "Texas-Red" + name = "Tersten Red control console" + shuttle_tag = "Tersten Red" req_access = list(access_away_solship_main) -/obj/effect/shuttle_landmark/texas - name = "Texas Red hangar" +/obj/effect/shuttle_landmark/solship/texas + name = "Tersten Red hangar" landmark_tag = "nav_hangar_texas" - base_area = /area/solship/dock - base_turf = /turf/simulated/floor/plating - movable_flags = MOVABLE_FLAG_EFFECTMOVE + base_area = /area/space + base_turf = /turf/space /obj/effect/shuttle_landmark/transit/texas name = "In transit" - landmark_tag = "nav_transit_texas" \ No newline at end of file + landmark_tag = "nav_transit_texas" diff --git a/maps/away/solship/solship_uniforms.dm b/maps/away/solship/solship_uniforms.dm index 2d6baf7b6d8ab..518e5ff0387f1 100644 --- a/maps/away/solship/solship_uniforms.dm +++ b/maps/away/solship/solship_uniforms.dm @@ -7,29 +7,33 @@ /decl/hierarchy/outfit/job/solship/crew/fleet name = OUTFIT_JOB_NAME("Solship Fleet Outfit") hierarchy_type = /decl/hierarchy/outfit/job/solship/crew/fleet - uniform = /obj/item/clothing/under/solgov/utility/fleet/away_solship - head = /obj/item/clothing/head/solgov/utility/fleet - shoes = /obj/item/clothing/shoes/dutyboots + uniform = /obj/item/clothing/under/lordan/utility/fleet + head = /obj/item/clothing/head/beret/lordan/fleet + shoes = /obj/item/clothing/shoes/lordan l_ear = /obj/item/device/radio/headset/gunship - id_types= list(/obj/item/card/id/solship) + id_types = list(/obj/item/card/id/solship) /decl/hierarchy/outfit/job/solship/crew/fleet/troop - name = OUTFIT_JOB_NAME("Solship Trooper Fleet Outfit") + name = OUTFIT_JOB_NAME("Solship Marine Fleet Outfit") + uniform = /obj/item/clothing/under/lordan/utility/green/lss_ship_marine + head = /obj/item/clothing/head/beret/lordan/orbital /decl/hierarchy/outfit/job/solship/crew/fleet/medic name = OUTFIT_JOB_NAME("Solship Med Fleet Outfit") - uniform = /obj/item/clothing/under/solgov/utility/fleet/medical/away_solship - id_types= list(/obj/item/card/id/solship/medic) + uniform = /obj/item/clothing/under/lordan/utility/fleet/lss_ship_medick + id_types = list(/obj/item/card/id/solship/medic) /decl/hierarchy/outfit/job/solship/crew/fleet/engineer name = OUTFIT_JOB_NAME("Solship Engi Fleet Outfit") - uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering/away_solship - id_types= list(/obj/item/card/id/solship/engineer) + uniform = /obj/item/clothing/under/lordan/utility/fleet/lss_ship_engineer + id_types = list(/obj/item/card/id/solship/engineer) /decl/hierarchy/outfit/job/solship/crew/fleet/captain name = OUTFIT_JOB_NAME("Solship Cap Fleet Outfit") - uniform = /obj/item/clothing/under/solgov/utility/fleet/command/captain - id_types= list(/obj/item/card/id/solship/captain) + uniform = /obj/item/clothing/under/lordan/utility/fleet/command + suit = /obj/item/clothing/suit/storage/toggle/lordan/service/fleet/officer/lss_ship_lead + head = /obj/item/clothing/head/lordan/fleet + id_types = list(/obj/item/card/id/solship/captain) /* /decl/hierarchy/mil_uniform/scgfleet name = "Master scg fleet outfit" diff --git a/maps/away/spystation/spy_station_areas.dm b/maps/away/spystation/spy_station_areas.dm index 7c04d83954e93..b8ca12b1c6cca 100644 --- a/maps/away/spystation/spy_station_areas.dm +++ b/maps/away/spystation/spy_station_areas.dm @@ -1,44 +1,44 @@ -/area/spy_station/ - name = "\improper Center Corridor" - icon_state = "corridor" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/com - name = "\improper Center Command" - icon_state = "command" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/barrack - name = "\improper Barrack" - icon_state = "barracks" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/toilet - name = "\improper Toilet" - icon_state = "toilet" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/med - name = "\improper Medical Center" - icon_state = "med" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/lc - name = "\improper SCL office" - icon_state = "offise" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/canteen - name = "\improper Canteen" - icon_state = "eat" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/engin - name = "\improper Engineering" - icon_state = "Eng" - icon = 'maps/away/spystation/spy_station_sprites.dmi' - -/area/spy_station/dock - name = "\improper Corridor Dock" - icon_state = "dock" +/area/spy_station/ + name = "\improper Center Corridor" + icon_state = "corridor" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/com + name = "\improper Center Command" + icon_state = "command" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/barrack + name = "\improper Barrack" + icon_state = "barracks" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/toilet + name = "\improper Toilet" + icon_state = "toilet" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/med + name = "\improper Medical Center" + icon_state = "med" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/lc + name = "\improper SCL office" + icon_state = "offise" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/canteen + name = "\improper Canteen" + icon_state = "eat" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/engin + name = "\improper Engineering" + icon_state = "Eng" + icon = 'maps/away/spystation/spy_station_sprites.dmi' + +/area/spy_station/dock + name = "\improper Corridor Dock" + icon_state = "dock" icon = 'maps/away/spystation/spy_station_sprites.dmi' \ No newline at end of file diff --git a/maps/castelnau/bos/structures/lordbanner.dm b/maps/castelnau/bos/structures/lordbanner.dm index ca88269b3f127..303ca495f962f 100644 --- a/maps/castelnau/bos/structures/lordbanner.dm +++ b/maps/castelnau/bos/structures/lordbanner.dm @@ -4,6 +4,7 @@ icon_state = "lordbanner" desc = "A steel pole bearing a banner of Lordanian Sovereign Systems. Ave." anchored = TRUE + plane = DECORATIONS_PLANE /obj/structure/lordbanner/ec name = "exoplanet LSS banner" @@ -53,4 +54,4 @@ if(istype(ID.military_rank)) dudename = "[ID.military_rank.name] [dudename]" E.plantedby = "Planted on [stationdate2text()] by [dudename], [user.get_assignment()] of [GLOB.using_map.full_name]." - T.visible_message("[user] successfully claims this world with \the [E]!") \ No newline at end of file + T.visible_message("[user] successfully claims this world with \the [E]!") diff --git a/maps/castelnau/castelnau.dm b/maps/castelnau/castelnau.dm index 71effb270a73e..a29f5badda522 100644 --- a/maps/castelnau/castelnau.dm +++ b/maps/castelnau/castelnau.dm @@ -22,6 +22,7 @@ #include "code/_global_vars/lists/locations.dm" #include "code/game/objects/effects/landmarks.dm" #include "code/gamemodes/objectives.dm" + #include "code/modules/aspects/night.dm" #include "code/modules/sandstorm.dm" #include "code/modules/client/preferences_spawnpoints.dm" #include "flooring/flooring_premade.dm" @@ -159,7 +160,7 @@ #include "../away/empty.dmm" #include "../away/rawl/rawl.dm" -// #include "../away/solship/solship.dm" + #include "../away/solship/solship.dm" #include "../away/mining/mining.dm" #include "../away/derelict/derelict.dm" #include "../away/bearcat/bearcat.dm" diff --git a/maps/castelnau/castelnau_ranks.dm b/maps/castelnau/castelnau_ranks.dm index 93d2904540772..6ea97eda4e304 100644 --- a/maps/castelnau/castelnau_ranks.dm +++ b/maps/castelnau/castelnau_ranks.dm @@ -14,9 +14,9 @@ // /datum/mil_branch/cult, /datum/mil_branch/ftu, /datum/mil_branch/syndi, - /datum/mil_branch/other, - /datum/mil_branch/alien, - /datum/mil_branch/skrell_fleet + /datum/mil_branch/larfleet, + /datum/mil_branch/larmarine, + /datum/mil_branch/other ) spawn_branch_types = list( @@ -27,9 +27,9 @@ // /datum/mil_branch/cult, /datum/mil_branch/ftu, /datum/mil_branch/syndi, - /datum/mil_branch/other, - /datum/mil_branch/alien, - /datum/mil_branch/skrell_fleet, + /datum/mil_rank/larfleet, + /datum/mil_branch/larmarine, + /datum/mil_branch/other ) species_to_branch_blacklist = list( diff --git a/maps/castelnau/castelnau_security_state.dm b/maps/castelnau/castelnau_security_state.dm index 7b9c077617d55..4c7a2b7470890 100644 --- a/maps/castelnau/castelnau_security_state.dm +++ b/maps/castelnau/castelnau_security_state.dm @@ -9,7 +9,7 @@ icon = 'maps/castelnau/icons/security_state.dmi' /decl/security_level/default/castelnaudept/code_green - name = "code green" + name = "Протокол: Длань" icon = 'icons/misc/security_state.dmi' light_max_bright = 0.25 @@ -24,11 +24,11 @@ var/static/datum/announcement/priority/security/security_announcement_green = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/notice2.ogg')) /decl/security_level/default/castelnaudept/code_green/switching_down_to() - security_announcement_green.Announce(" . .", ", .") + security_announcement_green.Announce("Угрозы для миссии отсутствуют, активирован протокол 'Длань'. Всем членам миссии необходимо вернуться в штатный режим работы.") notify_station() /decl/security_level/default/castelnaudept/code_violet - name = "code violet" + name = "Протокол: Скальпель" light_max_bright = 0.5 light_inner_range = 1 @@ -39,11 +39,11 @@ overlay_alarm = "alarm_violet" overlay_status_display = "status_display_violet" - up_description = " . . ." - down_description = " ; . ." + up_description = "В зоне действия миссии обнаружен опасный микроорганизм. От членов миссии требуется соблюдать все необходимые санитарные норма. Корабль ВТС 'Скряга' должен произвести отстыковку." + down_description = "Микроорганизм был уничтожен или изолирован. Члены миссии могут продолжать работу в штатном режиме." /decl/security_level/default/castelnaudept/code_orange - name = "code orange" + name = "Протокол: Меч" light_max_bright = 0.5 light_inner_range = 1 @@ -53,12 +53,12 @@ overlay_alarm = "alarm_orange" overlay_status_display = "status_display_orange" - up_description = " . . ." - down_description = " . . ." + up_description = "Активирован протокол 'Меч'. Членам миссии разрешается приступить к массовому освоению близлежащих земель и беспорядочному уничтожению всех противников." + down_description = "Протокол 'Меч' деактивирован. Все члены миссии должны вернуться на территорию аванпоста или Кастельнау." /decl/security_level/default/castelnaudept/code_blue - name = "code blue" + name = "Протокол: Кинжал" icon = 'icons/misc/security_state.dmi' light_max_bright = 0.5 @@ -69,11 +69,11 @@ overlay_alarm = "alarm_blue" overlay_status_display = "status_display_blue" - up_description = " , . ." - down_description = " . ." + up_description = "В зоне действия миссии обнаружена потенциальная угроза для хода миссии. Членам миссии рекомендуется соблюдать осторожность. Полномочия службы безопасности расширены." + down_description = "Угроза для миссии вышла из статуса критической, но продолжает существовать. Полномочия службы безопасности понижены." /decl/security_level/default/castelnaudept/code_red - name = "code red" + name = "Протокол: Щит" icon = 'icons/misc/security_state.dmi' light_max_bright = 0.75 @@ -87,10 +87,10 @@ var/static/datum/announcement/priority/security/security_announcement_red = new(do_log = 0, do_newscast = 1, new_sound = sound('sound/misc/redalert1.ogg')) /decl/security_level/default/castelnaudept/code_red/switching_up_to() - security_announcement_red.Announce(" . .", " .") + security_announcement_red.Announce("Обнаружена критическая угроза для хода миссии. Служба безопасности получает максимальные полномочия до её устранения.") notify_station() GLOB.using_map.unbolt_saferooms() /decl/security_level/default/castelnaudept/code_red/switching_down_to() - security_announcement_red.Announce("The self-destruct mechanism has been deactivated. All staff are to report to their supervisor for orders. All crew should obey orders from relevant emergency personnel. Security personnel are permitted to search staff and facilities, and may have weapons unholstered at any time.", "Attention! Code red alert procedures now in effect!") - notify_station() \ No newline at end of file + security_announcement_red.Announce("Ракетные базы Нова-Кубы деактивированы, угроза уничтожения корабля более не релевантна.") + notify_station() diff --git a/maps/castelnau/code/modules/aspects/night.dm b/maps/castelnau/code/modules/aspects/night.dm new file mode 100644 index 0000000000000..b41989f189ea8 --- /dev/null +++ b/maps/castelnau/code/modules/aspects/night.dm @@ -0,0 +1,19 @@ +/datum/round_aspect/night + name = "Ночь" + chance = 15 + weight = ASPECT_WEIGHT_CONTRABAND + announce_text = "Испепеляющая звезда зашла за горизонт. Тьма воцарилась на этой части планеты." + +/datum/round_aspect/night/get_desc_msg() + return SPAN_WARNING("В темноте мелькают не ясные силуэты...") + +/datum/round_aspect/night/do_preload_thing() + . = ..() + for(var/turf/simulated/floor/exoplanet/desert/cadaab/target_turf in world) + target_turf.set_light(0, 0, 0) + + for(var/turf/simulated/floor/inaks/target_turf in world) + target_turf.set_light(0, 0, 0) + + for(var/turf/simulated/floor/grass/cadaab/target_turf in world) + target_turf.set_light(0, 0, 0) diff --git a/maps/castelnau/code/modules/sandstorm.dm b/maps/castelnau/code/modules/sandstorm.dm index 02e47e2e728a2..2dcd42017ef75 100644 --- a/maps/castelnau/code/modules/sandstorm.dm +++ b/maps/castelnau/code/modules/sandstorm.dm @@ -49,7 +49,7 @@ for(var/mob/living/carbon/human/unlucky in shuffle(GLOB.living_mob_list_)) if(check_loc(unlucky) == CADAAB_OUTSIDE) - to_chat(unlucky, SPAN_WARNING("Along with the horizon, the sand swallows up the sun, bringing darkness and death.")) + to_chat(unlucky, SPAN_WARNING("Along with the horizon, the sand swallows up the sky, bringing darkness and death.")) sleep(15 SECONDS) @@ -79,6 +79,11 @@ areas.forced_ambience = list('sound/ambience/bos/super_sandstorm.ogg') areas.ambience = list('sound/effects/bos/lighting.ogg') areas.sandstorm_container = src + for(var/turf/simulated/outside_turf in view(0, areas)) + var/image/I = image(icon='maps/away/cadaab/icons/turfs.dmi',icon_state="sandstorm") + I.plane = DECORATIONS_PLANE + I.layer = 10 //Above everything + outside_turf.overlays += I else areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg') areas.ambience = list('sound/effects/bos/lighting.ogg') @@ -131,23 +136,6 @@ . = ..() animate(src, alpha = rand(55, 70), time = rand(40, 60)) -/* -/obj/screen/fullscreen/sandstorm/on_update_icon() Animation dont want work, idk why - . = ..() - animation() - -/obj/screen/fullscreen/sandstorm/proc/animation() - while(layer == DAMAGE_LAYER) //Always true. Below we create illusion of animation, randoming alpha - var/new_alpha - var/alpha_time - new_alpha = alpha + rand(-20, 20) - alpha_time = rand(7, 15) - if((new_alpha << 80) || (new_alpha >> 200)) //Dont give alpha up/fall too much - new_alpha = 140 - animate(src, alpha = new_alpha, time = alpha_time) - sleep(alpha_time) -*/ - /obj/screen/fullscreen/sandstorm/second icon_state = "sandstorm2"