From 675631038d64c53a73f8d53e0deff4b4df0793f8 Mon Sep 17 00:00:00 2001 From: Kolergo <85778771+Kolergo@users.noreply.github.com> Date: Sun, 2 Jul 2023 22:44:27 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A7=D1=82=D0=BE=20=D0=B7=D0=B0=20=D0=B1?= =?UTF-8?q?=D1=80=D0=B5=D0=B4=20=D0=B0=D0=BE=D0=B0=D0=BE=D0=B0=D0=BE=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/away/ellipse/ellipse_areas.dm | 48 +++---- maps/away/ellipse/ellipse_shuttle.dm | 60 ++++---- .../piratestation/pirate_station_areas.dm | 136 +++++++++--------- maps/away/raidership/raider_vessel_areas.dm | 68 ++++----- maps/away/spystation/spy_station_areas.dm | 86 +++++------ 5 files changed, 199 insertions(+), 199 deletions(-) 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/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 From 83f2d6d81f8b875266007c22414ec86278a795e0 Mon Sep 17 00:00:00 2001 From: Kolergo <85778771+Kolergo@users.noreply.github.com> Date: Sun, 2 Jul 2023 23:19:36 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9C=D0=B8=D0=BD=D0=B8=20=D1=80=D0=BE?= =?UTF-8?q?=D0=BB=D0=B8=20=D0=B8=20=D0=B4=D0=B8=D1=87=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../game/gamemodes/mini_roles/mini_roles.dm | 3 +- .../overmap/exoplanets/planet_types/desert.dm | 1 + code/datums/trading/misc.dm | 12 +- code/datums/trading/ship.dm | 4 +- code/datums/trading/unique.dm | 13 +- code/datums/trading/weaponry.dm | 28 +- code/game/antagonist/station/mini_roles.dm | 267 ++++++++-- code/game/objects/effects/effect_system.dm | 2 + code/modules/aspects/traps.dm | 2 +- .../antagonism/01_candidacy.dm | 1 - code/modules/item_worth/worths_list.dm | 18 +- code/modules/mechs/premade/_premade.dm | 8 +- code/modules/mining/abandonedcrates.dm | 60 +-- code/modules/mob/mob_defines.dm | 2 +- maps/away/cadaab/icons/turfs.dmi | Bin 34794 -> 32023 bytes maps/away/solship/solship.dm | 15 +- maps/away/solship/solship.dmm | 503 +++++++++--------- maps/away/solship/solship_areas.dm | 23 +- maps/away/solship/solship_crew.dm | 73 +-- maps/away/solship/solship_items.dm | 55 +- maps/away/solship/solship_ranks.dm | 201 +++++++ maps/away/solship/solship_shuttle.dm | 27 +- maps/away/solship/solship_uniforms.dm | 26 +- maps/castelnau/bos/structures/lordbanner.dm | 3 +- maps/castelnau/castelnau.dm | 3 +- maps/castelnau/castelnau_ranks.dm | 12 +- maps/castelnau/castelnau_security_state.dm | 30 +- maps/castelnau/code/modules/aspects/night.dm | 19 + maps/castelnau/code/modules/sandstorm.dm | 24 +- 29 files changed, 922 insertions(+), 513 deletions(-) create mode 100644 maps/castelnau/code/modules/aspects/night.dm 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 3bf826a8a4714baa53e3788e63d47eecc507a262..995926d6199d7a5b1811e4697f3481ba768c4c44 100644 GIT binary patch literal 32023 zcmXuJV~{0W(*!s(ZQI?qt!dk~ZQHhO`?jZT+qP}nw)WZY-ThNhQU6XvMdrz@jF6WV zgM-F~{`Kn@oP@Zr;;&!7|7(BkLW2KSF9llV{~OSHDyusSn>ZOcTG%^V*xCO2<(?Ij zEMPf6k0`RTOc`oSC27oM(>`0wo=lxcl}xB;q9FDs#^Us7~|55EK~hTXHaR+1x;jY_3W9g-ST#Rt99 z{SSIeAKNiri~F2 z14kTJzWzgW$6OwHYw%rv`wQERhj^WflsiNxE+Ute=)fNb*(=zV^|;S1cA z?9eryNWGbK=Fmu51wXeSB1oCzdO)wV^awv(G@;te7@aqBarx|ai$WbAe2h-F4rB#k zjM@I#E|*VSOYav&01*u~Jr$=BXGzMdq!3(g?`@~SPX5*sP8>50JZy&~O{2%bBM~$0 z&u%VK2i}d!S(o$3HGQ!ZCmz?u;fnbf=hW32Q5(zL-%Km|GDno`o?y89E|`=< zh~SQ099Q^we(ors42Fg=tUuy*i82e%;Lmk|SNq+ZQ=EPh5k)B?Z!8&yh(4Kx z>HL@Is>kLsrrxw!P-afnFV*jZ(6jzmHQ-##*X57aMvDdg^x#2>Lm`6;>`A2nt+?T^ zia?|emmVpXVlj)TZ6lYI)Uf;K&D_w!0Fy_;7)ZS0e>Q3eqO zzR)2<8NqI=U6TTZX^&QgDqH<|A3*k`{`n*o2YrS}W*rR-uPk@vittY&id!;Kj$PZp zV^|JzmAR2B*|2&G2t?4z?VKaTkGQkc^)3Ah{#44JL$;4_*Vv&A!$_+g*7#kX=#PGu z#FDN$AWXiu2a{}5Cgk;cFI~IcKBDe`N*SO-=;XC;BV2Jy5gRX!;D&YZEy(e`C%K?f zX}@J9%9w{L$0@7CdjeVTv*MKKw?`P{+nKF^tra`h_LcpaAd*%A@T+&}^ zbT@kaLn+52l|Pp{b(qz=x67oZNsJmewgFG}pn+Nm-p%j4fMy}!N+*)!i9FH zb&Sm`w(iEi;(|i3CN+{}y%Iyme(lUu)gs*e&0dw}?%}IivLZTs>)jAg<29m{HX&ZtU8Z=A7&cYY)LI?F{?1{XMOb}OfI=?+jXh6 z^~4al)Pb@iLo$)69xPoIQ)lIB#4m1n$JOM=*^Ymw%q-^Eg))XjJ|9GZia51wBzP?k zrno*;VOvwYn^p-AH=eiE9(d^{RFV2(mX406it4*(|B6>_F?alhziAnb%{Q||VX*St zL<-x@>q`Z5{Ym#8PnML7E=HtomK1rq01tTpPr>7G0ARm%^_P$VIIlxME9-IIY6q6w zl;Grb8Ij8J#h9%%bIse(H{pgb%M3a&Dm?qrboctKnjwxEDy7W|1f>wzSI`D9ViTLY2kX z;=1X+pSp0#0;*y*va}{s#ODExrD*vbB&KmlX*5|9B>JP6MFxyP^K3xmCcG>!$AG_j z)HDepg3d^Mi+{ksIMEbR77H+UmRCk(<(cu+FX!CXSe2a&c`lW}zIwX5j~%(g8BhlX zLiCwX##9Yq6l>Ozg@}j4FRme!dyH008iAW$NKxAsd8}$f!3GpL2P7rE5XT1~S}}1C z6NO($M5zVf$IJOA7y^S5J~_rWCfzyF;7uaS5~HqmC@6fGa2}#RoTW`Lb(pu>tMqmL zA4b(Fz*h2r!;?INCx>SAqZ8?7Mu@5mRxXL?6XrQjXV zN$_gyf_cn(ZI)a#xl(LtE0;dTW`Ad0iM`8Ec5~s|+BubQGiNl>80)DU3smw)l>Ui< zbs32|I+OlLH{jbEcR;GD6wlGrDjNRlsbH`jevT3e$+aWi`v5{bma6VmoPV=5Qiv9< zGzw*{lBd^wj%FVMx3AX2O)XeU;9{T0CX9UEFT7a$0$xRIB($Jl)d2w-v=>s{6Lx z)9@XX86$?$Ai;vn2TxCTbaf?@I~>)!C)jA%f(5+5e}z#PX)x^V#{Mr!f|Q%;p>G^0 zf66bymtYP@V!ZQN{>^SllUU|aoDCG+`^Xtn;fP*7nE zEvQ@tp={e35(eAIU?oR+Czj`dr}}ndZ%U$uV)t8ogPZGJ z-54DZlbrF#19CwLt8={x;%geUnth`#?*$O|!_)33c#us8s6Ct4pEiheze{=y#wYC> zjyJzDXFc_mjkG5wi+IOmH#N8)fF4HuQ6%Y*l9qteDPE#J&C);G$!nFh%V!?Ms`>^S zXI*04+YRyROr&9{apF&m9kdG$^RKLgjMBmI2^7~k1z`Vk&Uu! z3Vt-wc!eJJkeUw-*s}B%daSLkKKx1*^>twqxdz>i(V=KBTAkd`zf}SIp}iU$p3T{3 zX8P0q_cY5@*z0LVz39W9tpQ9+56J-G=NF7#+a??$|m0P8pMlScuLqHuDuJ7dni z_4uNi8UU4f1Ppxe3GLo*d(E-Cw$YNeRClpB0@K?Q(EZqyRdfeo?TUSsF~S1LBD23I z`k_(487q;d5EwO#LV8QH0~?wOX`c*pb72HKu*a>~YR#x2=Cps62*%wfiT=6E7JBp& zW&j-YK`Y>s{U&RCQ`>iB^QX-9zSP8bv=WUYR>kt>-ka1uR_zpv#%ee>6k8#jv}t<# z;$rCrxVp##y1!c)0}Q3u zvEAOqaZzX4O@x-yF79%qMLO&URF#}%$H!*v8_}9yq3z^zU2razX{3kF9=3OJSz}NpInwg7=8YFQQ(~X(sfXHI zN%-{FzQ2VMBC9Uq?^h$o8aAvMv(2JXkkndP;ON!?JG(c1aInxzNHo}Aa zeu=E~pGCo&CAhNifwJXYYRd?efnTWPY-TVFnd_jmom8ePe1->4T~^f}%h&L1r-GlR zTFxbOM2_E}KlByh`rej_Rdv8RU0A>S>czEP{95MvgXB{OmT+hKUI`YR@zpOIGxdmo zWtdb+Hn|Xt+Q&iij$qG*ZCL;EYd+DMwklO$w?ZOai}Io-bpBa^U125GY2gMP>p@g~ zeacbQSSV5zqJP;j6>9R#YX;G8iCKk3Y4QD$z=wW7+zll4xDHhoi=a4KHzLqQbcYB# zeaI;<(y)U#Sn^L9bn~8f88HqUG-VcWguomQeOMw34^n93$WL7tBLPjT_W_#eIad3m z!hZBa&epVJ3e?sXyj;qO*lIXXFR4#b?k5-U4y}md)Mv zi9qxdo3Bk|D)&WpQnXIPm2F_<^UtSNfp7SHXg ztcC7Vr=O1ui*D!b&D+6FTl)Jxl~`wqQqaX65^VqiDv?o|NmKVBom*XJ+OGLA8$M>H zm-Ks%QxldAwyt0;S@6d}`ch<*X)`#j8}6uzk#S&i?PmklBS*^OudBY|t)8}Rwu!z0 zN?CEiXyv8`fNx@D>53amp${jauG5;mZ+S?|;{8B_DEfJhx`w#Vhc3N=FJJ9gsyKi! zCI;|y^8E>K9xt#2QnfBhD>-$cD zeFE_By%T}Q{1JU;vY*}RyUj+RRHFS?c1=P$o?_PVQM=?9srbSlDjkWbRoG8%0q1lc zMomEy{zrLHlVxFcK4$7Qvy}~jfElLm{N_QLDQe9c2JhJxm}x#ZizsK6a;6Dc5`y)U+fWYemrZ!@+xvPdo}ka1{>)|C^_AQMY*44TPSW>^cjr zh^oJCdZvWo%EQ;25%TDko=hlP`LvRxhZ5sp$^cX2C)l|&7oTdJ;a<(i`yFc2RoWoY zMy7w9-W4AG{{NuEd%=A!V9n=5oyAtTJAo&Flws4xdQVTtOEKH<4#*QTUYQj(Y>MjU zx@&xe5b&RVFK6dC74R<2lAQ9`r+z|QJT7>gD{k}2`Tatx`C~rJVL)Xgf(2Z^F=?a> zo#DQx&%rBMSj`FD=YNboJjE>a7%+x$!|+zO#gSVR$Ex%2bVoC0G_L38mqo?{@$J-4 zkZzVk>^k~76`dr++yZ&`OEgf7)sbR9XVoz_>QV4H<2470UOT^BbhOPV(T^U$qJ04w76FKdv6nw29_k7m-XX%&Wuwl7>n52!e zVzhD;rQ^rva6_5E;d<9>h#AzW%8HqJpxO~cSzxa#6Cy{GbMzYI1C;9$+ZmOC?U^4S z*$H6hb6dw-ps#Bz5p;tUf?#758wW-y)=?h72Q1*sVb+`o2odp_Q&=P}DycQ{n>3-@ z4K*t!{h*%r!kD|tG0-lJ^jIMorJw!p&oSWoflL44h31l>=1{sZHLB&tz&Ih0X<=;x z0R`nudQwVW)pz|G>a1YPCU{oFme7MH{@8{JYaI=2t?2_}j=0?l=_SHBA&z0U#qSp; zFj*86SWt$$s=-ED1q|M^3{mHF$*GOn*qVhAs&^*f+W`pnq`AtuG8R3G4I39?-t)YV zzjWG|kOn(N$)&9E9qW~17IxXuABGm=J{Ej7@f!%`u!n8ZH8w=#pA@R!w*EDF@X1{N zGM7L>wC)Z(Af&Ur z#+kndKZSFjXY@>H_Ht;&T;DZSiVLGoo{KaH{Z2QY{THEHgc(vF6|0G&7_wCgp);ys zGj9Ef>-TLd{7K0Nz>Yl2t}dyfi0>7L7x$GDCPvSszbx3OdH*CO;8nJ|0vmFcWcGpqvhIu{EP~q<`XoM({HW} z{;;`QEOtRQc8>Aq1S`@gc30CD{%J!~E~H?{uDa+33`H}%$b>q~Eb9{?E}yt6R96i@$6OOIG~_&< z?U1)hPu_ens)}40=*#z!eu1MO$r-7<5)!AxRQl=*pUKLRjLGGlGZ)TC2j9q}HvgG7RxTON6d#dUu4! z`O3Tey$L>1fp{}bLvfw3jI9;rux=_OHXBld{0Lebx=vL2-On2E@&rbsgs)Hklf=;o zh8Y`#ejL*@I}KP+^mX}^oP<;}vYo2RTaig-SDrTZshvN9Rv3ApuB0ehF`HGiFwI=3 z%v8G*>UakB$9O7v1A!r1Pr6NBc*qzX3X9AfLhJr69SObDWRtI&gqJ_~*#hh+$S7DQ z%}KZ^0WJ0lQmn?5gyt3=hA;mRE5~y-Qhk@+?9W@q$XLwTvUY#b9n=^(st7uH`|*KbVt`4O)$6ZZaJYJi ziM1*Nu;S^_oKBfL41{oZ*|>Xc4m_z~Z+V89{+%4}6P>ZtYBPJ)rrQyIFso(t`8k{b zQFls|rzDC@;yPq>r-9}$yk*1d=b7C`QOPWO_%~%pCKu%DFg(0EYvSXlozN|1z6?1*e|NIWFL4w>E4WF3EwgZ;aad%YLoqCKC~cFy9V;8d z3TgZR$dvVOtvBGPSi!r@2Z#ZpMh|pGIO}=Cl~iFkJDXy3Xr?V|+5V4I__XYtdmrEIb$KcBUvSWdYFHYMZ1LCT zg`t11#cvpd-#lK+T5PpRgwdL#F+g1M^Q{Cm>< z(|pr29tFYeZe+saC-YJ3qnJxJg;!e7Rxei(leI1GIXRK8v z2zoqwd5?srN0Nj`A&|uzS@McW*J5it$cx&6|49#x&}&>75tK>WP^A{}G-{K)R~>$Z z$Kk{gMd1V|IdzgyaoncBDl*Yauh;o+s5kmMSlPa_ z6K3Q%#r*BNKOLrp9!F2gqlXTQSnht$KiT_&JU;ctOh8*~qLREn0m?H%-@7=W)0}Oz zWxr8#u-RNlm042Uwo4dt&%P^j3)wHjmYjZ(i@zonETQT6QnMx0?#s{|iIc$X+Tg1l zF6;AHk1;4q{4%uZ$uFK^Z)~FN=@4wHpzLx$?T2D2tVulH^46&$nSR1kl96VWwbZm< z7e--@$C5m%E(_j>?11b>iaEcHBaL6Cz&-Cw7IsLhcIT-ZHs!gpgRvWvrsWNWKFi=>GR)|9h zBT8&_Rgsp?hkuhGbe}k%9d9YNm|@>wN{()iIY3zsI;v#lOMxwTWXdD##VCpEK)P}` zd@TjfoaPS6l|#YGt^VI##htO`wHMCLYkh)vPO5=yT0Mv;O>2~P%6{8BTvSyCC!V!7~ zPtBnK4@B_VxdRG$0$yF{0)UD&`-0fbA)Ggcxnu_rEpNJP5w|b=&s4`W>;(t-5xV0I zucl8VJy{_Wu7LWh#$XDGY#PJLg_QIek}MhNzWZ-a>MnSP3w(^}NV@yF5zHDKyF!V- z#g=<=%3ZY7_m$);t-!OEMxcd)z3>G5)hG8R%gNZ^Oyg^1uIic)MiX5@?+^fA=Pdtt zz1yuH8=A?D%yA%@dHYtx>p2m#4z|SX8!&E=5b~kWyV=pdG5>Efmbt>(;b@8gaX+Kp z-p83y*5&O!N0=AIj3|9YIKNLV`WF%wiWAu3@QG3xt)T`#l`6*sBF%S7Y9}OFC)Hfd zn($6P5;C%v`llSG5qXRKzy&*tOIKx*vwR-Xz}AojH7B!FZ6|if9PXDGG-bQy=n`Cv zdF)VrxmPdv)y?Z+HNYxo6NGp`8oN8p`k6G^C9GEBp{R2oKk(5Lk*Y)EQ-`ZyL##A6 ze$RR%;%=eE0;kHP!jh+mig~WxH|h+>aT|3bk;EHfBM-mKYdDIkp=CA2HNX)EV|+{0 z;@#@kks!hqo)b`WO&_Q+Xp(tB&CM=c6NT+J!jk+~)7|lh?|=M)QWJt#rx^M5|7QW@ z5rPwu=f!(U&=u;n1MPZ5&M`8fI9|zp1Ja%4a0u^~b_a8jana-Czv962i=c^cvE{R) zL^M>z#%1C1{alKD4RT1^$bzBMzri1>0(OCA=A}`V&h>Jrh1c5!q zyf1vqvHhtr9sb7Vf6hR^I=P@{t}hrb&jnf8cvYGRTRFmKl2;vp+YmO+-Vk48D^yz? z?X`r$naVlL>`?@wx*4<&gu#7JZCYuHrKAV)eUR1iy>r*kGe*BZo!LhXDeKERym4=| z->a+G_2%6uLGk|iiSqI{7R~kaBGnlP>fE!9xZ`7Ecr}3InCGmN+5)cUN2rx%#c{?Cp_ni^)?9PdK2oF=} z)D}{l5`brrU`V$J1@j2 zpYHdb6u^>(+dj+E{EfcQ9aU;cmy;Lvt#iy93S|G-Ne>tBFa~TBDLF5j6_k+*&v$}0 zm8V0db-7z@AFn&(3W)Ym>pcFRp;0%qbB`$T`NW(WH9foX0FTnDbL)(=RiHV`MXy(( zA+*!r`H=J!m#`Z;n+juw>SCv|Fi{Alb^0yf&eswXX(^N6K78BcT3AsP0G-0XYF4dq zjuUNO42>^C3@{(Po7{;lU&*=eW>3x3WNb8`^mWM`i|igf$B~=sv`W6*6HLw6EMTR; z?1*45R;?6^>e5!%4G>#P17@=C60=W*GDGQw4&DX#{VL#Cehhgr{Kq)3+z{d+!AJP+ z80f-$%1L&(C!zLuQsc;e4`ygsPU*lca6@-Rp)Fi$_1){C&jeQ2;=y@Jux`G;&p4=O z0He;LL7z}S(r<;|gWnyK`NUWFW_xlKO4F!*Zttdp9{ME&nOM}yMq>Y+ir=0Ri%G*L zeV%bO>2XQqs~B{4jMd&;*|&F6AS{K~rr!c85J!kzBlzS^(uS|K`_Cz&Y#H77S)p;{ zM%1|uHmQax-Wz|o7n-ts=lBdbwY$6@1FN_6Kbk3p^*iBLJC`7<%$}P;GbDKt?HCJ~ zU$Sub(+|I$F?QB2P)J#I5Gx*(EFNp@1h3&1du*l?)ijG$QX)0#7?f^?4$n$@sAxvq zx}&Y94tCf0m}N}mKUJ`C{FxNGA;ok2ehd65#eMxsG35SJ^RLJ*y3he%Oc(Fp`ZLQT zu9gN(XOu++jO2*J;{^(kDVk)hB0Cmc$hgU2GtSrFXNp2IQA8M@OIT3^b+=~Pyer|J_byd{=)$rr3sQDkNMyU&|3>6>qVA$d~5 ziRQbVVQg0$nX9=)f$@c=LB~WGms?`Xu0-PFj?Go_9Ft{&xQPZ!$%6vx!GwB_L(b|B z8#J<^GOI_>?I8CuBfPJ-3S3PHD*NrG;p0j9SZD!@lR47G5Q3#hmBQzUo5p;E|DQnH za%QWP+{10A{pHs^Wu|A^@i3md^Gd$?s{e5Eubp0OPQg$t4a-r#c?@>srLoLzc+99y z@sDpfBIlO5&PUAb3*kl2NDC^xK5{mY+l#M+b}cT%YHj`kKCBUEN-#1xdc8z}9{1F~ zdEZU3P7R|wvM5!Jy4lWb1`s4X)-&m^Z)UFrnN~A^)Qmi*;)^Zvx)&zQs*FWU@c%jL zdoO0W?6<)|kPb&M$(<{KoaP`1C|axD=S0T|%@mO>jC%r43rEWBF06W8hVrcC|PB$q}^0F8MVUy9~7Q!SnLlf*tX=g^2 z3JNLS587qj7|P;xj{I8nilAN3>DDC3cL90vfKtauHb30Sm3yy1c2i2mPEo1L*Qs=6r{pgCjb%M;zb5=38_q7g;`OWs2;c@KSqb)NL048a)#W{%@M#hE#= znbRU-Mx70#wE#ISCv00NQ}*FA$+b-INMHQ7Has_M8M%^kO2iK=H2s*MwSSI<=uZpF zUH!9XV#y$o_LZPXPjGeK^M45sJKneHfJLW(Np@Yr?ROhovc|D%r#+bi(9nV6yTvIo z)`6&l_A}J9n*(hXtfbrfI3fd)(tl&H!uu)TLYDpc~2uVi_^2`NS=-}7cTp^?PW4KTCr5R1H zoX&p!%CvOLk}0RaW$YcN0IO=!-MpeVag+wRcymi<=?OXc&voeSgQGuf$2hvMae)WjGsGc*4DZ6ytv5+D6WTdsPQG52)kNskUw zaFmooFX){FTeW%HKQ!H8D+ub>sc(`A%S#I#NPXs(aJ*H=nxZJ|h%6q~83JrOqV|fY zu;1_ArPD+7R|JM2GJz}|bq!d>3&#-LAf)QklA|i>wd@v9J~1(^XXgxdrz2alqQ*=c z>fL{VA23(y*%hRe%(-J%6|012y<Igdo!*ztPG3p&P zu9|^AR*6J$bwrj=1n2n3>Nd|zOAsLR6LEX0(eaQfBu;W?#E&t%+r7A~RSTsDaIeo5 zT#a@)MNiEr9c*;Fyk$d+HDs{r(@7q42phYKn@7-(xtd`*7Qg3Xb==d{n2dL#yHml3 z7aShtaK*3+V)PDKV=3|HDb7kN`%&F!STtWAHS#0*owU%s#GuPuH-&2|kUvH<)!#$! zePT0wR0W5}iDvD%hSYb$!oSar9p>~3x7<#eg;1x3w$`q5Xd3q3Brg5cVebS z#_NLX`~84nL^=-@B1M&d&lnC`%mJBh2uN(9ZA@H)Dj)KNouPHsY#zuq(9tDUuO!II-+@|Nk&kl zl)1V&07?S7@8_5L0HN|(4loVM1EFD3J*72I*h`HP2_}D%(RD8_A9WrjI^Ph1wY=1i zC;~0xgqWb~=^JQ^@Rw$AGND3TLA!UDM#Q&}C9u*8JWPA2+))dSa6!OFlb~RNJ;7^1 z_g%RbegE>=|N1(EyfN*RN;=H*4qd4dkeY!D(kj7hR3h#$jHs#tad^^5rtAVnNf%iT z<22l3JCAs#*UcJ~9Iy`+Jcr{QGoX+dvMkA_tiWf@e2u?y@?cZ3<)hIW-CheJ&+iB- z&qvJ`qEA(TeBP;Y9H?F2M^}e$LUI7$kBv=>=QFnY;>96^o|sicv!zr1dW_eH!UzPp zOQr4ot3yV(lAG106wT5IZ=Z^)wRwkCwaB|T?h|YxXJ8#eT>`5cZH#f$B5#&3EoIZ4 zsqgRr6@#etaKs-b#AAj#H7rt#y`Q{L&p?0p*wb@}+6Y)%_mls&8QRSNv&BuCMM;{# zdC!}?$r1KmO2p3m%Pp6@-($dW1JkK4332R4ksf|YCTAFGArFvx;zp!AuAOudt>;b; zZ`5k6aXfs@1CY#1q^hAgZffGJ{e>_V^1HVRl`WioqG*PCa zt@D~s&w|kbqB$F!=NZ56DdZc@JSZjn!vFC(v}#IJ^~msd=>TTe?EfEZoHkE=^D7Hs zp0mP)sLnJe1a`KCfQO_JZ z$D6VCo_IxzSNF($C|Oq4K()%!KLklB_<4stKg)KuRQAb-hP8j z+1sFQ(HSw~224kyTsF>`1wTZa(ijTWaxAe{tvM(u!KUPM_NR6R z$XG#7p^@S?PY`L!iN5#25B_zFbPTP70h-m+z)4hnaeKH%Qc>+|ENKN#t5Y3{W2$O8 z?S21Q@)@?y`pKR%{!hRE{H2X&FNyLUE-9peF%`^^ImBox z6lq1KPDv`zoyLyS;@o0Tx0;$07^Y6g z#NV|$X#FMTe7ydzzOuMftuMRinVQFt|7!yIvV9AQ16n;Lqjzc9A@z;MsQix5=pd9D z1(vwn)r5MF)&czcQ}+`(!j-laJ-PsREBf=zEK=Ms`3iYvQBOGTi?n6-Q@k;nFC~Beqr=-13)906pEJ$-wM@0La)HMj)XMZY_dml(x z8H21k_JN06s!E?C>`}#=(q&*JF-<@jJ)yML$j($pBAv}zT=>DFJu~L4Q1-Rs zXs1mIwh5-Obk%q()qqm>EY1^20IyM)mlN!V=YhF}R`3Oxj_#7Qu<_vw~$u?)rkhZgkf0&n_e)wqjhJ%Zz&vY1UP*rLIc|g_I)MA=?hH7 z1h14KIK$vR)VEcVTW-_YV3nEsQ(Sn*lu zj#pq8T`_}xXGYin}Ud3t$G(z-5u(BJ)ReB8H|PCNbF z&<~Im_*W9;6ZC-{pcB(7FpwEGSfXSWjmfkuHkWNVCb7P3A1ii{u&iu0M?9OpZ9S4% zq-F@qNT&>frIb<(qX{zx679kgWHOEV`uf4nq`Pf%oJ^+22(a(Wgds4QO?PCazj$n) zcx;;qtc~Ux%06lslhX2c=3z$M{J=z_lM-5ALhjaLcAjJ7+KMo|r~?0mzs`n;61s`fzsU^V@b znXq>M>G$AHUX1NZBi~!pDu};z#y@``p7VCYaFp8$Yo|J)f0#yB)*vT7*93P3X5Ow& zZIw#!gy2+fMRvU_g*RpopI*u~o}N3n86q1>wScs6$MQ{G4JCGu#M|GJ{pvE8`XHxe(dl1oEnEH4gznx^h#5H98DK*wG@O8Qimz)0 z#jsJ`Y~%*j%i)M=e6tbfONxdvKpN$4LTFEk%NtGfAMmJ}UDmr@&i&qT967$(z9;3y z;s6*qi$-(h20BV1=iBZCjYs?hR?fMw=V8b@?olHLI|uW)!rmo#F&NBKL`$OCx1ET3 zw-;lNAsrx*lk7j=>_qgxAQ0vqWUl7Mhf6Kna&NOjk;9rLwDI8->G8#6?vv#|?4wZR zyb&)>bA}|#Bmi?9p=A7KhC>yOfG%ZN3-{G~pN>@HmMgvP?C73W#FHjY2~0~p}NQ!&we6I%vHTkTNIFVM^S z&bTZ&^8CYb-e{Z7NI9|V;nsKjyt_}ZQw)IUPV8GLwo(w)NQZ;900p`?V$gl&^gyc> zD-pmttlAOkm<8+ZbhBb~E_*O0d*#*-e?+09@c|-jBp0x1vEaCAkz`MW}g)!G$=wzBT zy3+=pR#~TapxCx^885VcW2f(^ki(t562dJQ3UUMakI)7(3F(PJjtwen5i9ZI6g95a z1G{E-<)HF{PwP8BG5lql|7z-A>K#|`rio!fmDT9PPK{YVUpg}BorpG(sqoAukkm?V z<}9w?28UCaDBa*kxzvJk{g9Q?l|sf(Ftd0qgfG{+oqiO*>CD6ol;7;)QMy6r)OLcJ zzXMyoAE729@6%|hA_$DXcj@)HXM+}RJykmqC3EgE7oAU#jN0J z>jlXcHzNFwkiCHz$BykvQ2ide5l}NIdBO0=T`J@xgm8TMcW99~&s+$!-G8*Tnwax2 zL8!i#85&!7IauJ!9SO1m^bRj8sOzpp5W|t*P9@~-t)CTPwlqUF$FcI4p7-aMebl)e zGi+|$gGQzf?q4LK+?|xGA5xbMHZid6?vszyk{U8sO0*a%&8u!MwSzi{*@j-v^Gd(D z)B55f$99M|6TBJ1eCKchwsz3$FZIb4;SyH2Tk*|iDuX-*DXqmobtk)iS5bZ-ntcE~ zcedi>b=XBGKmV}Je99&3GV1^5Z>p<~>~(GP03ChNc$Z>CcG|>Az7E)cD&3GUQw#Rz zvje4o4|q+4$K8&W$^Ov{7xS7Q#DasrbFSNw$MM+S4Fn)XX9ssprCYQ3lmo68%!e9E zx9iarrJH)e?~25%q}vf%)Mm9cpFYlVYXNfy-C?6GIJZ&COwS=aQOQ6%LhnYvaZNu% z!#N~xgsqsn8^qKc+#Q@2y`mewr|UP)uwGVl z?aigg$4~O^=r_BtcFbU2yAzPp16;RFUtopYhkg5lDcX)k!2J!?8K<0~iw%^I8#i#l zN21lLAEq_$8%e$2ir!R|8vgWPmW>5#jYjG2wnkUv@k>nsEgRu~E9KNv$K2Cyh2Q=9 zf|;ywa_|h5TR_tno*d4+YO5X88p1bNTH_mhNLBUvi9k$$(`JJCuxY_e(-An}XVX7K z>ZUKN%vx?sIq?4!^_F3AHBHy(;O_431ShyVB)A2)1PSiW;O-FI0tAA)1P>m9yL)hV z8_wo?&-L8=VPLL3-L+~})vE5Ez4OL$20Q;~r>tWJ<~eu~yppa5=VtM378#lvi6M3fieuuhgL?^sNLe-lpgDLnI+DhX|S0sCiGat+y%?aJYt zeScBd5+~FjaTiwUT40K^m6)~KuE9np_6-WWce)*(Ow_1yj`>_r)?^f$O)n#kO|-c4 zbEkbpOKh&!2C()Eu@uKE@trXm9G{fUEs~I?2?jSelG-=~ys`bYg^};1)fWbA2Y%Jz zbgzm@UsT0&xGa74?d&3D8WEgK<%I$^TQ~ng8go)2}gyvsKOWFSKmaje|D$>WqCzdlyv`0{vfrZb;t+ZAS}O8>U(GW*2ZH8uU( zh3Hr;QFO+hdSZ(y>sDsD;~h)}f39k@lLiasuW}?T6rF9wUNOg_xfrBrdYWN=c#XTz zjbIjp$<^FYnErd(>eAkC=S*-tKQtox`dF~z zuMk8v&7bzIWc#HrYlNTCiv+co4^E_cAuqaFFBrXijWH!#9C10N3Wiu!)hTc+qpWRkO2M-{QAh?Re9DByW`+et7Sj|IZ+;Rs&{R@w*NjPO~fP_V?o*-G7lkz;WtI-D<8WXe0kqufX zs_nH1hFE@x4~J5?bAwxX1$!6rTgK;(2hENLagph67v_CAB5}WeMW!3QB5^^SVD})^ z#16AxOb%4`HkL|6tQM@qcSD^@Pb>Q~FuWZ({o(CP>$hxVV3^1EzE^CqM_`|dyN!{g zySVXna=aj$-=6dZw!O1LTn}@o9_lF$hL0I}Mv$~84}W6!_JMX1N`YBQ5 z7}@eM+2XOkJqx_w#ZzlPkk?_n->1=LsqGD zCCzFq72bDp==^ry!~URv)Zda#KB<&|xF-7jPfpDCwC zA>5@$l(om{uE+4}=eg=Blbk0E-+)1@=iM(T-%h;Y{+W9XbtOgR4r(}V*a}{f@Av$J z(=ZWrB*jvZGj|@g(p-1L{0cFLv8Q;@x$du&lwP;u=|8Noyq0i%`GJaM+SM=eaqoPY zAL?UCrdswyNc-KIjEgNddCUhHLy7l_*v5kek(>8s`Z&Z*VP*ptxWXQFaMmoc+tDgC zPQ61)rNdd_>xak*li1PQBP!;9PaFyyRtgz^3WD3liZ<@+hWP_t86tRJLGLi~1}MZ1 zrF^BRxTeO$jm6*!9Xe4o7&^kn4x{e}8a|M=aiJuyMN1wPyWD>s|9J0p!xfXI8m1yu z?=-#tg|xbrK*Ro-rD?!p%S@N{cNc0uyZ3s}^RV^8>t7eb#H^@`*!sx_Uhd9cv>Tt3 ziJEg`de^yrUr_X)@UIKuz5dOLj8Xc`sLb+vcO;pEMkV}T6=Tsm;TW2LkFxg1Yz89F zdfonvAiTszctYjKNd$ObA2hY`*)BF?|tnA%KCHjdxg(!ReH6-hLEtqm_$oHRi zbMB?K5Uk>?`djMOsS8DL7)JCsA*X6Bp4T7yK9Be88(P+UuZ6!ThXke=vkf*TJS9NP zNksDuBd>?Z2z458X!I!hiWM--$78rTj`fhFtl>I4bTGcot#d49BD~D&Y?G8QZ0={+ z7*q)&zsxVGHP43;r3YQNxm-NX`f&bo=G}{4V~mBhlf<-V2z%%+59>?Y9<^>bEaP>hC7h!3{|hW5BRBDh!|AU#2fJ0UnT*RFvHHi$UJ(>HLO1**|D<>=P35;rf88e$n4)w3n@htmk{MK&Y6bApp~RTP zQ^8JH-iRXb`wre4^Z$*QMg7g3zq%`PG(g7!G-)bs?ZanFmS6#ml(@MtyAasaX@n@^ zzV#(C2Lj69)MHrk@ph^yCXtMXvX+H1vkWor)Xp<1SD~nQ zyta=2+XJ9qTSB6BaF-_d$l+x{_+1jss%0*+R23$U*VS~X6q7+#qA3^{pyB2wD&S`r z$ISJ@83T>El|07v++z5D@T`Bziw9=a1UXy(eB-X&hX8h&W6Q30-&B{Q*g_5Z-k7J1 zCqG|(aNsPc9D`oJjCL*Nb8LM1KX~&#@nZFQz1ZEK%S;Xt;Mq8u!M;J`z8D28hy#A* zWR{M%E|laDat}Eyl&HH`dcc+jwnW?e1I7Sq{2!elMJHe1T=W>bC!_Q_+4MD?Ob8nA z%dyRIw?KK0qe4ZAp%9&7^`ow8+&$7`%v0rm{xObu5&;)2 zyLqZRL3RNH?kr@dGcH#Fn24e6_t>;$4h-a=Kk1)H$X(cr1$cdq%`2ST47Z}8n;W{Z z4+Her9B^m)AK3AgzX$;P3|ZINu+23~p?2T-0W|yFg4n@2S@!{~3?G5yDftY_=es5S z`#*#H?+!dTvgeH_3ltgP0mA91U#FQt1B?eK1En8s$O|wV3bgd-jYkxL10(;e;_}~s z{mm5pfOpf}v*Apd?vk%=H`zk1;h#(I!FL^XccrTqf(xY z<^B5~UGs!($lpTkdH;1&SBgNd&D9J#0pP|b6fuk_6n@K--=&xxd#EP6@23A_gP5B6 z+vExOss{l#ZncU5cj>?oCl7KC06A6^j4*W%;v7h<*KEi7R*H6L=ZWgx9K2pudjWGh zyPkvQ1nDF6eYNv*A1vT0q@>5Bf-mSp#is5psBZZDUtD!< z#^=3-XtV!Is~J9p;JhUr?EAy`m;hRc27W;bW1Doh5^5jj&}n}B>+0cu1B-Dtyj_-b z;=p)1A-7ybHH%3L3hsl2Ed9TMBST$A0;S{D*-Qe{|$yh@bN8U8n(?VVTH!)K!N0jo@|D||KXEJS6a3e3?sop?q%NHR zWPqJor;o|<*(uu&K;Q#eBc;isjn2McF#qs4Pm4)+Kh~P>ze|iA+1>*7yz#P^)7t{`~B?be-XC6?1cJu0fe6d)Yo9lO4U|=nT$zhJ zLO24uP|-6;{Hsq8q&{)xyZP{+$z47ptZ(ex^wH1Zx~P~6;WKAPapdSWE?hhM{Q2#}a9!Z;NjK^_% zv0Dyk!!^DnzZS$lDq;VD*H2yq<7sVa0WEl*`xeLML(W!^-(i*X#Umu=gz>Z%8sv;B z3+mp&qXB`4=tb1Id;M(M0xW$fDMn~WZ4YGQeiHPHXyc{{iJ_Rh#&L1o=-NeL=S9mD zOX`D^?Y`GEZ zWAo|e%I7U*=_yo@nx0p4J08fuJpgonHt?m?+NY*ii1O+V4&!6o+e9(;*l^%caBAK! zbuqM(rO}DD`sm84>&-`Am{L(s*51`@Gn@LR*C!@W=#+^l(DO8D>T6+x*ae3I8Em|} zO9`J~cOOkWoV^{^4~~zhXf)VQ7l<;v(|kJYl&G&vKyCLFV}|qz#8-n!O^|Z;-nf)M zm&%*=t0OErh~RqUzGgC1Sonp!c%xTgQEl}yBF1x}5@NOG)ji*UiV*Pz+D3DwRjE9s zSSB}$Sfo-7g`g^EOnDu+jXKJ;cMdXfJ&f2DxRXB9?|HdN=b^9oMSDmjUoPfy1VQ(; zuO&E`tPw~ujauO`A4H-?g84AM5kgr@(gc}_SrUcLDBIf|5A?IO`9z_s%T`Wy#xA6{Y-6vN&Az!_J0qU*Zm|G7jdD5ET zuJ{C?g>qS7SYXeaStw?biRK*NiQRj5G(70GLQifaG+=h-_)aR+L(usVbByXa2ExtS zV|b`aL|Y2ETWe<;=%o8&!ul<+*2}+v+C`uo=YO;eDrciZhozGy`Wa3`Qx5o_we8+` zS~)kU*zv+5%xbp*CrTBxlad8Hh~#V9el^yT6uYHC@k?7r4+j)m^bPl#lCE{@qVB+a&{f!B)nLU9W8yo0NOtvOnP5L z)Zu`#paQ!EebqvYD~{^Pv1sBMR76H<;^D6&^i3!WiUa)7z~t zk=ine=MwJu?F{SSQrQqZ)#1dJ%=C8-s-&-8Ffrv8?4Vzg6sYQMOk_ z#j(&;PezpS=>G#VTSL)^z=I)fS_DWh)HEBBIcLF!cMVU94>$=!asE#*3Pcs?4rk@V z2d;rR1VR*<41sC#sMkS_b1X!7`vh;0%JOd4CE+~hA;{CN&(ks&A zucuHT1|`vllWBBg^F!QzS?80_n@Y=BV)rJh{DY_j2}fr^>8ip!0!zcaoPFJ zoMxlMYhV331Se}IWD>;z9z-X;Ti6T}itX z{<;kV30%*wVlw``+x`L?v`6dyyq9XuYBTn-dLyBFRK`A=r{fRG#q4VH(ctdA!2B+= zZ2)8)n}vigA>a3_n(P|27)UU2Z3mM#k-sghBmI-!AZ3)275TP6h7B$s??_?DTe|YY ze*IL6Mwt|K=`u*W1D)P(27>%SGWlu^{YZBOBrub@w(zRBT9VMAy7BPaOH~`Cyb(B9 zYr?hs)hGGI&lkihCKX~JN-`30o1jb_*zQ@*@H1m3u>2qSGdoZ+3Jl?X5#`hPZNwSV zCY%Yw3@X1Sc#FI|x;7qdFZJsa5cZ2;N;7<7cye4U`8d7T)df->-tM_6+E$W!(JOE{ zh8P97mkVA1D~}ghogx<=vz9rWbOxS-s7M+)0K1isk|F?FX#(tmnb6jhA|c02DbEcJ zk6_!vebjq#`3DbLh8G@&HE>8~_7h2)Oqvn-SRY+=@(9_17q<9LHRuQCugDIy;ji(} zuruD6bul4JGW{{%EV!gA+DnbC5Aj|>*1uD~W|?zPk1}qUDDg%4RFv}EyyaFls(xa4 zbj_1*K|$~+o`zYkg+2=$2271$J9aoa3<(eK_9@=4=6rD}hVIVKR7|qUh8#n{S^l$! zZSmU(4xp4$^O>D>nN{IDnLJs>U#$oPpSN{pHVMGfV4C;$e6ueB=cjSu;0{i01iVR* zgf9)R^eH6?zXLIvToL*?qY36`X^%E=BF@zV4UEK?u=2u}K-51$KaL?sHZbW1&!B}I z<0##S@v@Pl?3Lh8VZYH?_ee~PVaL?-2siiOa~tUBL5N$41z~}MCa4J7IBD#%v%Go+ z5phc`C?lVdQqJa+LDa2Y_4Bjv9A37tDZh-PCQ?r=dj!F%-x0a)hrM2);<5w4y`eLP z`ZjW>r9i%YN6L>#NfFzVlF*-Zt=GPjpVA|D>LR+#v7Cq9u3$*d`^_23IrW_Oj|w_a zt6*{)l49{DFb(8GVGv-Rt3H0{Hq7MsH74{jL2)B-7?grOwv1Rb_WV#N#zbF0f2eA6 z+D$oxB;UG;-n4*}EOLmG?0X&T_5=qu9wXXKxwxgw?1v0-MwsvkN_-$p0xIFuOt}I` zqPuOk(vx{Qw^Mkbpj#2j0sO=&e5_WG2__55QImf<@*x)AQQ*Sr%z;XndqN5n#onR0 zFRR3?yiHjM7XL1a)g%%aVpvjiT;~iYrTazv*FTdwaSWY_M0<|jz)z(}v6hi(V)G^A zNQzUznq6Q+O@=hHVGuRnRT{EMk`I3TA@opB)-9`f!GxjUpYo=|zCvnzWo7a6N)tr9 zsfpi#2>8M8NOeDYzZ1<=VH)q8@$opP2S;@L;PEKli;N|+mRZlDz*zbaM=L6cBYJ^tN7yj5^2*1~Gs$N7}0ueC2s5@iNyjgyPp zs!>!EZlI)}gZnOxP#<8M--A?WVi8?WF~m8w2qU+FC7>xx+JDb5$K?L9<)!4pJcCz3 zRJEcQkrw=~*mtvMZ+U2G=5tqA-xt%9pp^Y<@?DT)Bph$!fW?hUS^t`b7Dpbp0 zLmiRHpFz1Dbj@*VQ>*FC7w8C8XpIn0Q5*Z5491eNB&Y-FHnoBkqsWFz9C+I z;W!izsKKljRpmAH=_@#LVQeg}Eo#RP=Z43@x#sQoMjS-1AjRfY$^a$p>~cpB9#(*M zw8ToiOj7@fsMgz4G;m(zSF?9^bicNsHxrd`>N^|E3+ddi-D(UQV3CiAzk2K_NjP+P zGToC5UGMz5362w+7-v@m!H|KdJ~M8{(&jd$Wx@ zLDvZ~j~99RY1;b=NZz^mc6VYzQq9JR;S?K&y8D-PD{i21s9ToxWOr3>D-mVv^ql~m#Tc_f z028zG$6`y$AafXnl(Etd;;uZR2SHI#Jib^w06_JP33jm`(W_=^|I0_@7A7I?(sA~m z&_nOm#9_s2gbFH)hdW!+A)nSQi$PH)2#%gYqLgQd)C}M2*TYi=39%X*C%3jXev`{x zT%ix#qs8j9FZVz89QCLt-~=x=^+?v_8EZlz0?z7*?|J%EAI9eqf>-hIWbXU(DfZ%W z)*|I!Z`8_S0#~~LEkP3nN}Rtn)U;%oWK_ zj7cCWIDv++(a)2(o2t>|g*SkA8|Ji2jGP+kW;`d?T)3H~Eh~J5mkGY_@DVpo5Oce2 zI&hU}bOoEO#6_v`?z68k*55t8ApwDj#y2D7lx zo!=`pg_!2mJ=!{jhGOHbbjS>NoLi|3x~rr{dR7Hm#cV+pdEl-AilIHe7NILG?5q3t z$1kVQlwio?KO=ZmRi8#EQuRT1#W8jWc^<-7ev9Q=yOo2zwQO4X)b1n_V%(}uY#>QA-3u%*A*crjvD`!P;4ZKUPVM@$FE14BvB7LN3H9#CN1*2CxIUZ2RO3HWTlRGA5%`#0BgS8EZSr*Dz?@6V zX<<`5Jk4AWHtof#J?kne3mt!T4^$XcvWM`{KP{zQtSTT0>$ZjR<LK#e>J=vHEzAx$np%RxDwhoeN|nc0&saf>UaDhQfUI zeE!-LQ0(N%(%F2KMq+&O>_?UtPI@tdMJnWRiDjb2vNpCAM>JAg{BLmY1Q9~KPPRa% ztbpK-Fx3-&b#G?P;eNr~>WaP6x(I!En8nhe9kc=@LiaSGkIL6Kt`M8SH0*F|U&a*% z-XANx=Dv*ooZZoudb})28)Muk2k!cC;>7s&+)RRqv9eqpRR#jgp9qxCIxc!BK5UbC znx_-btBNl&kM?Q=Co-Ju{yQ79Ijw#uC(BF2-*@>L^G=-^bi}DJ6*&dm^y^*wnMmZC z^TBuD)tuA;%RDtwW5?M~UO^@V^)s!ldK8|mKC4)HLS~nD_lo0ZXBRR$CLX_jW%l>5 zDXJW1JuT(BF?|arE^n>gX1RIC*E!=s)t?<<#dwlzuzvia?#CF*Qk(=;wfi&mQI*)Z z%udQ9Bs%vnj#6YY(6IYp4RYCcwRfLOs`Mz>dFl{Nj|ka#X7x1`hv!7KNWN5~Fg z!ioqh^ly(yva6I$=B(E$#*WV3~6al#nI3i+HfrR3IK<82bmroS_80JhL(N?8NASUk1}q z=IP{5h{5Gr#!;nS<#l|Hd;#4Of7O9StfA5M_+$=B!i_|6CUi?d-cLieWPfxWJI63&Fsk`s}ft~Smf z&dw>$qHMolw+~zEa{V#x&Jy2lI*D_JVV+%Jy2d|_1D zagR3_TC)vJQ-8Y!8%!vHKqTO|X9OVG9A%C4q&@DR{$rn2w(+H75k8!-5a@wMD6Kd=XgPz;@F_}-3!A{-?K4;g|N~XP=D6D zH{Ogwz0S*7?p5zZA(!5LxyEh4@#YqN@{@0+hB-uaV%<(~k@*Jg!~V=8y38)tnbP%Z z%Iu$;3Def5h85GNSp+j*I#?gy>T;No6I2^F&tL2dHMDKVoU(2s6s01Hb z2(IkuPCv!A(ogIPrx^;bo1OdtdHkV^Swf^>fzD&jd?Chn-YQ2~<<=@8+b2v=jhis) zDU`gO>g#JU)&H!LyX5{*$;YWBI*0}cZVxAxRc|L}GV*qcZ9S|?4A0K3-aiX;F`T?` z`se2v-x8`G3g#bEj7KH?^(wwD-QL@DaC`E_dT z=jsjt<*3V_DJ$9!!-#b1wFS>~*tok8V>r^%r3%I}Rvx)3KJ_0y1QLo-dl!v#SZDjQ z;Ej(-9V|riMb&OLCUrg-?av320(tPv0;cAuD2^=3ttWMAeUU;_@hsUK(N^!MlyLp1 zu)d8!EZ|aiBi1nPX?NNTqwoIMr+C4qJ0oJJ2(`Eck?Bh>XkhU3YFZ*6X?s%{Mb(2hoq$?)OLU zkAZ}1toTPgY9^U$jERWFYe?bqOtX-RN5g`&vP;6 zNar=e-JQpjHiU%gc=VRByvLL!uLJJJtG)Ok(7m1SPebF%K;<}z`oCC???H+=t~Gu` zUfzl?%0M<2WTvf&){W(k&UA4selHyMbPw;ZRxifCaY#47M)*}mojoeNjosmU^>Ny&V)*d2 zGFjJ~zTtii)WHikb`>I)(#8lDnF%JMnVIh8TN}EF9zF6bGUHS3#_jVGG+$%q81R`n z*oxqE-akh z9nWKA6p9b3yYfGo&XXT$ux$Ui+@+Axu!LcUYe9la)d%d!;*WcY^p=}Y2F%Od!Rb`Y zPt0r?|JY(tO6HoRH zioKO02@S$V(XKQs*$zOdE`&mYL|BsB3>m#NRJmSx7yP!B(T+u{RglHaPOn6y?j=T@6l;rjJn2MYqVxz=O zOkBO8`x6Nea}5$erL3MD6cc0Tgzxb>h2v3 zD4m&o`v*inLQQp9=k+1OSbE^i1>fw+mZad+8a@*UP};p1U;Tx5^1Z!Lg^hdxpl2N( z{oVN+`GQ+zhP*DhCc3>?Km2-z(bntW6BWzienWZjUBJ5H@&WefA*$!m|%89Z;fj-2Og=&o2dDd;v z8oe-`cV`+OLT(V^k@&_lqY4K{&cy>rsGkqN8X{s$Za#VNr-v;gsDu12o{(9jC!2oT zranXMhZ8C1%jlUlQCA1lPTfhj#S3X>*%-!@fM1?yrIGhMYVB6&4o~lbki{+s7=5SE*0%-6hgUGyw z#2sEjNNiQ#r&7t5y$ly_1kOP-80#u;;&U%AkqyBAPs6fmAM6s9ANY2<%Yb-FzJS#WC614&g+rXa|0W`P>oYu21L%~KiY!gmS6hWmydE-C=iU)OCW~aJA5H$YQ2mIAL4+ePPs|FGXC?=cyo8vST((y3i1g zk?T`JZsukmYD%}iakcPWQG!*>?@Y`0`$HSQ07n=Ct%?HD-<(dLjyD4UQyAeUxhKbr zE$S$1*ISNH2#tP%fTjfUBJ>Rfl)yuc4RS1NMFR&TCCHECT)U!hw*v4HXK2e<%N&NYUCxF39NtIot=aOwce?wIw@Yn4%?V2D^5yg8nz_p;Bklb{_)sap_a|-?`$8aERM+2$2tx%`0WgzbpG+*a{u=%X)pwMe z#C5SeZ!R$yX9Kg>+Wxv@B`Krmkrw2540c5=b^T^&+7vYy3v(ekg2P0Xvl2&qi=3%MbYf5$xT|jp*EOtvy?y$~1IJ`gD`QvVO{+F~H zI3mYAfQz_}0Rasu{fzWaOez|TQwLKYYF@m@Frxc_p19(=Lk|NSGi-wU^S@^`+kpKUbIqgDGq9r67)iqD_~K8ByK z!V69_>AA$ASlDu6J@7f}gCT;n(9WUSZ9-SyPHdE$*Dt5)C5^h`p#pgJt1T(1Ezq)g z2n4HOvtOj{aWEas2#R7dKp^hEWUTyk7Ux&`f`)aWr0gQ{0LLbcfFf#nxB{Xe!@O*` z$baR{V+tTUJpG)OziXg4%_iC{RtvY(ayc9!xym zes%h z8_F_Ilh1soUF6B%6wO(0S}xw!f?H3s4hol;^D@sL|I}>D^@sQkFmZTse04M7am+ED zEGMP7Z6~iis^1Q$ZAvDwA@ev=rOiv(q^1jST)La_H2jCb{;OKiekYS6Zz}06hmW{& z2mssJ86K???qtXfwwOL77@yixYz40{<^cByiPV z6907jE4y&PwuuUuE}wS%@=1G#R}?{zFnL(w4P53R?j*Lyx(m3h^&LNgD3EWbk9vDGwf z+L~NJot#iq=66O{34|X}9a^VmS&T5NpJm^U&IObA#@|dLRj+fRV8M%ko)kb`M@m?? z-^S6+AQi)G^FQr8BgUBct!kvKYilik$KP=y1SmoQ-)RWdcXn?g^s;dRtz3DVy5b zUq3uQ?8tF80GSoJ9#3f_f*JHEQ3Z6=BGrz z4gs*+1%v7MA_z51g*ia4F0zy41e&_I-Ko_vZGsNP8!|dM%RnQo+B-LO*dP!Ck$2*= zlRiunxMp3XbaO#{OJ6*C_py@gq}pS=%S0k($=pDB(So#sLii_*1(T)UWq6dQFloLO z3<%no!VtX=cH!j1-m5uEZ%!YNyF@p0(7>E)3ZD@#cRJwFh=ULe zO-)T}_VOiy!zg?9mcTGjKR?hD^8k*DV%vI>idb#zU?T*x3ykwv5u#g(HK=V^hdc|W zSXruagH&8{ttU8u8`V0N&G3G^FW$_>b1Jhvx4BZf>MaAFmUW_WNwBobWc%>#FRf1jF2ANl_t*#W(b4XR2bKM|j%sJ60U;KaQtL%V z$(Km@{5IWWoI#gx2!}zDZmjc5?3%ujw|0IPka+uS`y*w2WVf1;S%4NsP(9^NO2Ler z2Ng`83ltcAuH+T?Z>W1R0tu>8AXf|@+oO2S;0KbCR2ULQ{#hw7jb_`LjSFXlB^`;= z-S0>A87neMY5lH|lXe2MZu3rvzKRxiMLMwZCKvM{Owxv#>N{DJoS{1kc5Kjln<*qZx zTZa;U*__dK|BUk5RML? zKoSLaXh<%st-^xFOp+{~JvAcb^z+&BTcrfD4m1&--z_Zd?|M*YA^55FY^Tw z?t5_p#R&f1U zLkFr95!DYti}!sZ6V7D)hv1mt> z{7|~#Bw)q+*2l)hkkS4)WvLL?`=|RPP(l%pi0~B^SjNqHXE@5G$eU0<*y19+897Lj zaIYxW2{xxfQ2(9moLBtuG?{%2qeZahUj~};lw-$iu50K&8Omi))WrH&guwqfcDX`aCZ26iKl6oG23zAMLz1L34?wuykl$kHFq)Jd{2U8 zAtrwb{p!b{RA4(~`|24V_J-%bCjTpqb(I(NgFS=Y5ffu2T zjE4L+iI&(1Fqk9D1kT71ytM#qn9kXkJcem0B0qlH;>BnFU(em2V?Dd%COC(`9e)<> zsw;Sk93nj|IqdiC5DwNxW1GtIt2t8EXYGmx#k(r6FTu;}hN(0YZxJHfZIqMhin{a= z{Q;lW**@Y}>Rz994=Y00HFw64f-%M3h+TC}1UsGy$r3+?->nIqv%pc1dTUk6FVtXa z;;jLG>s)VDp|nD86(!fS$Ect!m#5VT16K1W55n4yb?-j4mbHNc<~`qh`<#MX;_O%y zmMy5y@aq!tbcg@8rgECPm)lTI_wsoMB*$yocz%xyZczjlD%_Z&187e#)dzzBAsyW5 z^Y|7wjKt88NhcAwgQuPI|Hqm(ZcZ3&z9JAaQ?p7yQ0gflAJRqXWE!%szBe#XLhqsd z)oh?u6*^B^VO9H{=$u#CyhIz{`O-QtyR@{w^#9z_$ST5%oQvz2`WdvA{gejS{76+F zmSQrab_Hh?wZ`Eb24MW8 zx+0Ec4sICqihv;8R(eF7uovgKcWT8B=6a3R+bUMROy^r9Tqx9AOk&Zg484)4!Xn)2 z!`-ApP&48+v85K0_ZpzbM)Av|jX}}8dYb&*itn0{pJ(B9%W_ z#nsBJ$LR7x+v46sXt1TU0$&4?mJ^YjJBa`_d;I-6o3@08+o7BQ!8;ZwxdZ}b8Qj)( zyB2q526HY;KxG*1Cf~9q<@Iw+!~up1+M!7|@%PI3nw;I@5kR}i{a)WW!0UH^TvU)< zcmDkHMaP@SboN+L+~Pk%${6!~9mQwi=r3TVBQESSH*i=jL}KN>yd&0Grue#SGM~fe zmztcGVQUKUiid2EHIyYE$S+Dbj?6(_mLG3M0DdRP< z=MRWMU4k)iB+d+Oxf2CN$QzMtTOarLZ$ORyXAR=!$uVyrdOr6oZc)?ZB+r!e5bAI& zbpPmtE{Y8}4N8@_{nu~(>&`ojwBv1U&l9I@>pQe6m&9$fNAvVh@#U{vi9z9tbs-aD zU%->@9T*k*Rp`Ka6~nxm4r22IsXniU|im> z_K-dgT7Er4{&(LqkgtGJ1<0kq@O474w!CC;*b#E`J@=Z-P5@GXGZ1jftvPLV)feU+JW=lZ0SVP!cttd~+LJGm~XfQCdsNm6fglh!5 z>wtd_XS8U59zoUQ2GPxH3#=alzKr(3?*H@F4SObaXaZM2!q-UyJ^4($+39YV(V~b? zzD{7;dRo9<(`wy|YbMPCg3jUm50?B-Y5sU|?f?5*brdB05l<8|)q>Y*VuJ+ucomJ% zwsKmZj*>5cP-E<-p)s*d!b;H;=n&I){H0Om2nDPeQqf8H$&vvRg2gB!1oQp;J^N*5 zGG9XKJUioS-*n^1$ay i^m2p^fPl9K?qB2CL)4Y1fb+q?kAjS{bd{t@(EkS_+(x|s literal 34794 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 V%k>v&Ofmof002ovPDHLkV1m%^Qbzy) 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/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 55372c13f06ea..3b7156841f3e5 100644 --- a/maps/castelnau/castelnau.dm +++ b/maps/castelnau/castelnau.dm @@ -20,6 +20,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" @@ -157,7 +158,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" From 713e85c4e959e719f2f75ad2fda18f90b6349208 Mon Sep 17 00:00:00 2001 From: TimLV Date: Mon, 3 Jul 2023 21:35:22 +0200 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D1=80=D0=BE=D1=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/castelnau/job/jobs_cargo.dm | 3 +-- maps/castelnau/job/jobs_command.dm | 8 +++++--- maps/castelnau/job/jobs_engineering.dm | 7 +++---- maps/castelnau/job/jobs_evaguys.dm | 6 ++++-- maps/castelnau/job/jobs_medical.dm | 2 +- maps/castelnau/job/jobs_merchants.dm | 5 ++--- maps/castelnau/job/jobs_security.dm | 6 +++--- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/maps/castelnau/job/jobs_cargo.dm b/maps/castelnau/job/jobs_cargo.dm index ed739088ddacb..af31630d483a4 100644 --- a/maps/castelnau/job/jobs_cargo.dm +++ b/maps/castelnau/job/jobs_cargo.dm @@ -6,7 +6,6 @@ spawn_positions = 2 supervisors = "the Chief Merchant" economic_power = 8 - minimal_player_age = 7 ideal_character_age = 35 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/cargo @@ -60,4 +59,4 @@ access_castelnau_bixie, access_castelnau_bixie_helm, - access_castelnau_hangar) \ No newline at end of file + access_castelnau_hangar) diff --git a/maps/castelnau/job/jobs_command.dm b/maps/castelnau/job/jobs_command.dm index eeb7d45581936..6ad4aa0a58c01 100644 --- a/maps/castelnau/job/jobs_command.dm +++ b/maps/castelnau/job/jobs_command.dm @@ -4,7 +4,7 @@ supervisors = "the Regulator High Command and the God (He didn't answer last time)" department_flag = COM head_position = 1 - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 15 ideal_character_age = 50 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/captain @@ -73,7 +73,7 @@ total_positions = 1 spawn_positions = 1 req_admin_notify = 1 - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 8 ideal_character_age = 45 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/hop @@ -185,6 +185,7 @@ head_position = 1 total_positions = 1 spawn_positions = 1 + minimal_player_age = 21 economic_power = 8 outfit_type = /decl/hierarchy/outfit/job/castelnau/gov/com/emissary selection_color = "#304582" @@ -229,6 +230,7 @@ supervisors = "the Galactic Security Corps" selection_color = "#304582" economic_power = 8 + minimal_player_age = 21 minimum_character_age = list(SPECIES_HUMAN = 35) outfit_type = /decl/hierarchy/outfit/job/castelnau/gov/com/commissary allowed_branches = list( @@ -281,4 +283,4 @@ /datum/computer_file/program/reports) /datum/job/sea/get_description_blurb() - return "-" \ No newline at end of file + return "-" diff --git a/maps/castelnau/job/jobs_engineering.dm b/maps/castelnau/job/jobs_engineering.dm index fcc8f87d8debb..6072dbb72665f 100644 --- a/maps/castelnau/job/jobs_engineering.dm +++ b/maps/castelnau/job/jobs_engineering.dm @@ -8,7 +8,7 @@ total_positions = 1 spawn_positions = 1 economic_power = 6 - minimal_player_age = 14 + minimal_player_age = 7 ideal_character_age = 34 allowed_branches = list(/datum/mil_branch/reg, /datum/mil_branch/mil) @@ -66,7 +66,6 @@ total_positions = 2 spawn_positions = 2 - minimal_player_age = 7 ideal_character_age = 25 economic_power = 4 @@ -129,7 +128,6 @@ total_positions = 1 spawn_positions = 1 - minimal_player_age = 7 ideal_character_age = 25 economic_power = 4 give_psionic_implant_on_join = FALSE @@ -187,6 +185,7 @@ department_flag = ENG total_positions = 2 spawn_positions = 2 + minimal_player_age = 7 supervisors = "the Senior Engineer" alt_titles = list( "Biomechanical Engineer") @@ -222,4 +221,4 @@ access_castelnau_external_airlocks ) - skill_points = 25 \ No newline at end of file + skill_points = 25 diff --git a/maps/castelnau/job/jobs_evaguys.dm b/maps/castelnau/job/jobs_evaguys.dm index 6fabd1e2d04ae..524b5488ba6b8 100644 --- a/maps/castelnau/job/jobs_evaguys.dm +++ b/maps/castelnau/job/jobs_evaguys.dm @@ -6,7 +6,7 @@ total_positions = 1 spawn_positions = 1 economic_power = 6 - minimal_player_age = 0 + minimal_player_age = 7 selection_color = "#4f3230" minimum_character_age = list(SPECIES_HUMAN = 24) allowed_branches = list( @@ -46,6 +46,7 @@ department_flag = COM total_positions = 1 spawn_positions = 1 + minimal_player_age = 14 supervisors = "the Captain and the Coordinator" selection_color = "#2f2f7f" economic_power = 9 @@ -228,6 +229,7 @@ department_flag = SEC total_positions = 1 spawn_positions = 1 + minimal_player_age = 14 supervisors = "the Coordinator" selection_color = "#c63939" skill_points = 20 @@ -298,4 +300,4 @@ access_castelnau_external_airlocks, access_castelnau_perseus, - access_castelnau_perseus_helm) \ No newline at end of file + access_castelnau_perseus_helm) diff --git a/maps/castelnau/job/jobs_medical.dm b/maps/castelnau/job/jobs_medical.dm index 9717ef7c9d200..daee7d0cbf199 100644 --- a/maps/castelnau/job/jobs_medical.dm +++ b/maps/castelnau/job/jobs_medical.dm @@ -3,7 +3,7 @@ department = "Medical" department_flag = MED - minimal_player_age = 14 + minimal_player_age = 7 ideal_character_age = 45 total_positions = 1 spawn_positions = 1 diff --git a/maps/castelnau/job/jobs_merchants.dm b/maps/castelnau/job/jobs_merchants.dm index db3266e6847f9..d78e12b58c069 100644 --- a/maps/castelnau/job/jobs_merchants.dm +++ b/maps/castelnau/job/jobs_merchants.dm @@ -5,7 +5,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the invisible hand of the market" - minimal_player_age = 21 + minimal_player_age = 14 economic_power = 18 selection_color = "#4f3e30" allowed_branches = list( @@ -48,7 +48,7 @@ total_positions = 1 spawn_positions = 1 supervisors = "the Chief Merchant" - minimal_player_age = 21 + minimal_player_age = 7 economic_power = 10 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/merchant @@ -81,7 +81,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the FTU merchants" - minimal_player_age = 22 economic_power = 6 selection_color = "#755c48" outfit_type = /decl/hierarchy/outfit/job/cheapskate/security diff --git a/maps/castelnau/job/jobs_security.dm b/maps/castelnau/job/jobs_security.dm index 102c421e9f982..cc321c4848f75 100644 --- a/maps/castelnau/job/jobs_security.dm +++ b/maps/castelnau/job/jobs_security.dm @@ -6,7 +6,7 @@ spawn_positions = 1 supervisors = "the Captain, the First Mate and the Coordinator" economic_power = 8 - minimal_player_age = 22 + minimal_player_age = 14 ideal_character_age = 35 outfit_type = /decl/hierarchy/outfit/job/castelnau/reg/com/sheriff allowed_branches = list(/datum/mil_branch/reg) @@ -54,7 +54,7 @@ supervisors = "the Sheriff" selection_color = "#9e2e2e" economic_power = 6 - minimal_player_age = 20 + minimal_player_age = 7 ideal_character_age = 25 skill_points = 20 @@ -96,7 +96,7 @@ supervisors = "the Sheriff" selection_color = "#9e2e2e" economic_power = 6 - minimal_player_age = 20 + minimal_player_age = 7 ideal_character_age = 25 give_psionic_implant_on_join = FALSE skill_points = 20