diff --git a/code/game/jobs/job/outsider/merchant.dm b/code/game/jobs/job/outsider/merchant.dm index 15c1d26ae8d..7dfbaf4de56 100644 --- a/code/game/jobs/job/outsider/merchant.dm +++ b/code/game/jobs/job/outsider/merchant.dm @@ -34,14 +34,55 @@ name = "Merchant" jobtype = /datum/job/merchant - uniform =/obj/item/clothing/under/color/grey - shoes = /obj/item/clothing/shoes/brown + uniform =/obj/item/clothing/under/suit_jacket/charcoal + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/that id = /obj/item/card/id/merchant pda = /obj/item/device/pda/merchant r_pocket = /obj/item/device/price_scanner -/datum/outfit/job/merchant/assistant +/datum/outfit/merchant_assistant name = "Merchant's Assistant" + id = /obj/item/card/id/merchant + pda = /obj/item/device/pda/merchant + r_pocket = /obj/item/device/price_scanner + belt = /obj/item/storage/belt/utility/full + uniform = list( + /obj/item/clothing/under/det/black, + /obj/item/clothing/under/suit_jacket/charcoal, + /obj/item/clothing/under/suit_jacket/tan, + /obj/item/clothing/under/assistantformal, + /obj/item/clothing/under/blazer + ) + shoes = list( + /obj/item/clothing/shoes/leather, + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/workboots, + /obj/item/clothing/shoes/black, + /obj/item/clothing/shoes/cowboy + ) + head = list( + /obj/item/clothing/head/fez, + /obj/item/clothing/head/flatcap, + /obj/item/clothing/head/cowboy, + /obj/item/clothing/head/turban/grey, + /obj/item/clothing/head/ushanka + ) + suit = list( + /obj/item/clothing/suit/storage/toggle/bomber, + /obj/item/clothing/suit/storage/toggle/leather_jacket/designer, + /obj/item/clothing/suit/storage/toggle/leather_jacket/flight/green, + /obj/item/clothing/suit/storage/toggle/trench, + /obj/item/clothing/suit/storage/hooded/wintercoat + ) + back = /obj/item/storage/backpack/satchel + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/storage/wallet/random = 1 + ) -/datum/outfit/job/merchant/assistant/get_id_rank(mob/living/carbon/human/H) - return "Merchant's Assistant" \ No newline at end of file +/datum/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H) + return "Merchant's Assistant" + +/datum/outfit/merchant_assistant/get_id_access() + return list(access_merchant) \ No newline at end of file diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index f3d1205dd08..19a9ae16f01 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -411,6 +411,7 @@ /obj/random/voidsuit name = "random voidsuit" var/damaged = 0 + var/for_vox = FALSE var/list/suitmap = list( /obj/item/clothing/suit/space/void = /obj/item/clothing/head/helmet/space/void, /obj/item/clothing/suit/space/void/engineering = /obj/item/clothing/head/helmet/space/void/engineering, @@ -419,7 +420,13 @@ /obj/item/clothing/suit/space/void/security = /obj/item/clothing/head/helmet/space/void/security, /obj/item/clothing/suit/space/void/atmos = /obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/suit/space/void/merc = /obj/item/clothing/head/helmet/space/void/merc, - /obj/item/clothing/suit/space/void/captain = /obj/item/clothing/head/helmet/space/void/captain + /obj/item/clothing/suit/space/void/captain = /obj/item/clothing/head/helmet/space/void/captain, + /obj/item/clothing/suit/space/void/cruiser = /obj/item/clothing/head/helmet/space/void/cruiser, + /obj/item/clothing/suit/space/void/frontier = /obj/item/clothing/head/helmet/space/void/frontier, + /obj/item/clothing/suit/space/void/hos = /obj/item/clothing/head/helmet/space/void/hos, + /obj/item/clothing/suit/space/void/lancer = /obj/item/clothing/head/helmet/space/void/lancer, + /obj/item/clothing/suit/space/void/sci = /obj/item/clothing/head/helmet/space/void/sci, + /obj/item/clothing/suit/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol ) problist = list( /obj/item/clothing/suit/space/void = 2, @@ -429,7 +436,13 @@ /obj/item/clothing/suit/space/void/security = 1, /obj/item/clothing/suit/space/void/atmos = 1.5, /obj/item/clothing/suit/space/void/merc = 0.5, - /obj/item/clothing/suit/space/void/captain = 0.3 + /obj/item/clothing/suit/space/void/captain = 0.3, + /obj/item/clothing/suit/space/void/cruiser = 0.5, + /obj/item/clothing/suit/space/void/frontier = 1, + /obj/item/clothing/suit/space/void/hos = 0.3, + /obj/item/clothing/suit/space/void/lancer = 0.3, + /obj/item/clothing/suit/space/void/sci = 2, + /obj/item/clothing/suit/space/void/sol = 0.5 ) has_postspawn = TRUE @@ -437,16 +450,36 @@ damaged = _damaged . = ..(mapload) -/obj/random/voidsuit/post_spawn(obj/item/clothing/suit/space/void/suit) +/obj/random/voidsuit/post_spawn(obj/item/clothing/suit/space/suit) var/helmet = suitmap[suit.type] if (helmet) new helmet(loc) else log_debug("random_obj (voidsuit): Type [suit.type] was unable to spawn a matching helmet!") - new /obj/item/clothing/shoes/magboots(loc) + if(!for_vox) + new /obj/item/clothing/shoes/magboots(loc) + else + new /obj/item/clothing/shoes/magboots/vox(loc) + new /obj/item/clothing/gloves/yellow/vox(loc) if (damaged && prob(60)) suit.create_breaches(pick(BRUTE, BURN), rand(1, 5)) +/obj/random/voidsuit/vox + name = "random vox voidsuit" + for_vox = TRUE + suitmap = list( + /obj/item/clothing/suit/space/vox/carapace = /obj/item/clothing/head/helmet/space/vox/carapace, + /obj/item/clothing/suit/space/vox/medic = /obj/item/clothing/head/helmet/space/vox/medic, + /obj/item/clothing/suit/space/vox/pressure = /obj/item/clothing/head/helmet/space/vox/pressure, + /obj/item/clothing/suit/space/vox/stealth = /obj/item/clothing/head/helmet/space/vox/stealth + ) + problist = list( + /obj/item/clothing/suit/space/vox/carapace = 1, + /obj/item/clothing/suit/space/vox/medic = 1, + /obj/item/clothing/suit/space/vox/pressure = 1, + /obj/item/clothing/suit/space/vox/stealth = 1 + ) + /obj/random/vendor name = "random vendor" var/depleted = 0 diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index d5d53f98158..351d8f2b028 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -676,14 +676,13 @@ "trashcart" = "trashcartopen", "critter" = "critteropen", "largemetal" = "largemetalopen", - "medicalcrate" = "medicalcrateopen" + "medicalcrate" = "medicalcrateopen", + "tcflcrate" = "tcflcrateopen" ) -/obj/structure/closet/crate/loot/Initialize(mapload, var/_rarity = 1, var/_quantity = 10) +/obj/structure/closet/crate/loot/Initialize(mapload) . = ..() - rarity = _rarity - quantity = _quantity spawntypes = list( "1" = STOCK_RARE_PROB * rarity, diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 4f87e2ebf2a..e14c650c72d 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -140,7 +140,7 @@ /obj/structure/mirror/merchant/attack_hand(var/mob/living/carbon/human/user) if(istype(get_area(src),/area/merchant_station)) - if(istype(user) && user.mind && user.mind.assigned_role == "Merchant" && user.species.name != "Vox") + if(istype(user) && user.mind && (user.mind.assigned_role == "Merchant" || user.mind.assigned_role == "Merchants Assistant") && user.species.name != "Vox") var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes") if(choice == "Yes") user.set_species("Vox") diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index d5d70690791..035e2a94b33 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -175,6 +175,10 @@ .=..() other.damage = damage +/turf/simulated/floor/copy_turf(turf/simulated/floor/other, ignore_air = FALSE) + .=..() + other.flooring = flooring + /turf/simulated/wall/shuttle/dark/corner/underlay/copy_turf(turf/simulated/wall/shuttle/dark/corner/underlay/other, ignore_air = FALSE) .=..() other.underlay_dir = underlay_dir diff --git a/code/modules/ghostroles/spawner/human/merchant.dm b/code/modules/ghostroles/spawner/human/merchant.dm index 83dfbc4a77f..a37c601134d 100644 --- a/code/modules/ghostroles/spawner/human/merchant.dm +++ b/code/modules/ghostroles/spawner/human/merchant.dm @@ -10,8 +10,8 @@ max_count = 1 //Vars related to human mobs - outfit = /datum/outfit/job/merchant/assistant - possible_species = list("Human","Skrell","Tajara","Unathi") + outfit = /datum/outfit/merchant_assistant + possible_species = list("Human", "Off-Worlder Human", "Tajara", "Tajara", "M'sai Tajara", "Zhan-Khazan Tajara", "Skrell", "Unathi", "Aut'akh Unathi", "Vaurca Warrior", "Vaurca Worker", "Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame", "Diona") possible_genders = list(MALE,FEMALE) allow_appearance_change = APPEARANCE_PLASTICSURGERY diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index 0ef1b0848cd..7db2a3c6544 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -82,7 +82,7 @@ return //if its a one-use spawner and it got used already, dont reset it else if(state == STATE_RECHARGING) STOP_PROCESSING(SSprocessing, src) - + state = STATE_UNAVAILABLE update_icon() @@ -121,4 +121,32 @@ anchored = 1 unacidable = 1 simulated = 1 - invisibility = 0 \ No newline at end of file + invisibility = 0 + +/obj/effect/ghostspawpoint/button + name = "button" + desc = "A button used for some kind of purpose." + icon = 'icons/obj/stationobjs.dmi' + icon_state = "doorctrl0" + + identifier = null + + icon_unavailable = "doorctrl0" + icon_available = "doorctrl-p" + icon_recharging = "doorctrl-p" + icon_used = "doorctrl-p" + + anchored = 1 + unacidable = 1 + simulated = 1 + invisibility = 0 + + var/use_message = "An assistant has been requested. One will be with you shortly if available." + var/message_used = FALSE + +/obj/effect/ghostspawpoint/button/set_available() + ..() + if(use_message && !message_used) + message_used = TRUE + visible_message(span("notice",use_message)) + playsound(src.loc, 'sound/machines/chime.ogg', 25, 1) \ No newline at end of file diff --git a/html/changelogs/Ferner-191201-mapping_merchant.yml b/html/changelogs/Ferner-191201-mapping_merchant.yml new file mode 100644 index 00000000000..28603702d6a --- /dev/null +++ b/html/changelogs/Ferner-191201-mapping_merchant.yml @@ -0,0 +1,5 @@ +author: Ferner +delete-after: True +changes: + - maptweak: "Remapped the merchant shuttle and outpost." + - tweak: "Merchant assistants can now be from a wider range of species." diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi index 024db3109af..e591ea94c8f 100644 Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ diff --git a/icons/obj/turrets.dmi b/icons/obj/turrets.dmi index 5cfb48d1eb7..abdc569060c 100644 Binary files a/icons/obj/turrets.dmi and b/icons/obj/turrets.dmi differ diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index 47cd1a9803f..d059a139a07 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm index f8738ed981a..c0aee1acbd2 100644 --- a/maps/_common/areas/shuttles.dm +++ b/maps/_common/areas/shuttles.dm @@ -264,3 +264,23 @@ base_turf = /turf/space/transit/east icon_state = "shuttle" centcomm_area = 1 + +/area/shuttle/merchant + name = "\improper Merchant Ship" + flags = RAD_SHIELDED | SPAWN_ROOF + base_turf = /turf/space + icon_state = "yellow" + sound_env = LARGE_ENCLOSED + +/area/shuttle/merchant/start + centcomm_area = 1 + +/area/shuttle/merchant/transit + name = "\improper Hyperspace" + centcomm_area = 1 + base_turf = /turf/space/transit/east + +/area/shuttle/merchant/station + name = "\improper Merchant Docking Port" + base_turf = /turf/unsimulated/floor/asteroid/ash + station_area = 1 \ No newline at end of file diff --git a/maps/_common/areas/special.dm b/maps/_common/areas/special.dm index 9d588f7b177..2c6694eab79 100644 --- a/maps/_common/areas/special.dm +++ b/maps/_common/areas/special.dm @@ -246,6 +246,10 @@ no_light_control = 1 centcomm_area = 1 +/area/merchant_station/warehouse + name = "\improper Merchant Warehouse" + icon_state = "merchant_ware" + /area/merchant_station/transit name = "\improper Hyperspace" icon_state = "shuttle" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index b015b4ac0ba..8b35712d852 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -6232,7 +6232,7 @@ /turf/simulated/floor/shuttle/dark_red, /area/syndicate_station/start) "aoY" = ( -/turf/simulated/wall, +/turf/unsimulated/wall/steel, /area/merchant_station) "aoZ" = ( /obj/structure/table/standard, @@ -6288,35 +6288,34 @@ }, /turf/simulated/floor/shuttle/dark_red, /area/syndicate_station/start) -"apf" = ( -/obj/structure/closet/crate/loot, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apg" = ( -/obj/machinery/autolathe{ - desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; - hacked = 1; - name = "Unlocked Autolathe" - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aph" = ( -/obj/structure/table/rack, -/obj/item/storage/toolbox/electrical, -/obj/item/storage/toolbox/mechanical, -/obj/item/storage/belt/utility, -/turf/simulated/floor/tiled, -/area/merchant_station) "api" = ( -/obj/structure/cryofeed, -/turf/simulated/floor/tiled, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/item/storage/firstaid/o2{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/obj/item/storage/firstaid/toxin{ + layer = 3.1; + pixel_x = 1; + pixel_y = 1 + }, +/turf/simulated/floor/tiled/white, /area/merchant_station) "apj" = ( -/obj/machinery/cryopod{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/merchant_station) "apk" = ( /turf/unsimulated/floor{ @@ -6334,13 +6333,6 @@ icon_state = "wood_siding10" }, /area/centcom/control) -"apl" = ( -/obj/machinery/sleeper{ - icon_state = "sleeper_0"; - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) "apm" = ( /obj/structure/table/standard, /obj/item/cautery, @@ -6381,44 +6373,67 @@ /obj/machinery/teleport/hub, /turf/simulated/floor/shuttle/dark_red, /area/syndicate_station/start) -"aps" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) "apt" = ( /turf/simulated/floor/tiled, /area/merchant_station) "apu" = ( -/obj/structure/closet/wardrobe/suit, -/obj/random/backpack, -/obj/random/colored_jumpsuit, +/obj/structure/closet/wardrobe{ + name = "vox apparel" + }, +/obj/item/clothing/under/vox/vox_robes, +/obj/item/clothing/under/vox/vox_casual, +/obj/random/voidsuit/vox, +/obj/random/voidsuit/vox, /turf/simulated/floor/wood, /area/merchant_station) "apv" = ( -/obj/structure/mirror/merchant{ - pixel_y = 32 +/obj/effect/floor_decal/corner/red/diagonal, +/obj/machinery/vending/boozeomat{ + products = list(/obj/item/reagent_containers/food/drinks/drinkingglass = 12, /obj/item/reagent_containers/food/drinks/ice = 12, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 6, /obj/item/reagent_containers/food/drinks/bottle/tequilla = 6, /obj/item/reagent_containers/food/drinks/bottle/champagne = 2, /obj/item/reagent_containers/food/drinks/bottle/vodka = 6, /obj/item/reagent_containers/food/drinks/bottle/rum = 6, /obj/item/reagent_containers/food/drinks/bottle/wine = 6, /obj/item/reagent_containers/food/drinks/bottle/cognac = 6, /obj/item/reagent_containers/food/drinks/bottle/victorygin = 6, /obj/item/reagent_containers/food/drinks/bottle/boukha = 6, /obj/item/reagent_containers/food/drinks/bottle/small/beer = 12, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 6, /obj/item/reagent_containers/food/drinks/bottle/brandy = 6, /obj/item/reagent_containers/food/drinks/bottle/sarezhiwine = 6); + random_itemcount = 1; + req_access = list(); + restock_items = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled, /area/merchant_station) "apw" = ( -/obj/machinery/vending/wallmed1{ - pixel_y = 32 +/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/standard, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1"; + layer = 2.9; + name = "adjusted light fixture" }, -/turf/simulated/floor/wood, +/obj/item/pizzabox/vegetable{ + pixel_y = 12 + }, +/turf/simulated/floor/tiled, /area/merchant_station) "apx" = ( -/obj/structure/bed/padded, -/obj/item/bedsheet/brown, -/obj/structure/curtain/open/bed, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/bar_soft/full{ + pixel_x = 1; + pixel_y = 6 + }, +/obj/effect/floor_decal/spline/plain{ + icon_state = "spline_plain"; + dir = 4 + }, +/turf/simulated/floor/tiled, /area/merchant_station) "apy" = ( /obj/structure/table/reinforced, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 1; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/white, /area/merchant_station) "apz" = ( /obj/structure/shuttle/engine/propulsion{ @@ -6436,125 +6451,101 @@ }, /turf/simulated/floor/plating, /area/syndicate_station/start) -"apC" = ( -/obj/machinery/suit_cycler{ - req_access = list(110) - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apD" = ( -/obj/structure/table/rack, -/obj/item/stack/material/steel{ - amount = 50 - }, -/obj/item/stack/material/glass{ - amount = 50 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apE" = ( -/obj/structure/table/rack, -/obj/random/voidsuit, -/turf/simulated/floor/tiled, -/area/merchant_station) "apF" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/item/tank/air, -/obj/item/tank/air, +/obj/structure/toilet{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 9 + }, /turf/simulated/floor/tiled, /area/merchant_station) "apG" = ( -/obj/structure/table/wood, -/obj/item/storage/fancy/cigar, -/obj/item/flame/lighter/zippo, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/silver{ + name = "Washroom" + }, +/turf/simulated/floor/tiled, /area/merchant_station) "apH" = ( -/obj/machinery/light/small{ - brightness_color = "#DA0205"; - brightness_power = 1; - brightness_range = 5; - name = "adjusted light fixture" - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/red/diagonal, +/turf/simulated/floor/tiled, /area/merchant_station) "apI" = ( /turf/simulated/floor/wood, /area/merchant_station) "apJ" = ( -/obj/structure/table/wood, -/obj/item/device/flashlight/lamp, -/obj/random/plushie, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/spline/plain{ + icon_state = "spline_plain"; + dir = 4 + }, +/obj/structure/table/standard, +/obj/item/storage/fancy/donut{ + pixel_x = 0; + pixel_y = 8 + }, +/turf/simulated/floor/tiled, /area/merchant_station) "apK" = ( /obj/machinery/door/airlock/glass{ - hashatch = 0; - name = "Cryo Storage"; - req_access = list(110) + name = "Infirmary" }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apL" = ( -/obj/effect/floor_decal/industrial/loading, -/obj/machinery/door/airlock/hatch{ - name = "Warehouse"; - req_access = list(110) +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/merchant_station) "apM" = ( -/obj/machinery/door/airlock/hatch{ - name = "Dormitories" - }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled, /area/merchant_station) "apN" = ( -/obj/structure/flora/pottedplant, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apO" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apP" = ( -/obj/structure/noticeboard{ - pixel_x = 0; - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apQ" = ( -/obj/structure/closet/secure_closet/merchant, /obj/structure/sign/poster{ pixel_x = 0; - pixel_y = 32; - poster_type = "/datum/poster/bay_15" + pixel_y = 32 }, -/turf/simulated/floor/tiled, +/obj/structure/table/wood, +/turf/simulated/floor/lino, +/area/merchant_station) +"apO" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/sign/poster{ + pixel_x = 0; + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/merchant_station) +"apP" = ( +/obj/structure/sign/greencross{ + name = "Infirmary"; + pixel_x = 0; + pixel_y = 32 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/machinery/media/jukebox, +/turf/simulated/floor/lino, /area/merchant_station) "apR" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apS" = ( -/obj/machinery/vending/coffee, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apT" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled, -/area/merchant_station) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/conveyor{ + id = "merchant_shipping" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "apU" = ( /turf/unsimulated/wall/riveted, /area/centcom) @@ -6568,74 +6559,15 @@ /turf/unsimulated/wall/riveted, /area/centcom/living) "apX" = ( -/obj/machinery/merchant_pad, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apY" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) +"aqb" = ( /obj/machinery/door/airlock/glass{ - hashatch = 0; - name = "Operations Office"; + name = "Lounge"; req_access = list(110) }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"apZ" = ( -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 1 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 9 - }, -/turf/simulated/floor/carpet, -/area/merchant_station) -"aqa" = ( -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark{ - name = "LateJoinMerchant" - }, -/obj/effect/landmark/start{ - name = "Merchant" - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/merchant_station) -"aqb" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 1 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 5 - }, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/gun/energy/pistol, -/turf/simulated/floor/carpet, -/area/merchant_station) -"aqc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/lino, /area/merchant_station) "aqd" = ( /turf/unsimulated/floor{ @@ -6662,56 +6594,30 @@ }, /area/centcom/living) "aqh" = ( -/obj/item/modular_computer/console/preset/merchant, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqi" = ( -/obj/machinery/vending/cigarette, -/turf/simulated/floor/tiled, -/area/merchant_station) +/obj/structure/reagent_dispensers/lube, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "aqj" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 4 +/obj/machinery/autolathe{ + desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; + hacked = 1; + name = "Unlocked Autolathe" }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqk" = ( -/obj/structure/table/wood, -/obj/item/material/ashtray/bronze, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aql" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 +/obj/machinery/light/small{ + dir = 4; + name = "old light fixture"; + pixel_y = -8 }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqm" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled, -/area/merchant_station) +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "aqn" = ( -/obj/structure/coatrack, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/lino, /area/merchant_station) "aqo" = ( -/obj/machinery/computer/shuttle_control/merchant, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqp" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen/multi, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 8 - }, -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 10 - }, -/turf/simulated/floor/carpet, +/obj/item/material/ashtray/bronze, +/obj/structure/table/wood, +/turf/simulated/floor/lino, /area/merchant_station) "aqq" = ( /obj/structure/closet/crate/freezer/rations, @@ -6720,31 +6626,6 @@ /obj/item/reagent_containers/food/drinks/cans/waterbottle, /turf/simulated/floor/shuttle/yellow, /area/shuttle/administration/centcom) -"aqr" = ( -/obj/structure/table/reinforced, -/obj/item/device/flashlight/lamp, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 4 - }, -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 6 - }, -/turf/simulated/floor/carpet, -/area/merchant_station) -"aqs" = ( -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/template_noop, -/area/merchant_station) "aqt" = ( /turf/unsimulated/floor{ name = "plating" @@ -6753,63 +6634,13 @@ "aqu" = ( /turf/unsimulated/floor, /area/centcom/living) -"aqv" = ( -/obj/structure/table/reinforced, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/obj/item/spacecash/c1000, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/merchant_station) -"aqx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/merchant_station) -"aqy" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/turf/simulated/floor/plating, -/area/merchant_station) "aqz" = ( /obj/structure/grille, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/merchant_station) -"aqA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, /obj/structure/window/reinforced{ icon_state = "rwindow"; - dir = 4 + dir = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/merchant_station) "aqB" = ( @@ -6880,30 +6711,18 @@ dir = 6 }, /area/centcom/living) -"aqO" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 +"aqR" = ( +/obj/structure/grille, +/obj/machinery/door/blast/shutters/open{ + dir = 1; + id = "merchant_blast"; + name = "blast shield" }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqP" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 32; - pixel_y = 0 - }, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aqQ" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion_l"; - dir = 8 +/obj/structure/window/shuttle{ + maxhealth = 100 }, /turf/simulated/floor/plating, -/area/merchant_ship/start) -"aqR" = ( -/turf/simulated/wall/shuttle, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "aqS" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/fire, @@ -6939,10 +6758,12 @@ }, /area/centcom/living) "aqY" = ( -/obj/structure/window/shuttle, -/obj/structure/grille, +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, /turf/simulated/floor/plating, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "aqZ" = ( /obj/machinery/light, /obj/machinery/embedded_controller/radio/simple_docking_controller{ @@ -6977,16 +6798,6 @@ icon_state = "floor" }, /area/centcom/living) -"ard" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "merchant_station"; - pixel_x = 0; - pixel_y = 32; - tag_door = "merchant_station_door" - }, -/turf/simulated/floor/tiled, -/area/merchant_station) "are" = ( /obj/structure/window/reinforced{ dir = 8 @@ -7001,88 +6812,34 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/merchant_station) -"arf" = ( -/obj/structure/flora/pottedplant, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/merchant_station/warehouse) "arg" = ( -/obj/structure/table/rack, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/southleft{ - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/obj/structure/bed/chair/office/dark, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) "arh" = ( -/obj/structure/table/rack, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/southright{ - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"ari" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/machinery/door/window/southleft{ - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arj" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/structure/table/standard, -/obj/machinery/door/window/southleft{ - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/obj/machinery/door/window/eastright, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "ark" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door/window/southright{ - name = "display case"; +/obj/machinery/turretid{ + check_anomalies = 0; + check_arrest = 0; + check_records = 0; + name = "merchant turret control panel"; + pixel_x = -27; + pixel_y = 6; req_access = list(110) }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/obj/structure/closet/secure_closet/merchant, +/obj/item/hand_labeler, +/obj/item/stack/packageWrap, +/obj/item/device/price_scanner, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) "arl" = ( /obj/machinery/light{ dir = 8; @@ -7169,96 +6926,32 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/merchant_station) +/area/merchant_station/warehouse) "arx" = ( /obj/structure/lattice, /obj/structure/window/reinforced, /turf/template_noop, /area/template_noop) -"ary" = ( -/obj/structure/sign/vacuum{ - pixel_y = 32 +"arz" = ( +/obj/machinery/atm{ + pixel_y = 28 }, /turf/simulated/floor/plating, -/area/merchant_ship/start) -"arz" = ( -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "arA" = ( -/obj/machinery/door/window/westleft{ - req_access = list(110) - }, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arB" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arC" = ( -/obj/structure/closet/secure_closet/merchant, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arD" = ( -/obj/machinery/vending/wallmed1{ - pixel_y = 32 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "merchant_shuttle"; - pixel_x = -32; - pixel_y = 0; - tag_door = "merchant_shuttle_hatch" - }, -/turf/simulated/floor/wood, -/area/merchant_ship/start) -"arE" = ( -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 1 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 9 - }, -/obj/item/storage/secure/safe{ - pixel_x = 5; - pixel_y = 32 - }, -/obj/structure/table/reinforced, -/obj/item/hand_labeler, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) -"arF" = ( -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 1 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 4 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; dir = 5 }, -/obj/structure/table/reinforced, -/obj/item/storage/wallet, -/obj/machinery/light{ - icon_state = "tube1"; +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) +"arF" = ( +/obj/effect/floor_decal/corner/yellow/full{ + icon_state = "corner_white_full"; dir = 1 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 32 - }, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "arG" = ( /obj/machinery/door/airlock/centcom{ name = "Administration Shuttle Cockpit" @@ -7293,20 +6986,6 @@ dir = 8 }, /area/centcom/living) -"arL" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "merchant_station_door"; - locked = 1; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/loading{ - dir = 8; - icon_state = "loadingarea" - }, -/turf/simulated/floor/tiled, -/area/merchant_station) "arM" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -7316,77 +6995,31 @@ req_access = list(110) }, /turf/simulated/floor/tiled, -/area/merchant_station) -"arN" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "merchant_shuttle_hatch"; - name = "Ship External Access"; - req_access = list(110) - }, -/turf/simulated/floor/plating, -/area/merchant_ship/start) -"arO" = ( -/turf/simulated/floor/plating, -/area/merchant_ship/start) -"arP" = ( -/obj/machinery/door/airlock/external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "merchant_shuttle_hatch"; - name = "Ship External Access"; - req_access = list(110) - }, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/merchant_station/warehouse) "arQ" = ( -/obj/structure/table/rack, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arR" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/paper_bin, -/obj/item/pen/multi, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arS" = ( -/obj/effect/floor_decal/plaque, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arT" = ( -/obj/machinery/door/airlock/silver{ - hashatch = 0; - name = "Bridge"; +/obj/machinery/door/airlock/external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "merchant_shuttle_hatch"; + name = "Ship External Access"; req_access = list(110) }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) +"arR" = ( /turf/simulated/floor/tiled, -/area/merchant_ship/start) -"arU" = ( -/turf/simulated/floor/wood, -/area/merchant_ship/start) -"arV" = ( -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 8 - }, -/obj/structure/bed/chair/office/bridge{ - dir = 4 - }, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "arW" = ( -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 4 +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; + dir = 6 }, -/obj/machinery/computer/shuttle_control/merchant, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "arX" = ( /obj/structure/bed/chair{ dir = 8 @@ -7460,45 +7093,13 @@ }, /turf/template_noop, /area/template_noop) -"asg" = ( -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/merchant_ship/start) "ash" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/westleft{ - req_access = list(110) - }, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"asi" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"asj" = ( -/obj/structure/closet/secure_closet/merchant, -/turf/simulated/floor/wood, -/area/merchant_ship/start) -"ask" = ( -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 8 - }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; dir = 10 }, -/obj/structure/table/reinforced, -/obj/random/coin, -/obj/item/device/radio/intercom{ - pixel_y = -32 - }, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "asl" = ( /obj/structure/table/rack, /obj/item/gun/energy/sniperrifle, @@ -7543,108 +7144,46 @@ /obj/effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/floor, /area/centcom/living) -"asr" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/merchant_station) -"ass" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/merchant_station) -"ast" = ( -/obj/machinery/light, -/obj/structure/flora/pottedplant, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) "asu" = ( -/obj/structure/table/rack, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window{ - dir = 1; - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"asv" = ( -/obj/structure/table/rack, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 4 - }, -/obj/machinery/door/window/northright{ - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) -"asw" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, -/obj/machinery/door/window{ - dir = 1; - name = "display case"; - req_access = list(110) +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 10 }, /turf/simulated/floor/tiled, -/area/merchant_ship/start) -"asx" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/closet/crate, -/obj/machinery/door/window{ - dir = 1; - name = "display case"; - req_access = list(110) - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "asy" = ( /obj/structure/window/reinforced{ - dir = 4 + dir = 8 }, -/obj/machinery/light, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, -/obj/machinery/door/window/northright{ - name = "display case"; - req_access = list(110) +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_y = 16 }, +/obj/machinery/vending/coffee{ + name = "Free Hot Drinks machine"; + prices = list(); + products = list(/obj/item/reagent_containers/food/drinks/coffee = 12, /obj/item/reagent_containers/food/drinks/tea = 8, /obj/item/reagent_containers/food/drinks/h_chocolate = 8, /obj/item/reagent_containers/food/snacks/donut/normal = 6); + random_itemcount = 0 + }, +/obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "asz" = ( -/obj/structure/table/rack, /obj/structure/window/reinforced{ + icon_state = "rwindow"; dir = 4 }, -/obj/machinery/door/window/northright{ - name = "display case"; - req_access = list(110) +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue/full{ + icon_state = "corner_white_full"; + dir = 4 }, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/merchant_ship/start) +/area/shuttle/merchant/start) "asA" = ( /obj/structure/table/rack, /obj/item/gun/energy/rifle/ionrifle, @@ -7685,13 +7224,6 @@ icon_state = "wood" }, /area/centcom/living) -"asG" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" - }, -/turf/simulated/floor/plating, -/area/merchant_ship/start) "asH" = ( /obj/structure/table/standard, /obj/item/storage/firstaid/fire, @@ -20823,35 +20355,13 @@ dir = 6 }, /area/syndicate_station/start) -"aVx" = ( -/turf/unsimulated/floor/asteroid/ash, -/area/template_noop) -"aVy" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/unsimulated/floor/asteroid/ash, -/area/merchant_station) "aVz" = ( -/obj/effect/floor_decal/carpet, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; +/obj/effect/floor_decal/corner/yellow/full{ + icon_state = "corner_white_full"; dir = 4 }, -/obj/effect/floor_decal/carpet{ - icon_state = "carpet_edges"; - dir = 6 - }, -/obj/structure/table/reinforced, -/obj/machinery/light, -/obj/item/storage/secure/briefcase, -/obj/item/device/price_scanner, -/turf/simulated/floor/carpet, -/area/merchant_ship/start) -"aVA" = ( -/obj/machinery/light/small, -/turf/unsimulated/floor/asteroid/ash, -/area/merchant_station) +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "aVB" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -21821,24 +21331,21 @@ "aXT" = ( /turf/unsimulated/wall/fakeglass, /area/centcom/shared_dream) -"aXU" = ( -/obj/structure/reagent_dispensers/lube, -/turf/simulated/floor/tiled, -/area/merchant_station) -"aXV" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled, -/area/merchant_station) "aXW" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/lino, /area/merchant_station) "aXX" = ( -/obj/structure/table/reinforced, -/obj/item/folder/blue, -/obj/effect/floor_decal/carpet, -/obj/item/storage/box/cups, -/turf/simulated/floor/carpet, +/obj/machinery/vending/cigarette{ + name = "Cigarette Machine"; + pixel_x = 2; + premium = list(); + prices = list(); + products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/fancy/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5) + }, +/turf/simulated/floor/lino, /area/merchant_station) "aXY" = ( /obj/effect/decal{ @@ -22372,6 +21879,18 @@ "aZA" = ( /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"aZX" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station) "bbL" = ( /obj/machinery/computer/shuttle_control/legion, /turf/simulated/floor/shuttle/black, @@ -22489,6 +22008,22 @@ dir = 5 }, /area/centcom/evac) +"bmV" = ( +/obj/structure/cryofeed, +/turf/simulated/floor/tiled/dark, +/area/merchant_station) +"bpO" = ( +/obj/structure/grille, +/obj/machinery/door/blast/shutters/open{ + dir = 4; + id = "merchant_blast"; + name = "blast shield" + }, +/obj/structure/window/shuttle{ + maxhealth = 100 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "bpY" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/floor_decal/industrial/outline/yellow, @@ -22507,6 +22042,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/wall/shuttle, /area/centcom/legion) +"bsu" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/spline/plain, +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) "bvb" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -22579,6 +22122,34 @@ "bEh" = ( /turf/space/transit/east/shuttlespace_ew1, /area/shuttle/distress/transit) +"bKL" = ( +/obj/item/stack/material/marble{ + amount = 30 + }, +/obj/item/stack/material/wood{ + amount = 50 + }, +/obj/item/stack/material/plastic{ + amount = 50 + }, +/obj/item/stack/material/glass{ + amount = 50 + }, +/obj/item/stack/material/glass{ + amount = 50 + }, +/obj/item/stack/material/steel{ + amount = 50 + }, +/obj/item/stack/material/steel{ + amount = 50 + }, +/obj/structure/closet{ + name = "materials" + }, +/obj/item/device/floor_painter, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "bLO" = ( /obj/effect/decal/fake_object{ desc = "A button. It's unpowered. Typical."; @@ -22611,6 +22182,13 @@ icon_state = "carpet10-8" }, /area/centcom/legion/hangar5) +"bTT" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "bUf" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ icon_state = "burst_l"; @@ -22655,6 +22233,12 @@ "bWA" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion) +"cal" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen/multi, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "ccJ" = ( /turf/space/transit/east/shuttlespace_ew12, /area/shuttle/legion/transit) @@ -22700,6 +22284,15 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"cjR" = ( +/obj/structure/table/reinforced, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 2 + }, +/obj/item/storage/wallet/random, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "ckG" = ( /obj/structure/sign/christmas/lights, /turf/unsimulated/floor{ @@ -22726,6 +22319,33 @@ }, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion) +"cpq" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_y = 16 + }, +/obj/effect/decal/fake_object{ + density = 0; + desc = "A conveyor belt."; + dir = 1; + icon = 'icons/obj/recycling.dmi'; + icon_state = "conveyor0"; + layer = 3; + name = "conveyor belt"; + pixel_x = 1; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "cpE" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/table/rack, @@ -22791,6 +22411,17 @@ icon_state = "steel_dirty" }, /area/centcom/legion/hangar5) +"crO" = ( +/turf/unsimulated/wall/steel, +/area/merchant_station/warehouse) +"cti" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/effect/floor_decal/spline/plain, +/obj/machinery/vending/dinnerware{ + random_itemcount = 1 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) "ctI" = ( /obj/structure/bed/chair/shuttle{ icon_state = "shuttlechair"; @@ -22819,6 +22450,20 @@ name = "plating" }, /area/centcom/legion/hangar5) +"cxK" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "cyN" = ( /obj/effect/floor_decal/corner/blue/full{ icon_state = "corner_white_full"; @@ -22839,6 +22484,13 @@ icon_state = "floor3" }, /area/centcom/legion/hangar5) +"cCo" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) "cCq" = ( /obj/machinery/door/airlock/hatch{ frequency = 1332; @@ -22882,6 +22534,17 @@ icon_state = "dark" }, /area/centcom/legion) +"cEy" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/vending/wallmed1{ + pixel_x = -9; + pixel_y = 30; + req_access = list(110) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "cED" = ( /obj/structure/table/rack, /obj/item/shield/riot/tact/legion{ @@ -22962,6 +22625,9 @@ name = "plating" }, /area/centcom/distress_prep) +"cKC" = ( +/turf/simulated/floor/carpet, +/area/merchant_station) "cNN" = ( /obj/item/deck/cards, /obj/structure/table/wood, @@ -22986,6 +22652,17 @@ icon_state = "tiles" }, /area/centcom/legion/hangar5) +"cQv" = ( +/turf/simulated/floor/tiled/ramp, +/area/merchant_station) +"cQY" = ( +/obj/machinery/door/airlock/silver{ + hashatch = 0; + name = "Bridge"; + req_access = list(110) + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "cSQ" = ( /obj/machinery/light/spot, /turf/unsimulated/floor{ @@ -23022,6 +22699,34 @@ icon_state = "floor" }, /area/centcom/distress_prep) +"cVE" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_y = 16 + }, +/obj/machinery/autolathe{ + desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; + hacked = 1; + name = "Modified Autolathe"; + pixel_x = 0; + pixel_y = 0 + }, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) +"cXA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "cYA" = ( /turf/simulated/wall/shuttle/dark/corner/underlay{ dir = 10; @@ -23123,6 +22828,10 @@ /obj/structure/sign/christmas/lights, /turf/simulated/floor/shuttle, /area/shuttle/arrival/centcom) +"dql" = ( +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/ramp/bottom, +/area/merchant_station/warehouse) "dqY" = ( /obj/structure/bed/chair/shuttle, /obj/machinery/vending/wallmed1{ @@ -23158,6 +22867,13 @@ icon_state = "floor" }, /area/centcom/evac) +"dzu" = ( +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "dzL" = ( /obj/machinery/vending/security, /obj/machinery/light{ @@ -23182,6 +22898,16 @@ icon_state = "blue" }, /area/centcom/spawning) +"dBk" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/loot{ + desc = "A worn container that has been through many long travels."; + name = "leftover merchandise"; + quantity = 10; + rarity = 2 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "dBu" = ( /turf/unsimulated/floor{ icon_state = "vault"; @@ -23209,6 +22935,10 @@ icon_state = "floor" }, /area/centcom/checkpoint/aft) +"dEX" = ( +/obj/structure/closet/secure_closet/merchant, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "dGq" = ( /obj/machinery/light/small/emergency{ dir = 4; @@ -23321,6 +23051,22 @@ icon_state = "dark" }, /area/centcom/legion) +"dQD" = ( +/obj/structure/grille, +/obj/machinery/door/blast/shutters{ + closed_layer = 3.1; + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "merch_privacy"; + name = "Privacy Shutters"; + opacity = 0 + }, +/obj/structure/window/shuttle{ + maxhealth = 100 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "dQM" = ( /obj/structure/bed/chair, /obj/structure/sign/christmas/lights{ @@ -23329,6 +23075,14 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/transport1/centcom) +"dTj" = ( +/obj/structure/table/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/random/voidsuit, +/obj/random/voidsuit, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "dTq" = ( /obj/structure/table/rack, /obj/item/gun/energy/rifle, @@ -23427,6 +23181,11 @@ }, /turf/space/transit/east/shuttlespace_ew12, /area/template_noop) +"dYV" = ( +/obj/structure/table/reinforced, +/obj/item/storage/secure/briefcase, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "dZx" = ( /obj/structure/closet{ icon_closed = "blue"; @@ -23449,6 +23208,9 @@ /obj/item/clothing/suit/storage/legion, /obj/item/towel, /obj/item/towel, +/obj/item/rig/light/offworlder, +/obj/item/clothing/accessory/offworlder/bracer, +/obj/item/storage/pill_bottle/rmt, /turf/unsimulated/floor{ dir = 8; icon_state = "wood" @@ -23497,6 +23259,9 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"eks" = ( +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "emM" = ( /obj/structure/toilet{ dir = 8 @@ -23531,6 +23296,18 @@ icon_state = "wood" }, /area/centcom/legion) +"erT" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + icon_state = "warning_dust"; + dir = 6 + }, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "asteroidplating" + }, +/area/merchant_station/warehouse) "etF" = ( /turf/unsimulated/floor{ icon_state = "floor" @@ -23609,6 +23386,18 @@ icon_state = "dark" }, /area/centcom/legion) +"eOF" = ( +/obj/structure/window/basic{ + dir = 8 + }, +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 30 + }, +/turf/simulated/floor/lino, +/area/merchant_station) "ePR" = ( /obj/effect/floor_decal/spline/fancy/wood{ icon_state = "spline_fancy"; @@ -23820,6 +23609,10 @@ name = "plating" }, /area/centcom/legion) +"feQ" = ( +/obj/structure/undies_wardrobe, +/turf/simulated/floor/wood, +/area/merchant_station) "ffk" = ( /obj/machinery/light/spot{ icon_state = "tube1"; @@ -23863,6 +23656,20 @@ icon_state = "wood" }, /area/centcom/distress_prep) +"ffx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station) "ffD" = ( /obj/item/trash/tastybread, /obj/item/trash/koisbar, @@ -23921,6 +23728,17 @@ }, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_dininghall) +"fiE" = ( +/turf/simulated/floor/tiled/ramp/bottom, +/area/merchant_station) +"fiG" = ( +/obj/machinery/door/window/northright{ + name = "display case"; + req_access = list(110) + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "fkT" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_containers/blood/OMinus, @@ -23956,6 +23774,9 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"fqx" = ( +/turf/unsimulated/wall/steel, +/area/template_noop) "fri" = ( /obj/effect/floor_decal/spline/fancy/wood{ icon_state = "spline_fancy"; @@ -23987,6 +23808,16 @@ icon_state = "whitegreen" }, /area/centcom/legion) +"fvm" = ( +/obj/item/clothing/gloves/yellow, +/obj/item/storage/toolbox/electrical, +/obj/structure/table/rack, +/obj/item/tape_roll, +/obj/item/tape_roll, +/obj/item/clothing/head/welding, +/obj/item/storage/belt/utility/full, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "fvQ" = ( /obj/machinery/pipedispenser/disposal/orderable, /obj/effect/floor_decal/industrial/outline/yellow, @@ -24084,6 +23915,14 @@ }, /turf/simulated/floor/plating, /area/shuttle/distress/centcom) +"fMb" = ( +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/turf/unsimulated/floor{ + icon_state = "floor3" + }, +/area/centcom/legion) "fNp" = ( /obj/structure/banner/unmovable, /obj/structure/sign/christmas/lights{ @@ -24241,9 +24080,20 @@ }, /turf/simulated/floor/plating, /area/shuttle/distress/centcom) +"fXv" = ( +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/wood, +/area/merchant_station) "fXS" = ( /turf/space/transit/east/shuttlespace_ew13, /area/shuttle/legion/transit) +"fZi" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/template_noop, +/area/template_noop) "gav" = ( /obj/structure/sign/poster, /turf/unsimulated/wall/riveted, @@ -24254,6 +24104,17 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"gfl" = ( +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/corner/paleblue/full{ + icon_state = "corner_white_full"; + dir = 8 + }, +/obj/machinery/shower{ + pixel_y = 20 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) "gid" = ( /turf/unsimulated/floor{ name = "plating" @@ -24268,6 +24129,13 @@ name = "plating" }, /area/centcom/legion) +"gjo" = ( +/obj/effect/floor_decal/corner/yellow/full{ + icon_state = "corner_white_full"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "gjE" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -24593,6 +24461,13 @@ dir = 8 }, /area/centcom/living) +"gEz" = ( +/obj/effect/floor_decal/industrial/loading{ + icon_state = "loadingarea"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "gEL" = ( /turf/simulated/wall/shuttle/dark/corner/underlay{ icon_state = "wall3"; @@ -24702,10 +24577,19 @@ }, /area/centcom/legion/hangar5) "gVd" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/fire, -/obj/item/storage/firstaid/o2, -/turf/simulated/floor/tiled, +/obj/machinery/cryopod, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/merchant_station) +"gVU" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/merchant_station) "gWM" = ( /obj/machinery/door/airlock/silver{ @@ -24749,6 +24633,30 @@ icon_state = "cult" }, /area/centcom/legion) +"gZC" = ( +/turf/unsimulated/wall/fakeairlock{ + desc = "Locked during work hours due to safety concerns. Particularly pirate ones."; + icon_state = "door_locked"; + name = "Upper Levels access" + }, +/area/merchant_station) +"gZS" = ( +/obj/structure/closet/wardrobe/suit, +/obj/random/colored_jumpsuit, +/obj/random/backpack, +/obj/item/clothing/shoes/workboots, +/obj/item/clothing/shoes/workboots/toeless, +/obj/item/clothing/shoes/sandal, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/jackboots/unathi, +/obj/item/clothing/shoes/laceup, +/obj/item/rig/light/offworlder, +/obj/item/clothing/accessory/offworlder/bracer, +/turf/simulated/floor/wood, +/area/merchant_station) +"haK" = ( +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "hcI" = ( /turf/unsimulated/wall/riveted, /area/centcom/distress_prep) @@ -24824,6 +24732,23 @@ name = "plating" }, /area/centcom/distress_prep) +"hmr" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + icon_state = "warning_dust"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "asteroidplating" + }, +/area/template_noop) +"hnl" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/machinery/papershredder, +/turf/simulated/floor/wood, +/area/merchant_station) "hrO" = ( /obj/machinery/door/airlock/glass_medical{ name = "Emergency Room" @@ -24843,6 +24768,17 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"hyh" = ( +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) +"hyq" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/template_noop, +/area/template_noop) "hyZ" = ( /obj/structure/closet/crate/secure/legion, /turf/unsimulated/floor{ @@ -24857,6 +24793,21 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"hAh" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window{ + dir = 1; + name = "display case"; + req_access = list(110) + }, +/obj/structure/table/rack{ + pixel_x = 3; + pixel_y = -2 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "hAP" = ( /obj/structure/bed/chair/shuttle{ dir = 4 @@ -24974,6 +24925,20 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"hFF" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/conveyor{ + dir = 6; + id = "merchant_shipping"; + reversed = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "hGZ" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -25016,6 +24981,11 @@ icon_state = "floor" }, /area/centcom/checkpoint/aft) +"hOa" = ( +/obj/structure/table/wood, +/obj/item/folder/blue, +/turf/simulated/floor/carpet, +/area/merchant_station) "hOG" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -25202,6 +25172,29 @@ icon_state = "steel_dirty" }, /area/centcom/legion/hangar5) +"iak" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "merchant_receiving" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) +"ibx" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/merchant_station) "ibI" = ( /obj/structure/table/wood, /obj/effect/floor_decal/spline/fancy/wood{ @@ -25232,9 +25225,39 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) +"icJ" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/machinery/door/window/southright{ + name = "display case"; + req_access = list(110) + }, +/obj/structure/table/rack{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_x = -16 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "ifh" = ( /turf/unsimulated/wall/riveted, /area/centcom/evac) +"ifH" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + icon_state = "warning_dust"; + dir = 5 + }, +/turf/unsimulated/floor{ + icon_state = "asteroidplating" + }, +/area/template_noop) "ihn" = ( /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt, @@ -25284,6 +25307,26 @@ }, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_dininghall) +"imz" = ( +/turf/simulated/floor/lino, +/area/merchant_station) +"imJ" = ( +/obj/machinery/light{ + dir = 2; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_x = -16 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "merchant_receiving" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "iol" = ( /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{ density = 1; @@ -25323,6 +25366,13 @@ name = "plating" }, /area/centcom/legion) +"itb" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "merchant_shipping"; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "iuk" = ( /obj/machinery/door/airlock/glass_command{ name = "Prefect Office"; @@ -25364,6 +25414,25 @@ icon_state = "steel_dirty" }, /area/centcom/legion/hangar5) +"iDB" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater"; + dir = 8 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "iEq" = ( /obj/structure/table/standard, /obj/item/clothing/glasses/hud/health, @@ -25500,6 +25569,14 @@ }, /turf/simulated/floor/tiled/ramp/bottom, /area/shuttle/distress/centcom) +"iOS" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/structure/bed/roller, +/turf/simulated/floor/tiled/white, +/area/merchant_station) "iQk" = ( /obj/structure/closet{ icon_closed = "blue"; @@ -25528,6 +25605,13 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/escape/centcom) +"iRS" = ( +/obj/effect/floor_decal/industrial/loading{ + icon_state = "loadingarea"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "iUt" = ( /turf/space/transit/east/shuttlespace_ew8, /area/shuttle/distress/transit) @@ -25734,6 +25818,10 @@ dir = 5 }, /area/centcom/distress_prep) +"jgE" = ( +/obj/item/stool/padded, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "jhX" = ( /obj/machinery/light/spot{ icon_state = "tube1"; @@ -25810,6 +25898,15 @@ /obj/machinery/mech_recharger, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"jpR" = ( +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "jrX" = ( /obj/structure/closet/secure_closet/guncabinet{ name = "legion weapon cabinet"; @@ -25922,6 +26019,13 @@ dir = 4 }, /area/centcom/living) +"jCl" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/brown, +/obj/random/plushie, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/wood, +/area/merchant_station) "jDn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft, @@ -25945,6 +26049,46 @@ icon_state = "engine" }, /area/centcom/legion/hangar5) +"jEI" = ( +/obj/structure/coatrack, +/turf/simulated/floor/wood, +/area/merchant_station) +"jEJ" = ( +/obj/machinery/door/window/westleft, +/turf/simulated/floor/lino, +/area/merchant_station) +"jGf" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "merchant_shipping" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) +"jIw" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/fake_object{ + density = 0; + desc = "A conveyor belt."; + dir = 1; + icon = 'icons/obj/recycling.dmi'; + icon_state = "conveyor0"; + layer = 3; + name = "conveyor belt"; + pixel_x = 1; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "jIx" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -25992,6 +26136,13 @@ icon_state = "dark" }, /area/centcom/legion) +"jMo" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 2 + }, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "jMp" = ( /turf/unsimulated/wall/fakepdoor{ dir = 8; @@ -26020,6 +26171,13 @@ icon_state = "dark" }, /area/centcom/holding) +"jSZ" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + icon_state = "corner_white_full"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "jTp" = ( /turf/unsimulated/floor{ icon_state = "green"; @@ -26056,6 +26214,9 @@ name = "plating" }, /area/centcom/legion) +"jXZ" = ( +/turf/simulated/floor/tiled/dark, +/area/merchant_station) "kdI" = ( /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor{ @@ -26110,11 +26271,30 @@ dir = 8 }, /area/centcom/legion) +"khB" = ( +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/item/reagent_containers/glass/bucket{ + pixel_x = -9; + pixel_y = 7 + }, +/obj/item/mop, +/turf/simulated/floor/tiled/white, +/area/merchant_station) "khS" = ( /turf/unsimulated/floor{ icon_state = "floor" }, /area/centcom/legion) +"khV" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_l"; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "kis" = ( /obj/structure/bed/chair{ dir = 1 @@ -26122,6 +26302,13 @@ /obj/structure/sign/christmas/lights, /turf/simulated/floor/shuttle, /area/shuttle/transport1/centcom) +"klF" = ( +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "kmV" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -26225,6 +26412,10 @@ icon_state = "floor" }, /area/centcom/holding) +"kBJ" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "kBT" = ( /obj/structure/grille, /obj/structure/window/reinforced/crescent{ @@ -26240,6 +26431,12 @@ name = "plating" }, /area/centcom/legion/hangar5) +"kCZ" = ( +/obj/structure/table/standard, +/obj/item/clipboard, +/obj/item/pen, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "kEn" = ( /obj/machinery/light/spot{ icon_state = "tube1"; @@ -26274,6 +26471,15 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"kFl" = ( +/obj/structure/table/reinforced/steel, +/obj/item/device/price_scanner, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "kGg" = ( /obj/structure/window/reinforced{ dir = 8 @@ -26303,6 +26509,10 @@ icon_state = "floor" }, /area/centcom/checkpoint/fore) +"kHB" = ( +/obj/item/modular_computer/console/preset/merchant, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "kHC" = ( /obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" @@ -26311,6 +26521,10 @@ icon_state = "dark" }, /area/centcom/legion) +"kJo" = ( +/obj/machinery/merchant_pad, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "kKZ" = ( /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{ dir = 2; @@ -26398,6 +26612,13 @@ }, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_dininghall) +"kUG" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_l"; + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "kVO" = ( /obj/structure/closet/crate/secure/legion{ icon_state = "tcflcrateopen"; @@ -26457,6 +26678,13 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"lbB" = ( +/obj/machinery/door/airlock/hatch{ + name = "Equipment"; + req_access = list(110) + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "ldQ" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion/hangar5) @@ -26467,6 +26695,14 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) +"lhD" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/merchant_station) "lhQ" = ( /obj/structure/bed/chair/office/bridge{ icon_state = "bridge"; @@ -26481,6 +26717,24 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress/centcom) +"liJ" = ( +/obj/structure/sink{ + pixel_y = 18 + }, +/obj/structure/mirror{ + pixel_y = 33 + }, +/obj/machinery/light{ + dir = 4; + icon_state = "tube1"; + pixel_x = 0 + }, +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) "lkF" = ( /obj/effect/wingrille_spawn/reinforced/crescent, /turf/unsimulated/wall/riveted, @@ -26507,6 +26761,22 @@ dir = 4 }, /area/centcom/living) +"lqo" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/merchant_station) +"lrT" = ( +/obj/structure/table/standard, +/obj/item/stack/packageWrap, +/obj/item/hand_labeler, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "lwP" = ( /obj/structure/window/reinforced, /turf/unsimulated/floor{ @@ -26580,6 +26850,14 @@ name = "plating" }, /area/centcom/legion/hangar5) +"lEG" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/template_noop, +/area/template_noop) "lEU" = ( /obj/structure/sink{ dir = 8; @@ -26608,6 +26886,18 @@ icon_state = "dark" }, /area/centcom/legion) +"lIz" = ( +/obj/structure/grille, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "merchant_blast"; + name = "blast shield" + }, +/obj/structure/window/shuttle{ + maxhealth = 100 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "lIO" = ( /obj/machinery/light{ dir = 4; @@ -26635,6 +26925,31 @@ name = "plating" }, /area/centcom/distress_prep) +"lKB" = ( +/obj/structure/table/reinforced/steel, +/obj/item/spacecash/c1000{ + pixel_x = 2 + }, +/obj/item/spacecash/c1000{ + pixel_x = 2 + }, +/obj/item/spacecash/c1000{ + pixel_x = 2 + }, +/obj/item/spacecash/c1000{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/spacecash/c1000{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/item/spacecash/c1000{ + pixel_x = 2; + pixel_y = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "lKJ" = ( /obj/structure/bed/roller, /turf/unsimulated/floor{ @@ -26801,6 +27116,10 @@ icon_state = "red" }, /area/centcom/holding) +"mjX" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/wood, +/area/merchant_station) "mkQ" = ( /obj/structure/table/reinforced/steel, /obj/item/device/flashlight/lamp{ @@ -26855,12 +27174,27 @@ icon_state = "whitehall" }, /area/centcom/legion) -"mrx" = ( -/obj/effect/ghostspawpoint/cryo{ - dir = 4; - identifier = "MerchantAss" +"mqM" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 0; + pixel_y = 30 }, /turf/simulated/floor/tiled, +/area/shuttle/merchant/start) +"mrx" = ( +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/item/storage/firstaid/regular{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/pill_bottle/rmt{ + pixel_x = -12 + }, +/turf/simulated/floor/tiled/white, /area/merchant_station) "mrR" = ( /turf/unsimulated/wall/fakepdoor{ @@ -26978,6 +27312,26 @@ /obj/structure/sign/christmas/lights, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_picnicarea) +"mDX" = ( +/obj/machinery/computer/shuttle_control/merchant, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "merchant_airlock"; + name = "airlock shutter"; + pixel_x = 6; + pixel_y = -25; + req_access = null + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "merchant_blast"; + name = "blast shields"; + pixel_x = -2; + pixel_y = -25; + req_access = null + }, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "mEu" = ( /obj/effect/floor_decal/corner/lime{ icon_state = "corner_white"; @@ -27060,6 +27414,20 @@ icon_state = "floor" }, /area/centcom/checkpoint/fore) +"mRW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 1; + id = "merchant_receiving" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "mSa" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -27096,6 +27464,20 @@ /obj/structure/cryofeed, /turf/simulated/floor/tiled, /area/centcom/ferry) +"mVR" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + name = "display case"; + req_access = list(110) + }, +/obj/structure/table/rack{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "mWr" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -27103,6 +27485,13 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/escape/centcom) +"mZZ" = ( +/obj/structure/closet/secure_closet/merchant, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "naf" = ( /turf/space/transit/east/shuttlespace_ew1, /area/shuttle/legion/transit) @@ -27264,6 +27653,18 @@ icon_state = "dark" }, /area/centcom/legion) +"nlu" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/merchant_station) "nmx" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle/inaprovaline{ @@ -27347,6 +27748,12 @@ dir = 9 }, /area/centcom/living) +"nuP" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/merchant_station) "nuU" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -27466,6 +27873,13 @@ icon_state = "wood" }, /area/centcom/distress_prep) +"nDW" = ( +/obj/machinery/door/airlock/glass{ + name = "Merchant's Office"; + req_access = list(110) + }, +/turf/simulated/floor/wood, +/area/merchant_station) "nEL" = ( /turf/space/transit/east/shuttlespace_ew9, /area/shuttle/legion/transit) @@ -27622,6 +28036,13 @@ dir = 8 }, /area/centcom/living) +"nQl" = ( +/obj/machinery/door/airlock/hatch{ + name = "Lounge"; + req_access = null + }, +/turf/simulated/floor/wood, +/area/merchant_station) "nQF" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -27668,6 +28089,24 @@ name = "plating" }, /area/centcom/legion) +"nUb" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "merchant_station"; + pixel_x = 28; + pixel_y = 5; + tag_door = "merchant_station_door" + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 8; + id = "merchant_receiving" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "nXn" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -27714,6 +28153,18 @@ icon_state = "cafeteria" }, /area/centcom/legion) +"nYp" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "nYq" = ( /obj/machinery/light/spot{ icon_state = "tube1"; @@ -27825,6 +28276,13 @@ }, /turf/simulated/wall/shuttle/legion, /area/shuttle/legion/centcom) +"odN" = ( +/obj/structure/sign/vacuum{ + pixel_y = -32 + }, +/obj/structure/flora/pottedplant/random, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "oev" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -27853,6 +28311,12 @@ icon_state = "dark" }, /area/centcom/legion) +"oks" = ( +/obj/machinery/suit_cycler{ + req_access = list(110) + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "okP" = ( /obj/structure/shuttle/engine/propulsion/burst/left{ dir = 8; @@ -27861,6 +28325,27 @@ }, /turf/simulated/floor/plating, /area/shuttle/legion/centcom) +"okY" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/machinery/door/window/northright{ + name = "display case"; + req_access = list(110) + }, +/obj/structure/table/rack{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 2; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_x = -16 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "olh" = ( /obj/structure/sign/christmas/lights, /turf/unsimulated/floor{ @@ -27882,12 +28367,45 @@ icon_state = "panelscorched" }, /area/centcom/legion/hangar5) +"omW" = ( +/obj/machinery/door/airlock/external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "merchant_shuttle_hatch"; + name = "Ship External Access"; + req_access = list(110) + }, +/obj/machinery/button/remote/blast_door{ + desc = "It controls the shuttle shutter."; + dir = 1; + id = "merchant_airlock"; + name = "airlock shutter controller"; + pixel_x = -3; + pixel_y = -21; + req_access = list(110) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/door/blast/shutters/open{ + dir = 8; + id = "merchant_airlock"; + name = "airlock shutter" + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "opd" = ( /obj/machinery/atmospherics/unary/cryo_cell, /turf/unsimulated/floor{ icon_state = "floor" }, /area/centcom/legion) +"oqN" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fountain/black, +/turf/simulated/floor/carpet, +/area/merchant_station) "orV" = ( /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor{ @@ -27935,6 +28453,16 @@ icon_state = "floor" }, /area/centcom/checkpoint/fore) +"owO" = ( +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/merchant_station) "oya" = ( /obj/structure/sign/christmas/lights, /turf/unsimulated/floor{ @@ -27999,6 +28527,16 @@ name = "plating" }, /area/centcom/legion/hangar5) +"ozQ" = ( +/obj/structure/closet/crate/loot{ + desc = "A worn container that has been through many long travels."; + name = "leftover merchandise"; + quantity = 8; + rarity = 2 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "oAn" = ( /obj/machinery/door/blast/shutters/open{ dir = 2; @@ -28068,6 +28606,27 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/wall/shuttle, /area/centcom/legion) +"oHy" = ( +/obj/structure/flora/pottedplant/random, +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/merchant_station) +"oHH" = ( +/obj/machinery/door/window/eastright{ + req_access = list(110) + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "merchant_airlock"; + name = "airlock shutter"; + pixel_x = 6; + pixel_y = -25; + req_access = null + }, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) "oIb" = ( /obj/machinery/light{ icon_state = "tube1"; @@ -28119,6 +28678,18 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_dininghall) +"oOm" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 5 + }, +/obj/machinery/conveyor{ + dir = 9; + id = "merchant_shipping"; + name = "testbelt" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "oOS" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -28241,6 +28812,19 @@ name = "plating" }, /area/centcom/legion) +"oWD" = ( +/obj/machinery/door/airlock/hatch{ + name = "Equipment"; + req_access = list(110) + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station) +"oXr" = ( +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/merchant_station) "oXZ" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, @@ -28334,6 +28918,16 @@ }, /turf/simulated/floor/shuttle, /area/shuttle/transport1/centcom) +"piD" = ( +/obj/machinery/door/window/eastright{ + req_access = list(110) + }, +/obj/effect/floor_decal/corner/paleblue/full{ + icon_state = "corner_white_full"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "pku" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -28388,6 +28982,13 @@ icon_state = "wood" }, /area/centcom/living) +"pmR" = ( +/turf/unsimulated/wall/fakeairlock{ + icon = 'icons/obj/doors/Doorext.dmi'; + icon_state = "door_locked"; + name = "service airlock" + }, +/area/template_noop) "poi" = ( /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain"; @@ -28452,6 +29053,11 @@ name = "plating" }, /area/centcom/distress_prep) +"pEJ" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/item/tank/air, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "pFe" = ( /obj/structure/table/rack, /obj/item/tank/emergency_oxygen/double{ @@ -28499,6 +29105,13 @@ icon_state = "dark" }, /area/centcom/legion) +"pHE" = ( +/obj/structure/bed/chair/office/dark, +/obj/effect/landmark/start{ + name = "Merchant" + }, +/turf/simulated/floor/carpet, +/area/merchant_station) "pKS" = ( /obj/structure/grille, /obj/machinery/door/blast/regular/open{ @@ -28621,6 +29234,9 @@ icon_state = "cafeteria" }, /area/centcom/legion) +"qck" = ( +/turf/space/transit/east/shuttlespace_ew3, +/area/shuttle/merchant/transit) "qft" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; @@ -28671,6 +29287,22 @@ icon_state = "dark" }, /area/centcom/legion) +"qmV" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) +"qpe" = ( +/obj/structure/window/shuttle, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "qpr" = ( /obj/vehicle/bike/speeder, /obj/structure/sign/flag/biesel/left{ @@ -28700,6 +29332,19 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) +"qql" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/conveyor{ + id = "merchant_shipping" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "qqm" = ( /obj/machinery/door/blast/shutters/open{ dir = 4; @@ -28733,6 +29378,13 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"qsr" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 2 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station) "qsX" = ( /turf/space/transit/east/shuttlespace_ew2, /area/shuttle/legion/transit) @@ -28814,6 +29466,25 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/legion/centcom) +"qBg" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater"; + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "qCq" = ( /turf/space/transit/east/shuttlespace_ew14, /area/shuttle/distress/transit) @@ -28829,6 +29500,10 @@ icon_state = "floor" }, /area/centcom/legion) +"qDT" = ( +/obj/structure/closet/secure_closet/merchant, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "qEE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -28842,6 +29517,13 @@ icon_state = "floorscorched1" }, /area/centcom/legion/hangar5) +"qFs" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/template_noop, +/area/template_noop) "qFT" = ( /obj/machinery/shower{ pixel_y = 20 @@ -28919,6 +29601,17 @@ icon_state = "steel_dirty" }, /area/centcom/legion/hangar5) +"qLp" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/secure/weapon{ + icon_state = "weaponcrateopen"; + locked = 0; + name = "merchant weapons crate"; + opened = 1; + req_access = list(111) + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "qMl" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, @@ -29022,6 +29715,12 @@ dir = 8 }, /area/centcom/legion/hangar5) +"qTX" = ( +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/merchant_station/warehouse) "qUu" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -29087,6 +29786,13 @@ icon_state = "dark" }, /area/centcom/legion) +"rbz" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "rbI" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, @@ -29198,6 +29904,30 @@ icon_state = "dark" }, /area/centcom/legion/hangar5) +"rhl" = ( +/obj/structure/table/stone/marble, +/obj/machinery/door/window/southright{ + name = "desk window"; + req_access = list(110) + }, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) +"rhm" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 6; + id = "merchant_receiving" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) +"rhD" = ( +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "rhL" = ( /obj/machinery/vending/tool{ random_itemcount = 0 @@ -29271,6 +30001,12 @@ icon_state = "dark" }, /area/centcom/legion) +"rqm" = ( +/obj/structure/mirror/merchant{ + pixel_y = 28 + }, +/turf/simulated/floor/wood, +/area/merchant_station) "rqD" = ( /obj/machinery/door/airlock/external{ frequency = 1332; @@ -29392,6 +30128,23 @@ icon_state = "wood_light" }, /area/centcom/legion/hangar5) +"rGG" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/machinery/vending/snack{ + name = "Snack Machine"; + pixel_x = 0; + pixel_y = 0; + prices = list() + }, +/turf/simulated/floor/tiled, +/area/merchant_station) +"rJj" = ( +/obj/structure/table/reinforced, +/obj/item/device/flashlight/lamp{ + pixel_x = 3 + }, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "rJE" = ( /obj/machinery/door/airlock/centcom{ name = "Checkpoint"; @@ -29454,6 +30207,9 @@ dir = 4 }, /area/centcom/legion) +"rPy" = ( +/turf/simulated/wall/shuttle, +/area/shuttle/merchant/start) "rQb" = ( /obj/structure/sign/flag/biesel{ pixel_y = 32 @@ -29517,6 +30273,9 @@ icon_state = "cult" }, /area/centcom/legion) +"rUz" = ( +/turf/unsimulated/floor/asteroid/ash/rocky, +/area/template_noop) "rWZ" = ( /obj/machinery/door/airlock/hatch{ frequency = 1332; @@ -29618,6 +30377,20 @@ icon_state = "floor" }, /area/centcom/ferry) +"sgR" = ( +/obj/effect/landmark{ + name = "LateJoinMerchant" + }, +/obj/effect/ghostspawpoint/button{ + desc = "This button is used for summoning an assistant from the upper floors."; + dir = 8; + identifier = "MerchantAss"; + name = "call button"; + pixel_x = 24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station) "siv" = ( /obj/structure/bed/chair{ dir = 8 @@ -29740,6 +30513,10 @@ icon_state = "wood" }, /area/centcom/legion) +"sqy" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "sqO" = ( /obj/structure/table/rack, /obj/item/clothing/suit/storage/vest/legion{ @@ -29864,6 +30641,14 @@ icon_state = "dark" }, /area/centcom/legion) +"sHB" = ( +/obj/structure/table/wood, +/obj/item/device/flashlight/lamp/green{ + layer = 4.1; + pixel_y = 4 + }, +/turf/simulated/floor/carpet, +/area/merchant_station) "sHJ" = ( /obj/item/flame/candle{ layer = 3.6; @@ -29893,6 +30678,13 @@ icon_state = "dark" }, /area/centcom/legion) +"sMa" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 4; + pixel_y = -2 + }, +/turf/simulated/floor/lino, +/area/merchant_station) "sMD" = ( /turf/space/transit/east/shuttlespace_ew10, /area/shuttle/legion/transit) @@ -29955,6 +30747,16 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/distress/centcom) +"sXn" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "sXR" = ( /obj/machinery/light/small/emergency{ dir = 8 @@ -30028,6 +30830,22 @@ icon_state = "floor" }, /area/centcom/checkpoint/fore) +"tcM" = ( +/obj/structure/plasticflaps{ + layer = 2.6; + opacity = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/conveyor{ + id = "merchant_shipping" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "tcY" = ( /obj/machinery/light{ dir = 4; @@ -30215,6 +31033,12 @@ icon_state = "wood-broken5" }, /area/centcom/legion) +"tvs" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) "tAQ" = ( /obj/machinery/door/blast/odin{ density = 0; @@ -30282,6 +31106,12 @@ icon_state = "dark" }, /area/centcom/legion) +"tHU" = ( +/obj/structure/bed/chair/office/bridge/generic{ + name = "pilot seat" + }, +/turf/simulated/floor/carpet/blue, +/area/shuttle/merchant/start) "tIa" = ( /obj/structure/lattice/catwalk/indoor, /obj/machinery/door/blast/odin/open{ @@ -30344,6 +31174,17 @@ icon_state = "wood" }, /area/centcom/legion) +"tPU" = ( +/obj/effect/floor_decal/industrial/warning{ + icon_state = "warning"; + dir = 1 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "merchant_shipping" + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "tQq" = ( /obj/structure/table/reinforced, /obj/item/gun/energy/blaster/rifle{ @@ -30373,6 +31214,54 @@ icon_state = "dark" }, /area/centcom/legion) +"tQE" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "merchant_shuttle"; + pixel_x = 0; + pixel_y = -24; + tag_door = "merchant_shuttle_hatch" + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) +"tRd" = ( +/obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/sink{ + dir = 8; + icon_state = "sink"; + pixel_x = -12; + pixel_y = 4 + }, +/obj/structure/sign/poster{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) +"tTc" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_y = 16 + }, +/turf/simulated/floor/tiled, +/area/merchant_station) +"tUf" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "tVT" = ( /obj/effect/floor_decal/spline/fancy/wood{ icon_state = "spline_fancy"; @@ -30452,6 +31341,14 @@ icon_state = "dark" }, /area/centcom/legion) +"ueV" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/item/tank/nitrogen, +/obj/item/tank/nitrogen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/simulated/floor/wood, +/area/merchant_station) "ugy" = ( /obj/effect/floor_decal/spline/fancy/wood{ icon_state = "spline_fancy"; @@ -30486,6 +31383,10 @@ dir = 6 }, /area/centcom/legion) +"unn" = ( +/obj/structure/sign/nosmoking_2, +/turf/unsimulated/wall/steel, +/area/merchant_station/warehouse) "upd" = ( /obj/effect/floor_decal/corner/blue{ icon_state = "corner_white"; @@ -30511,6 +31412,29 @@ name = "plating" }, /area/centcom/legion/hangar5) +"usD" = ( +/obj/structure/table/wood, +/obj/item/material/ashtray/bronze, +/obj/machinery/light{ + dir = 1; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) +"usI" = ( +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/sign/vacuum, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "utl" = ( /obj/effect/ghostspawpoint{ identifier = "TCFLERTSpawn - Pilot"; @@ -30532,6 +31456,14 @@ dir = 1 }, /area/centcom/legion) +"uue" = ( +/obj/structure/curtain/black{ + icon_state = "open"; + layer = 4.1; + opacity = 0 + }, +/turf/simulated/floor/wood, +/area/merchant_station) "uuM" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -30557,6 +31489,10 @@ }, /turf/simulated/floor/holofloor/snow, /area/holodeck/source_dininghall) +"uCD" = ( +/obj/effect/floor_decal/corner/yellow/full, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "uFy" = ( /obj/machinery/recharger/wallcharger{ pixel_x = -27; @@ -30643,14 +31579,28 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) -"uQh" = ( -/obj/machinery/light{ - dir = 1 +"uPx" = ( +/obj/structure/table/reinforced/steel, +/obj/machinery/recharger{ + pixel_x = 1; + pixel_y = 2 }, +/turf/simulated/floor/tiled/dark, +/area/merchant_station/warehouse) +"uQh" = ( /obj/machinery/computer/cryopod{ pixel_y = 32 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/paleblue/diagonal{ + icon_state = "corner_white_diagonal"; + dir = 8 + }, +/obj/machinery/vending/wallmed1{ + pixel_x = -24; + pixel_y = 30; + req_access = list() + }, +/turf/simulated/floor/tiled/white, /area/merchant_station) "uSP" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -30682,6 +31632,11 @@ name = "plating" }, /area/centcom/legion) +"uVX" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/large_stock_marker, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "uWY" = ( /obj/structure/lattice/catwalk/indoor, /obj/effect/decal/cleanable/dirt, @@ -30754,6 +31709,15 @@ }, /turf/simulated/wall/shuttle/legion, /area/shuttle/legion/centcom) +"vdf" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/merchant_station) "vdp" = ( /obj/structure/sign/christmas/lights, /turf/unsimulated/floor{ @@ -30844,6 +31808,20 @@ icon_state = "floor" }, /area/centcom/ferry) +"vjY" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "vmT" = ( /obj/structure/table/reinforced, /obj/item/gun/projectile/gauss{ @@ -30906,6 +31884,14 @@ name = "plating" }, /area/centcom/legion/hangar5) +"vre" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/freezer{ + icon_state = "freezeropen"; + opened = 1 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "vsg" = ( /obj/effect/decal/cleanable/dirt, /mob/living/heavy_vehicle/premade/light/legion, @@ -30920,6 +31906,7 @@ icon_state = "spline_fancy"; dir = 10 }, +/obj/item/storage/box/tcfl_pamphlet, /turf/unsimulated/floor{ icon_state = "carpet5-1" }, @@ -30943,6 +31930,10 @@ icon_state = "engine" }, /area/centcom/legion) +"vAv" = ( +/obj/machinery/computer/shuttle_control/merchant, +/turf/simulated/floor/wood, +/area/merchant_station) "vCq" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -31264,6 +32255,13 @@ icon_state = "floor" }, /area/centcom/checkpoint/aft) +"vZI" = ( +/obj/structure/noticeboard{ + pixel_x = 4; + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/merchant_station) "wag" = ( /obj/machinery/sleeper{ dir = 4 @@ -31299,6 +32297,44 @@ underlay_dir = 4 }, /area/shuttle/distress/centcom) +"wgr" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/standard{ + pixel_x = 3; + pixel_y = 4 + }, +/obj/machinery/door/window/southleft{ + name = "display case"; + req_access = list(110) + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) +"wgQ" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/machinery/door/window/northright{ + name = "display case"; + req_access = list(110) + }, +/obj/structure/table/rack{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 2; + icon_state = "tube1"; + name = "adjusted light fixture"; + pixel_x = -16 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "whV" = ( /obj/structure/table/wood, /obj/structure/flora/pottedplant/random, @@ -31367,6 +32403,17 @@ dir = 1 }, /area/centcom/living) +"wsm" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) "wsA" = ( /obj/structure/bed/chair{ dir = 1 @@ -31440,6 +32487,26 @@ icon_state = "dark" }, /area/centcom/legion) +"wyr" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/obj/item/storage/secure/safe{ + pixel_x = 12; + pixel_y = 30 + }, +/obj/machinery/button/remote/blast_door{ + id = "merch_privacy"; + name = "Privacy Shutters"; + pixel_x = -9; + pixel_y = 28; + req_access = list(110) + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/merchant/start) "wyu" = ( /turf/space/transit/east/shuttlespace_ew4, /area/shuttle/distress/transit) @@ -31482,6 +32549,10 @@ icon_state = "dark" }, /area/centcom/legion) +"wDV" = ( +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/wood, +/area/merchant_station) "wEJ" = ( /obj/structure/window/reinforced/crescent, /obj/structure/window/reinforced/crescent{ @@ -31529,6 +32600,21 @@ icon_state = "green" }, /area/centcom/living) +"wHU" = ( +/obj/effect/floor_decal/industrial/loading, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) +"wNn" = ( +/obj/machinery/porta_turret/net{ + check_anomalies = 0; + check_arrest = 0; + check_records = 0; + health = 120; + maxhealth = 120; + req_one_access = list(110) + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "wNO" = ( /obj/effect/floor_decal/industrial/warning/corner{ icon_state = "warningcorner"; @@ -31663,6 +32749,14 @@ icon_state = "engine" }, /area/centcom/legion) +"wYl" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "merchant_receiving"; + pixel_x = -1; + pixel_y = -4 + }, +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "wZy" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, @@ -31720,6 +32814,19 @@ icon_state = "cult" }, /area/centcom/holding) +"xgn" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + icon_state = "corner_white"; + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "xgB" = ( /obj/machinery/cryopod{ dir = 4 @@ -31808,6 +32915,9 @@ icon_state = "floor" }, /area/centcom/legion/hangar5) +"xqK" = ( +/turf/simulated/floor/tiled, +/area/merchant_station/warehouse) "xsL" = ( /obj/machinery/light{ dir = 4; @@ -31870,6 +32980,12 @@ icon_state = "floor" }, /area/centcom/legion) +"xvz" = ( +/obj/structure/table/wood, +/obj/item/clothing/accessory/holster/armpit, +/obj/item/gun/energy/pistol, +/turf/simulated/floor/carpet, +/area/merchant_station) "xwi" = ( /obj/structure/sign/christmas/lights{ icon_state = "xmaslights"; @@ -31903,6 +33019,10 @@ icon_state = "steel_dirty" }, /area/centcom/legion/hangar5) +"xwI" = ( +/obj/structure/closet/walllocker/emerglocker/south, +/turf/simulated/floor/plating, +/area/shuttle/merchant/start) "xwM" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/vodka{ @@ -32082,6 +33202,23 @@ "xHu" = ( /turf/space/transit/east/shuttlespace_ew8, /area/shuttle/legion/transit) +"xKx" = ( +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/item/paper_bin{ + pixel_x = 7; + pixel_y = -6 + }, +/obj/item/pen/multi{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/structure/table/stone/marble, +/turf/simulated/floor/wood, +/area/shuttle/merchant/start) "xKS" = ( /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{ dir = 2; @@ -32124,6 +33261,20 @@ dir = 8 }, /area/centcom/legion/hangar5) +"xOV" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/table/standard{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/machinery/door/window/northright{ + name = "display case"; + req_access = list(110) + }, +/turf/simulated/floor/tiled, +/area/shuttle/merchant/start) "xPp" = ( /obj/item/stool, /turf/unsimulated/floor{ @@ -32154,6 +33305,29 @@ icon_state = "dark" }, /area/centcom/legion) +"xTR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/decal/fake_object{ + density = 0; + desc = "A conveyor belt."; + dir = 6; + icon = 'icons/obj/recycling.dmi'; + icon_state = "conveyor0"; + layer = 3; + name = "conveyor belt"; + pixel_x = 1; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/merchant_station/warehouse) +"xVE" = ( +/turf/unsimulated/wall/fakepdoor{ + icon_state = "shutter1"; + name = "warehouse shutter" + }, +/area/merchant_station/warehouse) "xZo" = ( /obj/structure/bed/chair/office/light{ icon_state = "officechair_white"; @@ -32370,6 +33544,7 @@ aaM aaM aaM aaM +ahM aaM aaM aaM @@ -32403,8 +33578,7 @@ aaM aaM aaM aaM -aaM -aaM +ahM aaM aaM aaM @@ -32627,26 +33801,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -ahM -ahM -ahM -ahM -ahM -ahM -ahM ahM aaM aaM @@ -32657,6 +33811,10 @@ aaM aaM aaM aaM +ahV +ahV +ahV +ahV aaM aaM aaM @@ -32664,6 +33822,22 @@ aaM aaM aaM aaM +ahV +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +ahM +aaM +aaM aaM aaM aaM @@ -32884,26 +34058,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -aaP -aaP -aaP -aaP -aaP -aaP ahM aaM aaM @@ -32913,6 +34067,24 @@ aaM aaM aaM aaM +ahV +ahV +ahV +ahV +ahV +ahV +ait +ait +ait +ait +ahV +ahV +ahV +ahV +ahV +ahV +ahV +ahV aaM aaM aaM @@ -32920,6 +34092,8 @@ aaM aaM aaM aaM +ahM +aaM aaM aaM aaM @@ -33142,40 +34316,40 @@ aaM aaM aaM ahM -ahM -ahM -ahM -aaP -aaP -aaP -aaP -aaP -aaP -aaP -aaP -aaP -aaP -aaP +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM ahV ahV ahV ahV -aaP +crO +crO +are +wsm +wsm +arw +crO +ahV +ahV +ahV +ahV +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +aaM +aaM ahM -ahM -ahM -ahM -ahM -ahM -ahM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -33399,10 +34573,25 @@ aaM aaM aaM ahM -aaP -aaP -aaP -aaP +aaM +aaM +aaM +aaM +aaM +aaM +aaM +ahV +ahV +ahV +ahV +ahV +crO +xVE +jIw +jIw +cpq +xTR +crO ahV ahV ahV @@ -33411,28 +34600,13 @@ ahV ahV ahV ahV -ahV -ahV -ahV -ahV -ahV -ahV -aaP -aaP -aaP -aaP -aaP -aaP -aaP +aaM +aaM +aaM +aaM +aaM +aaM ahM -ahM -ahM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -33656,16 +34830,11 @@ aaM aaM aaM ahM -aaP -ahV -ahV -ahV -ahV -aoY -aoY -aoY -aoY -aoY +aaM +aaM +aaM +aaM +aaM ahV ahV ahV @@ -33673,16 +34842,27 @@ ahV ahV ahV ahV +crO +crO +qDT +uVX +uVX +gEz +crO +crO +crO +crO +fqx +pmR +fqx ahV ahV ahV -ahV -ahV -ahV -ahV -aaP -aaP -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -33715,12 +34895,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM aDQ ahV aaP @@ -33913,33 +35087,39 @@ aaM aaM aaM ahM -aaP +aaM +aaM +aaM +aaM +aaM ahV ahV ahV ahV -aoY -apf -aps -apC -aoY -aoY -aoY -aoY -aoY -aoY +crO +crO +crO +crO +crO +qDT +xqK +xqK +xqK +iRS +mRW +rhm +crO +ifH +hmr +erT ahV ahV ahV -ahV -ahV -ahV -ahV -ahV -ahV -ahV -ahV -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -33972,12 +35152,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM aDR ahV aaP @@ -34170,33 +35344,39 @@ aaM aaM aaM ahM -aaP +aaM +aaM +aaM +aaM ahV ahV ahV ahV -aoY -apg -apt -apD -aoY -apN +crO +unn +sqy apX aqh -aqv -aoY +crO +qDT +uVX +uVX +xqK +xqK +lrT +iak +nYp +rUz +rUz +rUz ahV ahV ahV -ahV -ahV -ahV -ahV -ahV -ahV -ahV -ahV -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -34229,12 +35409,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM aDR aaP aaP @@ -34427,40 +35601,40 @@ aaM aaM aaM ahM -aaP +aaM +aaM +aaM +aaM ahV ahV ahV ahV -aoY -apf -apt -aXV -aoY +crO +xVE apR -apt -apt -apt -aoY -aoY -aoY -aoY -aoY -aoY -aoY -aoY -aoY +apR +apR +tcM +apR +apR +hFF +dBk +xqK +qLp +iak +cXA +rUz +rUz +rUz ahV ahV ahV -aaP +aaM +aaM +aaM +aaM +aaM ahM -ahM -ahM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -34684,41 +35858,41 @@ aaM aaM aaM ahM -aaP -ahV -ahV -ahV -ahV -aoY -aXU -apt -apt -apL -apt -apt -apt -apt -apt -aqO -apt -apt -apt -aqO -apt -apN -aoY -ahV -ahV -ahV -aaP -aaP -aaP -ahM -ahM -ahM aaM aaM aaM +ahV +ahV +ahV +ahV +ahV +crO +crO +sXn +tvs +bKL +crO +kHB +kJo +jGf +dBk +xqK +vre +iak +qmV +rUz +rUz +rUz +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +ahM +aaM aaM aaM aaM @@ -34941,37 +36115,39 @@ aaM aaM aaM ahM -aaP -ahV +aaM +aaM +aaM ahV ahV ahV aoY -aph -apt -apE aoY -apt -apt -apt -apt -apt -aqP -apt -apt -apt -apt -apt -asr aoY +aoY +oks +rbz +fvm +crO +jgE +eks +tPU +dBk +xqK +ozQ +iak +crO +ahV +rUz +rUz ahV ahV ahV -ahV -ahV -aaP -aaP -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -35004,8 +36180,6 @@ aaM aaM aaM aaM -aaM -aaM aDR aaP ahV @@ -35198,37 +36372,39 @@ aaM aaM aaM ahM -aaP -aaP +aaM +aaM +aaM ahV ahV ahV aoY -apf -apt +gfl apF aoY -apt -apt -aqi -aoY -aoY -aoY -aoY -ard -apt -apt -apt -apt -aoY +dTj +rbz +eks +lbB +eks +itb +tPU +dBk +xqK +dBk +imJ +crO +ahV +rUz +rUz ahV ahV ahV ahV -ahV -ahV -ahV -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -35261,8 +36437,6 @@ aaM aaM aaM aaM -aaM -aaM aDR aaP ahV @@ -35455,42 +36629,42 @@ aaM aaM aaM ahM -ahM -aaP -ahV -ahV -ahV -aoY -aoY -aoY -aoY -aoY -apt -apt -aqj -aqw -ait -ait -aoY -are -arw -arL -are -ass -aoY -ait -ait -ahV -ahV -ahV -ahV -ahV -aaP -ahM -ahM aaM aaM aaM +ahV +ahV +ahV +aoY +liJ +apt +aoY +pEJ +rbz +aqj +crO +lKB +eks +tPU +dBk +xqK +dBk +iak +nYp +rUz +rUz +rUz +rUz +ahV +ahV +ahV +aaM +aaM +aaM +aaM +ahM +aaM +aaM aaM aaM aaM @@ -35711,39 +36885,40 @@ aaM aaM aaM aaM -aaM ahM -aaP -ahV +aaM +aaM +aaM ahV ahV ahV aoY -apu +aoY apG aoY -apt -apt -aqk -aqx -ait -aaM -aaM -aaM -arx -apt -asf -aaM -aaM -aaM -ait -ait -ait +aoY +oWD +aoY +aoY +kFl +eks +tPU +kCZ +xqK +wYl +iak +cXA +rUz +rUz +rUz +rUz ahV ahV ahV -aaP -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -35776,7 +36951,6 @@ aaM aaM aaM aaM -aaM aDR ahV aaP @@ -35968,39 +37142,40 @@ aaM aaM aaM aaM -aaM ahM -aaP -aaP +aaM +aaM +ahV ahV ahV ahV aoY apv apH +tRd +bsu +apI +gVU aoY -apt -apt -aql -aqx -aaM -aaM -aaM -aaM -arx -arM -asf -aaM -aaM -aaM -aaM -aaM -ait +uPx +eks +oOm +qql +wHU +xqK +iak +qmV +rUz +rUz +rUz ahV ahV ahV ahV -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -36033,7 +37208,6 @@ aaM aaM aaM aaM -aaM aDR ahV aaP @@ -36225,40 +37399,40 @@ aaM aaM aaM aaM +ahM aaM -ahM -ahM -aaP +ahV +ahV ahV ahV ahV aoY apw -apI +apH +apH apM -apt -apt -apt -aqy -aaM -aaM -aaM -aaM -aqR -arN -aqR -aaM -aaM -aaM -aaM -aaM -aaM +apI +apI +nQl +eks +eks +eks +dql +xqK +xqK +nUb +crO +ahV +rUz +rUz ahV ahV ahV ahV -aaP -ahM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -36482,40 +37656,40 @@ aaM aaM aaM aaM -aaM -aaM ahM -aaP +aaM +ahV +ahV ahV ahV ahV aoY apx apJ +rGG +cti +apI +jEI aoY -apS -apt -aqm -aoY -aaM -aaM -aaM -aqR -aqR -arO -aqR -aqR -aaM -aaM -aaM -aaM -aaM -ait +cxK +arw +crO +cxK +usI +arM +tUf +crO +ahV +ahV +rUz ahV ahV ahV -aaP -aaP +ahV +ahV +aaM +aaM +aaM ahM aaM aaM @@ -36739,40 +37913,40 @@ aaM aaM aaM aaM +ahM aaM -ahM -ahM -aaP +ahV +ahV ahV aoY aoY aoY aoY aoY +eOF +oXr +jEJ +oHy aoY -aoY -apY -aoY -aoY -aaM -aaM -aqQ -aqR -ary -arO -asg -aqR -asG -aaM -aaM -aaM -aaM ait +ait +ait +ait +arx +bTT +fZi +ait +ait +ait +rUz ahV ahV ahV ahV -aaP +ahV +aaM +aaM +aaM ahM aaM aaM @@ -36996,40 +38170,40 @@ aaM aaM aaM aaM -aaM ahM -aaP -aaP +aaM +ahV +ahV ahV aoY api -api -api +owO +khB aoY apN aXW -apt +imz aqn -aoY -aaM -aaM -aqR -aqR -aqY -arP -aqY -aqR -aqR +nlu aaM aaM aaM aaM -ait -ait +arx +arM +fZi +aaM +aaM +aaM +aaM +rUz ahV ahV ahV -aaP +ahV +aaM +aaM +aaM ahM aaM aaM @@ -37253,40 +38427,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM +ahV ahV ahV aoY mrx apj -apj +iOS aoY apO -apt -apt +imz +imz aqo aqz aaM aaM -aqR -arf -arz -arz -arz -ast -aqR +aaM +aaM +rPy +omW +rPy aaM aaM aaM aaM -aaM -ait +rUz +qTX ahV ahV ahV -aaP +aaM +aaM +aaM ahM aaM aaM @@ -37510,40 +38684,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM +ahV ahV ahV aoY uQh -apt -apt +apj +apj apK -apt -apt -apZ -aqp -aqx -aaM +imz +imz +imz +aqn +ibx aaM +khV aqY -arg -arz -arz -arz -asu +rPy +rPy +haK +rPy +rPy +kUG aqY aaM aaM +rUz +rUz +ahV +ahV +ahV aaM aaM -aaM -ahV -ahV -ahV -ahV -aaP ahM aaM aaM @@ -37767,40 +38941,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM +ahV ahV ahV aoY gVd -apl +gVd apy aoY apP -apt -aqa +sMa +imz aXX -aqx +aoY aaM -aaM -aqY -arh +rPy +qBg +rPy arz -arQ -arz -asv -aqY +haK +xwI +rPy +iDB +rPy aaM aaM -aaM -aaM -aVx -aVx +rUz +rUz +rUz ahV ahV ahV -aaP +aaM ahM aaM aaM @@ -38024,40 +39198,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM +ahV ahV ahV aoY +bmV +bmV aoY aoY aoY aoY -apQ -apT aqb -aqr -aqx +aoY +aoY aaM -aqQ -aqR -ari -arz -arQ -arz -asw -aqR -asG +rPy +rPy +rPy +jpR +haK +odN +rPy +rPy +rPy aaM -aaM -aaM -aVA +rUz +rUz +rUz +rUz ahV ahV ahV -ahV -aaP +aaM ahM aaM aaM @@ -38281,40 +39455,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM ahV ahV ahV -ait -aaM -aaM aoY aoY aoY -aqc -aqs -aqA +aoY +aoY aaM -aqR -aqR -arj -arz +arx +jXZ +asf +aaM +aaM +rPy +rPy +rPy +qpe arQ -arz -asx -aqR -aqR +qpe +rPy +rPy +rPy aaM -aaM -aaM -aVx -aVx +rUz +ahV +rUz +rUz +rUz ahV ahV -ahV -aaP +aaM ahM aaM aaM @@ -38538,40 +39712,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM ahV ahV ahV -ait +aoY +aoY +aoY +aoY +aoY +cCo +hyq +jXZ +asf aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aqR aqR ark -arz -arz -arz +cVE +jSZ +xgn asy -aqR -aqR +lIz aaM aaM -aaM -aVx -aVx -aVx +rUz ahV ahV -aaP +rUz +rUz +ahV +aaM +aaM ahM aaM aaM @@ -38795,40 +39969,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM ahV ahV ahV -ait -ait -ait +aoY +cQv +fiE +tTc +gZC +sgR +jXZ +qsr +asf aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aqY +aqR arg -arz -arQ -arz +rhl +dzu +wNn asu -aqY +lIz aaM aaM -aaM -aaM -aVx -aVx -aVx -aVx ahV -aaP +ahV +ahV +ahV +rUz +ahV +aaM +aaM ahM aaM aaM @@ -39052,40 +40226,40 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM ahV ahV ahV -ahV -ahV -ait +aoY +aoY +aoY +aoY +aoY +qFs +lEG +jXZ +asf aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aqY -arh -arz -arQ -arz +aqR +oHH +xKx +piD +vjY asz -aqY -aaM -aaM +lIz aaM aaM ahV ahV -aVx ahV ahV -aaP +ahV +ahV +aaM +aaM ahM aaM aaM @@ -39309,9 +40483,32 @@ aaM aaM aaM aaM -aaM ahM -aaP +aaM +ahV +ahV +ahV +ahV +ahV +ahV +ahV +aoY +aaM +arx +jXZ +asf +aaM +aaM +khV +rPy +mqM +gjo +klF +uCD +fiG +rPy +aqY +aaM ahV ahV ahV @@ -39320,29 +40517,6 @@ ahV ahV aaM aaM -aaM -aaM -aaM -aaM -aaM -aqQ -aqR -aqR -arz -arz -arz -aqR -aqR -asG -aaM -aaM -aaM -ahV -ahV -ahV -ahV -ahV -aaP ahM aaM aaM @@ -39566,40 +40740,40 @@ aaM aaM aaM aaM -aaM ahM -aaP -ahV -ahV -ahV -ahV -ahV -ahV -ahV aaM +ahV +ahV +ahV +ahV +ahV +ahV +ahV +aoY +aoY +aoY +nDW +aoY +aoY aaM -aaM -aaM -aaM -aaM -aqR -aqR -aqR +rPy +rPy +mVR arA arR ash -aqR -aqR -aqR -aaM -aaM +hAh +rPy +rPy aaM aaM ahV ahV ahV ahV -aaP +aaM +aaM +aaM ahM aaM aaM @@ -39823,12 +40997,33 @@ aaM aaM aaM aaM -aaM ahM -aaP -aaP -aaP -aaP +aaM +ahV +ahV +ahV +ahV +aoY +aoY +aoY +aoY +hnl +fXv +apI +jEI +aoY +aaM +rPy +rPy +icJ +arA +arR +ash +okY +rPy +rPy +aaM +aaM ahV ahV ahV @@ -39836,27 +41031,6 @@ ahV aaM aaM aaM -aaM -aaM -aaM -aaM -aqR -aqR -arB -arS -asi -aqR -aqR -aaM -aaM -aaM -aaM -aaM -ahV -ahV -ahV -ahV -aaP ahM aaM aaM @@ -40080,40 +41254,40 @@ aaM aaM aaM aaM -aaM ahM -ahM -ahM -ahM -aaP +aaM ahV ahV ahV ahV -ahV -aaM -aaM -aaM -aaM -aaM +aoY +apu +ueV +aoY +mjX +apI +apI +wDV +aZX aaM aaM aqR -arC -arz -arC -aqR -aaM -aaM -aaM +wgr +arA +arR +ash +xOV +lIz aaM aaM aaM ahV ahV ahV -ahV -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -40337,40 +41511,40 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM ahM -aaP -aaP +aaM ahV ahV ahV ahV -aaM -aaM -aaM -aaM -aaM +aoY +rqm +apI +uue +apI +apI +cKC +sHB +vdf aaM aaM aqR -aqR -arT -aqR -aqR -aaM -aaM +wgr +arA +arR +ash +xOV +lIz aaM aaM aaM ahV ahV ahV -ahV -ahV -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -40594,40 +41768,40 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM ahM -ahM -aaP -aaP -aaP +aaM +aaM ahV ahV -aaM -aaM -aaM -aaM -aaM +ahV +aoY +nuP +apI +aoY +vZI +apI +pHE +hOa +vdf aaM aaM aqR -arD -arU -asj -aqR -aaM -aaM -aaM +wgr +arA +arR +ash +xOV +lIz aaM aaM ahV ahV ahV ahV -ahV -aaP +aaM +aaM +aaM +aaM ahM aaM aaM @@ -40851,40 +42025,40 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM ahM -ahM -ahV -aaP -ahV -ahV -ahV -aaM -aaM -aaM -aaM -aaM -aaM -aqR -arE -arV -ask -aqR -aaM -aaM -aaM -aaM aaM aaM ahV ahV ahV +aoY +jCl +feQ +aoY +gZS +vAv +xvz +oqN +vdf +aaM +khV +rPy +mVR +arA +arR +ash +hAh +rPy +aqY +aaM ahV -aaP +ahV +ahV +ahV +aaM +aaM +aaM +aaM ahM aaM aaM @@ -41108,40 +42282,40 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM -ahV -aaP +aaM +aaM ahV ahV -aVy +ahV +aoY +aoY +aoY +aoY +aoY +aoY +ffx +lqo +lhD aaM -aaM -aaM -aaM -aaM -aaM -aqR +rPy +rPy +icJ arF arW aVz -aqR -aaM -aaM -aaM -aaM +wgQ +rPy +rPy aaM aaM ahV ahV ahV ahV -aaP +aaM +aaM +aaM ahM aaM aaM @@ -41365,32 +42539,7 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM -ahV -ahV -ahV -aVx -aVx -aaM -aaM -aaM -aaM -aaM -aaM -aqR -aqY -aqY -aqY -aqR -aaM -aaM -aaM aaM aaM aaM @@ -41398,7 +42547,32 @@ ahV ahV ahV ahV -aaP +ahV +ahV +ahV +ahV +aaM +aaM +aaM +aaM +rPy +rPy +rPy +dQD +dQD +cQY +rPy +rPy +rPy +aaM +aaM +ahV +ahV +ahV +aaM +aaM +aaM +aaM ahM aaM aaM @@ -41622,32 +42796,7 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM -ahM -ahV -aVx -aVx -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -41655,7 +42804,32 @@ ahV ahV ahV ahV -aaP +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +rPy +rPy +rPy +cEy +hyh +tQE +rPy +rPy +rPy +aaM +aaM +ahV +ahV +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -41879,19 +43053,16 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM aaM aaM aaM +ahV +ahV +ahV +ahV aaM aaM aaM @@ -41899,20 +43070,23 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM +rPy +rPy +usD +hyh +dEX +rPy +rPy aaM aaM aaM ahV ahV -ahV -ahV -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -42136,27 +43310,11 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM aaM aaM -ahV -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -42166,10 +43324,26 @@ aaM aaM ahV ahV -ahV -ahV -ahV -aaP +aaM +aaM +aaM +rPy +rPy +wyr +arh +mZZ +rPy +rPy +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -42393,13 +43567,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM @@ -42411,22 +43578,29 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahV ahV -ahV -ahV -aaP -aaP +rUz +aaM +aaM +aaM +aaM +aqR +rJj +rhD +jMo +lIz +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -42650,13 +43824,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM @@ -42665,25 +43832,32 @@ ahV ahV ahV ahV +ahV +aaM +aaM +ahV +ahV +rUz +rUz aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM +aqR +dYV +tHU +cjR +lIz aaM aaM aaM ahV ahV -ahV -ahV -ahV -aaP -ahM +aaM +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -42907,13 +44081,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM @@ -42921,25 +44088,33 @@ aaM ahV ahV ahV +ahV +ahV +aaM +aaM +ahV +rUz +rUz +ahV aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aqR +cal +mDX +kBJ +lIz aaM aaM ahV ahV ahV ahV -ahV -aaP +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -42972,7 +44147,6 @@ aaM aaM aaM aaM -aaM aDR aDR aDR @@ -43164,39 +44338,40 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ahM aaM aaM aaM aaM ahV +ahV +ahV aaM aaM aaM aaM +rUz +ahV +ahV aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM +rPy +bpO +bpO +bpO +rPy aaM aaM ahV ahV -aaP -aaP -aaP +ahV +ahV +aaM +aaM +aaM +aaM +aaM ahM aaM aaM @@ -43305,7 +44480,6 @@ aaM aaM aaM aaM -aaM "} (44,1,1) = {" aaC @@ -43421,11 +44595,38 @@ aaM aaM aaM aaM +ahM aaM aaM aaM aaM aaM +ahV +ahV +ahV +aaM +aaM +aaM +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +ahV +ahV +ahV +aaM +aaM +aaM +aaM aaM aaM ahM @@ -43450,33 +44651,6 @@ aaM aaM aaM aaM -ahV -ahV -ahV -ahV -ahM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -43678,6 +44852,8 @@ aaM aaM aaM aaM +ahM +aaM aaM aaM aaM @@ -43685,36 +44861,34 @@ aaM aaM aaM aaM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM -ahM aaM aaM aaM +ahV +ahV +ahV +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +aaM +ahV +ahV +aaM +aaM +aaM +aaM +aaM +aaM +ahM +aaM +aaM aaM aaM aaM @@ -43935,6 +45109,7 @@ aaM aaM aaM aaM +ahM aaM aaM aaM @@ -43968,8 +45143,7 @@ aaM aaM aaM aaM -aaM -aaM +ahM aaM aaM aaM @@ -44192,6 +45366,7 @@ aaM aaM aaM aaM +ahM aaM aaM aaM @@ -44225,8 +45400,7 @@ aaM aaM aaM aaM -aaM -aaM +ahM aaM aaM aaM @@ -44449,6 +45623,7 @@ aaM aaM aaM aaM +ahM aaM aaM aaM @@ -44482,8 +45657,7 @@ aaM aaM aaM aaM -aaM -aaM +ahM aaM aaM aaM @@ -44706,41 +45880,41 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM +ahM aaM aaM aaM @@ -56416,31 +57590,31 @@ aaM "} (95,1,1) = {" aaI -aax -aaJ -aaA -aaG -aaA -aaK -aaE -aaH -aaC -aaL -aaB -aaJ -aay -aaD -aaF -aaz -aaE -aaK -aaC -aax -aaH -aaF -aay -aaB -aaL +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI aaM ahn aaY @@ -56672,7 +57846,7 @@ ahM aaM "} (96,1,1) = {" -aaJ +aaI abg aav abm @@ -56697,7 +57871,7 @@ aat aar abh abj -aax +aaI aaM ahn aaQ @@ -56929,7 +58103,7 @@ ahM aaM "} (97,1,1) = {" -aaK +aaI abh aaw abj @@ -56954,7 +58128,7 @@ aau aas abi abk -aay +aaI aaM ahn aaX @@ -57186,7 +58360,7 @@ ahM aaM "} (98,1,1) = {" -aaL +aaI abi abf abk @@ -57211,7 +58385,7 @@ aav aat abm abl -aaz +aaI aaM ahn aaY @@ -57443,7 +58617,7 @@ ahM aaM "} (99,1,1) = {" -aax +aaI abm abg abl @@ -57468,7 +58642,7 @@ aaw aau abj aaq -aaA +aaI aaM ahn aaY @@ -57700,7 +58874,7 @@ ahM aaM "} (100,1,1) = {" -aay +aaI abj abh aaq @@ -57725,7 +58899,7 @@ abf aav abk aar -aaB +aaI aaM ahn ahn @@ -57957,7 +59131,7 @@ aaM aaM "} (101,1,1) = {" -aaz +aaI abk abi aar @@ -57982,7 +59156,7 @@ abg aaw abl aas -aaC +aaI aaM aaM aaM @@ -58214,7 +59388,7 @@ aaM aaM "} (102,1,1) = {" -aaA +aaI abl abm aas @@ -58239,7 +59413,7 @@ abh abf aaq aat -aaD +aaI aaM aaM aaM @@ -58471,7 +59645,7 @@ aaM aaM "} (103,1,1) = {" -aaB +aaI aaq abj aat @@ -58496,7 +59670,7 @@ abi abg aar aau -aaE +aaI aaM aaM aaM @@ -58728,7 +59902,7 @@ aaM aaM "} (104,1,1) = {" -aaC +aaI aar abk aau @@ -58753,7 +59927,7 @@ abm abh aas aav -aaF +aaI aaM aaM aaM @@ -58985,7 +60159,7 @@ aaM aaM "} (105,1,1) = {" -aaD +aaI aas abl aav @@ -59010,7 +60184,7 @@ abj abi aat aaw -aaG +aaI aaM aaM aaM @@ -59242,7 +60416,7 @@ aaM aaM "} (106,1,1) = {" -aaE +aaI aat aaq aaw @@ -59267,7 +60441,7 @@ abk abm aau abf -aaH +aaI aaM aaM aaM @@ -59499,7 +60673,7 @@ aaM aaM "} (107,1,1) = {" -aaF +aaI aau aar abf @@ -59756,7 +60930,7 @@ aaM aaM "} (108,1,1) = {" -aaG +aaI aav aas abg @@ -59781,7 +60955,7 @@ aaq abk aaw abh -aaJ +aaI aaM aaM aaM @@ -60013,7 +61187,7 @@ aaM aaM "} (109,1,1) = {" -aaH +aaI aaw aas aaw @@ -60038,7 +61212,7 @@ aar abl abf abi -aaK +aaI aaM aaM aaM @@ -60295,7 +61469,7 @@ aas aaq abg abm -aaL +aaI aaM aaM aaM @@ -60527,7 +61701,7 @@ aaM aaM "} (111,1,1) = {" -aaJ +aaI abg aau abg @@ -60552,7 +61726,7 @@ aat aar abh abj -aax +aaI aaM aaM aaM @@ -60784,7 +61958,7 @@ aaM aaM "} (112,1,1) = {" -aaK +aaI abh aav abh @@ -60809,7 +61983,7 @@ aau aas abi abk -aay +aaI aaM aaM aaM @@ -61041,7 +62215,7 @@ aaM aaM "} (113,1,1) = {" -aaL +aaI abi abf abk @@ -61066,7 +62240,7 @@ aav aat abm abl -aaz +aaI aaM aaM aaM @@ -61298,7 +62472,7 @@ aaM aaM "} (114,1,1) = {" -aax +aaI abm abg abl @@ -61323,7 +62497,7 @@ aaw aau abj aaq -aaA +aaI aaM aaM aaM @@ -61555,7 +62729,7 @@ aaM aaM "} (115,1,1) = {" -aay +aaI abj abh aaq @@ -61580,7 +62754,7 @@ abf aav abk aar -aaB +aaI aaM aaM aaM @@ -61812,7 +62986,7 @@ aaM aaM "} (116,1,1) = {" -aaz +aaI abk abi aar @@ -61837,7 +63011,7 @@ abg aaw abl aas -aaC +aaI aaM aaM aaM @@ -62069,7 +63243,7 @@ aaM aaM "} (117,1,1) = {" -aaA +aaI abl abm aas @@ -62094,7 +63268,7 @@ abh abf aaq aat -aaD +aaI aaM aaM aaM @@ -62326,7 +63500,7 @@ aaM aaM "} (118,1,1) = {" -aaB +aaI aaq abj aat @@ -62351,7 +63525,7 @@ abi abg aar aau -aaE +aaI aaM aaM aaM @@ -62583,7 +63757,7 @@ aaM aaM "} (119,1,1) = {" -aaC +aaI aar abk aau @@ -62608,7 +63782,7 @@ abm abh aas aav -aaF +aaI aaM aaM aaM @@ -62840,7 +64014,7 @@ aaM aaM "} (120,1,1) = {" -aaD +aaI aas abl aav @@ -62865,7 +64039,7 @@ abj abi aat aaw -aaG +aaI aaM aaM aaM @@ -63097,7 +64271,7 @@ aaM aaM "} (121,1,1) = {" -aaE +aaI aat aaq aaw @@ -63122,7 +64296,7 @@ abk abm aau abf -aaH +aaI aaM aaM aaM @@ -63354,7 +64528,7 @@ aaM aaM "} (122,1,1) = {" -aaF +aaI aau aar abf @@ -63611,39 +64785,32 @@ aaM aaM "} (123,1,1) = {" -aaG -aaK -aaH -aay -aaE -aay aaI -aaC -aaF -aaA -aaJ -aaz -aaH -aaL -aaB -aaD -aax -aaC aaI -aaA -aaK -aaF -aaD -aaL -aaz -aaJ -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI aaM aaM aaM @@ -63653,6 +64820,13 @@ aaM aaM aaM aaM +agZ +agZ +agZ +agZ +agZ +agZ +agZ aaM aaM aaM @@ -63868,6 +65042,32 @@ aSp aaM "} (124,1,1) = {" +aaI +abg +aav +abm +aas +abm +aaw +aaq +aat +abk +abf +abj +aav +abh +abl +aar +abi +aaq +aaw +abk +abg +aat +aar +abh +abj +aaI aaM aaM aaM @@ -63877,39 +65077,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +ahc +ahi +agZ +aho +ahi +agZ aaM aaM aaM @@ -64125,6 +65299,32 @@ aSp aaM "} (125,1,1) = {" +aaI +abh +aaw +abj +aat +abj +abf +aav +aav +aav +aav +adT +adT +adT +adT +adT +aav +aav +aav +aav +abh +aau +aas +abi +abk +aaI aaM aaM aaM @@ -64134,39 +65334,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +ahd +ahg +agZ +ahk +ahd +agZ aaM aaM aaM @@ -64382,6 +65556,32 @@ aSp aSp "} (126,1,1) = {" +aaI +abi +abf +abk +aau +abk +aav +aav +adT +adT +adT +adT +qck +qck +qck +adT +adT +adT +adT +aav +aav +aav +aat +abm +abl +aaI aaM aaM aaM @@ -64391,39 +65591,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +agZ +agZ +agZ +agZ +ahq +agZ aaM aaM aaM @@ -64639,6 +65813,32 @@ aUT aSp "} (127,1,1) = {" +aaI +abm +abg +abl +aav +abl +aaw +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +aaw +aaw +aau +abj +aaq +aaI aaM aaM aaM @@ -64648,39 +65848,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +ahc +ahi +agZ +ahc +ahi +agZ aaM aaM aaM @@ -64896,6 +66070,32 @@ aUT aSp "} (128,1,1) = {" +aaI +abj +abh +aaq +aaw +aaq +abf +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abf +abf +aav +abk +aar +aaI aaM aaM aaM @@ -64905,39 +66105,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +ahe +ahj +agZ +ahk +ahd +agZ aaM aaM aaM @@ -65153,6 +66327,32 @@ aUT aSp "} (129,1,1) = {" +aaI +abk +abi +aar +abf +aar +abg +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abg +abg +aaw +abl +aas +aaI aaM aaM aaM @@ -65162,39 +66362,13 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +agZ +agZ +agZ +agZ +agZ +agZ aaM aaM aaM @@ -65410,21 +66584,32 @@ aUU aSp "} (130,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +abl +abm +aas +abg +aas +abh +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abh +abh +abf +aaq +aat +aaI aaM aaM aaM @@ -65435,23 +66620,12 @@ aaM aaM aaM agZ +ahf +ahi agZ +ahp +ahi agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -65667,21 +66841,32 @@ aUV aSp "} (131,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aaq +abj +aat +abh +aat +abi +aav +adT +adT +qck +qck +qck +qck +qck +qck +qck +adT +adT +aav +abi +abi +abg +aar +aau +aaI aaM aaM aaM @@ -65692,11 +66877,11 @@ aaM aaM aaM agZ -ahc -ahi +ahg +ahd agZ -aho -ahi +ahd +ahr agZ aaM aaM @@ -65707,17 +66892,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM jaZ ajR akf @@ -65924,21 +67098,32 @@ aUW aSp "} (132,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aar +abk +aau +abi +aau +abm +aav +aav +adT +qck +qck +qck +qck +qck +qck +qck +adT +aav +aav +abm +abm +abh +aas +aav +aaI aaM aaM aaM @@ -65949,23 +67134,12 @@ aaM aaM aaM agZ -ahd -ahg agZ -ahk -ahd agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +agZ +agZ +agZ aaM aaM aaM @@ -66181,21 +67355,32 @@ aUX aSp "} (133,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aas +abl +aav +abm +aav +abj +aav +adT +adT +qck +qck +qck +qck +qck +qck +qck +adT +adT +aav +abj +abj +abi +aat +aaw +aaI aaM aaM aaM @@ -66206,23 +67391,12 @@ aaM aaM aaM agZ +ahc +ahi agZ +ahc +ahi agZ -agZ -agZ -ahq -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -66438,21 +67612,32 @@ aUI aSp "} (134,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aaq +aaw +abj +aaw +abk +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abk +abk +abm +aau +abf +aaI aaM aaM aaM @@ -66463,11 +67648,11 @@ aaM aaM aaM agZ -ahc -ahi +ahd +ahk agZ -ahc -ahi +ahg +ahs agZ aaM aaM @@ -66478,17 +67663,6 @@ aaM aaM aaM aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM ajJ ajJ ajJ @@ -66695,21 +67869,32 @@ aUY aSp "} (135,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aau +aar +abf +abk +abf +abl +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abl +abl +abj +aav +abg +aaI aaM aaM aaM @@ -66720,23 +67905,12 @@ aaM aaM aaM agZ -ahe -ahj agZ -ahk -ahd agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +agZ +agZ +agZ +agZ aaM aaM aaM @@ -66952,6 +68126,32 @@ aUZ aSp "} (136,1,1) = {" +aaI +aav +aas +abg +abl +abg +aaq +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +aaq +aaq +abk +aaw +abh +aaI aaM aaM aaM @@ -66976,32 +68176,6 @@ aaM aaM aaM aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67209,6 +68383,32 @@ aVa aSp "} (137,1,1) = {" +aaI +aaw +aas +aaw +aat +abh +aar +aav +adT +adT +qck +qck +qck +qck +qck +qck +qck +adT +adT +aav +aar +aar +abl +abf +abi +aaI aaM aaM aaM @@ -67233,32 +68433,6 @@ aaM aaM aaM aaM -agZ -ahf -ahi -agZ -ahp -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67466,6 +68640,32 @@ aVb aSp "} (138,1,1) = {" +aaI +abf +aat +abf +aau +abi +aas +aav +aav +adT +qck +qck +qck +qck +qck +qck +qck +adT +aav +aav +aas +aas +aaq +abg +abm +aaI aaM aaM aaM @@ -67490,32 +68690,6 @@ aaM aaM aaM aaM -agZ -ahg -ahd -agZ -ahd -ahr -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67723,6 +68897,32 @@ aVc aSp "} (139,1,1) = {" +aaI +abg +aau +abg +aav +abm +aat +aav +adT +adT +qck +qck +qck +qck +qck +qck +qck +adT +adT +aav +aat +aat +aar +abh +abj +aaI aaM aaM aaM @@ -67747,32 +68947,6 @@ aaM aaM aaM aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -67980,6 +69154,32 @@ aVd aSp "} (140,1,1) = {" +aaI +abh +aav +abh +aaw +abj +aau +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +aau +aau +aas +abi +abk +aaI aaM aaM aaM @@ -68004,32 +69204,6 @@ aaM aaM aaM aaM -agZ -ahc -ahi -agZ -ahc -ahi -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -68237,6 +69411,32 @@ aVe aSp "} (141,1,1) = {" +aaI +abi +abf +abk +aau +abk +aav +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +aav +aav +aat +abm +abl +aaI aaM aaM aaM @@ -68261,32 +69461,6 @@ aaM aaM aaM aaM -agZ -ahd -ahk -agZ -ahg -ahs -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -68494,6 +69668,32 @@ aSp aSp "} (142,1,1) = {" +aaI +abm +abg +abl +aav +abl +aaw +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +aaw +aaw +aau +abj +aaq +aaI aaM aaM aaM @@ -68518,32 +69718,6 @@ aaM aaM aaM aaM -agZ -agZ -agZ -agZ -agZ -agZ -agZ -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM aaM aaM aaM @@ -68751,32 +69925,32 @@ aSp aaM "} (143,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +abj +abh +aaq +aaw +aaq +abf +aav +adT +qck +qck +qck +qck +qck +qck +qck +qck +qck +adT +aav +abf +abf +aav +abk +aar +aaI aaM aaM aaM @@ -69008,32 +70182,32 @@ aSp aaM "} (144,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +abk +abi +aar +abf +aar +abg +aav +adT +adT +qck +qck +qck +qck +qck +qck +qck +adT +adT +aav +abg +abg +aaw +abl +aas +aaI aaM aaM aaM @@ -69265,32 +70439,32 @@ aaM aaM "} (145,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +abl +abm +aas +abg +aas +abh +aav +aav +adT +qck +qck +qck +qck +qck +qck +qck +adT +aav +aav +abh +abh +abf +aaq +aat +aaI aaM aaM aaM @@ -69522,32 +70696,32 @@ aaM aaM "} (146,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aaq +abj +aat +abh +aat +abi +aav +aav +adT +adT +qck +qck +qck +qck +qck +adT +adT +aav +aav +abi +abi +abg +aar +aau +aaI aaM aaM aaM @@ -69779,32 +70953,32 @@ aaM aaM "} (147,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aar +abk +aau +abi +aau +abm +aav +aav +aav +adT +qck +qck +qck +qck +qck +adT +aav +aav +aav +abm +abm +abh +aas +aav +aaI aaM aaM aaM @@ -70036,32 +71210,32 @@ aaM aaM "} (148,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aas +abl +aav +abm +aav +abj +aav +aav +aav +adT +qck +qck +qck +qck +qck +adT +aav +aav +aav +abj +abj +abi +aat +aaw +aaI aaM aaM aaM @@ -70293,32 +71467,32 @@ aaM aaM "} (149,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aaq +aaw +abj +aaw +aar +aav +aav +aav +adT +qck +qck +qck +qck +qck +adT +aav +aav +aav +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -70550,32 +71724,32 @@ aaM aaM "} (150,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aau +aar +abf +abk +abf +aas +aav +aav +aav +adT +adT +adT +adT +adT +adT +adT +aav +aav +aav +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -70807,32 +71981,32 @@ aaM aaM "} (151,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -71064,32 +72238,32 @@ aaM aaM "} (152,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -71321,32 +72495,32 @@ aaM aaM "} (153,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -71578,32 +72752,32 @@ aaM aaM "} (154,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -71835,32 +73009,32 @@ aaM aaM "} (155,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -72092,32 +73266,32 @@ aaM aaM "} (156,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aat +aaI aaM aaM aaM @@ -72349,32 +73523,32 @@ aaM aaM "} (157,1,1) = {" -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM -aaM +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI +aaI aaM aaM aaM @@ -79850,7 +81024,7 @@ doN ods lIe bWA -sRY +fMb sRY sRY sFu diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index cdc14976d24..60beaffdef2 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -16883,9 +16883,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/hallway/secondary/entry/aft) -"DV" = ( -/turf/unsimulated/floor/asteroid/ash, -/area/merchant_ship/docked) "DW" = ( /turf/simulated/wall, /area/quartermaster/loading) @@ -24125,6 +24122,9 @@ }, /turf/simulated/floor/plating, /area/maintenance/cargo/surface) +"Rf" = ( +/turf/unsimulated/floor/asteroid/ash, +/area/shuttle/merchant/station) "Rg" = ( /obj/machinery/porta_turret{ dir = 6 @@ -59602,13 +59602,13 @@ aa aa aa aa -aw +aa aa EM Fk EM aa -aw +aa aa aa aa @@ -59855,19 +59855,19 @@ JZ JZ KR JH -aw -aa -aa aa aw aw -DV -DV -DV aw aw -aa -aa +aw +Rf +Rf +Rf +aw +aw +aw +aw aa aa aa @@ -60113,18 +60113,18 @@ Km oc KV aw -aa -aa -aa aw -DV -DV -DV -DV -DV aw -aa -aa +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -60370,18 +60370,18 @@ KO oc KW aw +aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf aw -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa aa aa aa @@ -60627,18 +60627,18 @@ KO oc KW aw +aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf aw -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa aa aa aa @@ -60885,17 +60885,17 @@ oc KW aw aw -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -61142,17 +61142,17 @@ oc KW aw aa -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -61398,18 +61398,18 @@ Km oc KY aw -aa -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa +aw +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -61654,19 +61654,19 @@ mt mt KS JH +aa +aw +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aw -aa -aa -DV -DV -DV -DV -DV -DV -DV -DV -DV -aa aa aa aa @@ -61913,17 +61913,17 @@ JH JH aw aw -aa -DV -DV -DV -DV -DV -DV -DV -DV -DV -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -62169,18 +62169,18 @@ aw aw aw aw -aa -aa -DV -DV -DV -DV -DV -DV -DV -DV -DV -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -62425,19 +62425,19 @@ aw aw aa aa +aa +aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf aw -aa -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa aa aa aa @@ -62684,17 +62684,17 @@ aa aa aa aa -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -62941,17 +62941,17 @@ aa aa aa aa -aa -DV -DV -DV -DV -DV -DV -DV -DV -DV -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -63198,17 +63198,17 @@ aa aa aa aa -aa -DV -DV -DV -DV -DV -DV -DV -DV -DV -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -63455,17 +63455,17 @@ aa aa aa aa -aa -aa -DV -DV -DV -DV -DV -DV -DV -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -63712,17 +63712,17 @@ aa aa aa aa -aa -aa -aa -DV -DV -DV -DV -DV -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -63969,17 +63969,17 @@ aa aa aa aa -aa -aa -aa -DV -DV -DV -DV -DV -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -64226,17 +64226,17 @@ aa aa aa aa -aa -aa -aa -DV -DV -DV -DV -DV -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -64483,17 +64483,17 @@ aa aa aa aa -aa -aa -aa -DV -DV -DV -DV -DV -aa -aa -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -64741,15 +64741,15 @@ aa aa aa aa -aa -aa -DV -DV -DV -DV -DV -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -64998,15 +64998,15 @@ aa aa aa aa -aa -aa -DV -DV -DV -DV -DV -aa -aa +aw +aw +Rf +Rf +Rf +Rf +Rf +aw +aw aa aa aa @@ -65256,13 +65256,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -65513,13 +65513,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -65770,13 +65770,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +aw +Rf +Rf +Rf +Rf +Rf +aw aa aa aa @@ -66027,13 +66027,13 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa +aw +aw +aw +aw +aw +aw +aw aa aa aa diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm index 2dffe06e7c9..332ba8d6e85 100644 --- a/maps/aurora/code/aurora_shuttles.dm +++ b/maps/aurora/code/aurora_shuttles.dm @@ -78,12 +78,15 @@ shuttle = new() shuttle.location = 1 - shuttle.warmup_time = 10 - shuttle.area_offsite = locate(/area/merchant_ship/start) - shuttle.area_station = locate(/area/merchant_ship/docked) + shuttle.warmup_time = 5 + shuttle.area_offsite = locate(/area/shuttle/merchant/start) + shuttle.area_station = locate(/area/shuttle/merchant/station) shuttle.docking_controller_tag = "merchant_shuttle" shuttle.dock_target_station = "merchant_shuttle_dock" shuttle.dock_target_offsite = "merchant_station" + shuttle.area_transition = locate(/area/shuttle/merchant/transit) + shuttle.transit_direction = EAST + shuttle.move_time = 20 shuttles["Merchant"] = shuttle START_PROCESSING(shuttle_controller, shuttle)