diff --git a/code/datums/outfits/ert/deathsquad.dm b/code/datums/outfits/ert/deathsquad.dm index 2c3f92668ac..807d1574315 100644 --- a/code/datums/outfits/ert/deathsquad.dm +++ b/code/datums/outfits/ert/deathsquad.dm @@ -68,3 +68,46 @@ H.put_in_hands(mercrig) H.equip_to_slot_or_del(mercrig, slot_back) addtimer(CALLBACK(mercrig, TYPE_PROC_REF(/obj/item/rig, toggle_seals), H, TRUE), 2 SECONDS) + belt_contents = list( + /obj/item/ammo_magazine/a454 = 2, + /obj/item/melee/baton/loaded = 1, + /obj/item/shield/energy = 1, + /obj/item/grenade/flashbang = 2, + /obj/item/handcuffs = 2, + /obj/item/grenade/frag = 1 + ) + + id_iff = IFF_DEATHSQUAD + +/obj/outfit/admin/deathsquad/nt + name = "NanoTrasen Asset Protection Trooper" + + back = /obj/item/rig/ert/ntassetprotection +/obj/outfit/admin/deathsquad/nt/leader + name = "NanoTrasen Asset Protection Lead" + + back = /obj/item/rig/ert/ntassetprotection/lead + +/obj/outfit/admin/deathsquad/nt/get_id_access() + return get_all_accesses() + +/obj/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + var/obj/item/clothing/accessory/holster/armpit/hold = new(H) + var/obj/item/gun/projectile/weapon + + + if(syndie) + weapon = new /obj/item/gun/projectile/silenced(H) + else + weapon = new /obj/item/gun/projectile/revolver/mateba(H) + + if(weapon) + hold.contents += weapon + hold.holstered = weapon + + var/obj/item/clothing/under/U = H.get_equipped_item(slot_w_uniform) + U.attackby(hold, H) diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index b1663cb4ed1..afe186fa79c 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -128,6 +128,16 @@ id_icon = "ccia" id_access = "CCIA Agent" +/obj/outfit/admin/nt/vip + name = "Very Important Person" + + uniform = /obj/item/clothing/under/suit_jacket/nt_skirtsuit + shoes = /obj/item/clothing/shoes/flats + wrist = /obj/item/clothing/wrists/watch/gold + l_ear = /obj/item/device/radio/headset/ert/ccia + id = /obj/item/card/id/ccia + l_pocket = /obj/item/reagent_containers/spray/pepper + /obj/outfit/admin/nt/odinsec name = "NTCC Odin Security Specialist" diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm index cfbab08caba..52ecd0e2a66 100644 --- a/code/game/turfs/simulated/shuttle_turfs.dm +++ b/code/game/turfs/simulated/shuttle_turfs.dm @@ -120,6 +120,12 @@ /turf/simulated/wall/shuttle/raider color = "#6C7364" +/turf/simulated/wall/shuttle/hapt + color = "#2E2B2B" + +/turf/simulated/wall/shuttle/hapt/blue + color = "#3c526f" + /turf/simulated/wall/shuttle/legion color = "#5F78A0" diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert.dm index 1639e9e9ec3..b07570367f3 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert.dm @@ -245,3 +245,44 @@ /obj/item/rig/ert/assetprotection/empty initial_modules = list() +/obj/item/rig/ert/ntassetprotection + name = "\improper heavy asset protection suit control module" + desc = "A heavy suit worn by the highest level of Asset Protection, don't mess with the person wearing this. Armored and space ready." + suit_type = "heavy asset protection" + icon = 'icons/clothing/rig/nt_asset_protection.dmi' + icon_state = "asset_protection_rig" + icon_supported_species_tags = null + armor = list( + melee = ARMOR_MELEE_SHIELDED, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_HEAVY, + energy = ARMOR_ENERGY_SHIELDED, + bomb = ARMOR_BOMB_RESISTANT, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + slowdown = 0 + emp_protection = 50 + + species_restricted = list(BODYTYPE_HUMAN) + + initial_modules = list( + /obj/item/rig_module/ai_container, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/grenade_launcher, + /obj/item/rig_module/vision/multi, + /obj/item/rig_module/mounted/pulse, + /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/chem_dispenser/injector, + /obj/item/rig_module/device/drill, + /obj/item/rig_module/device/rfd_c, + /obj/item/rig_module/datajack, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/recharger + ) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA // all modules + +/obj/item/rig/ert/ntassetprotection/lead + icon = 'icons/clothing/rig/nt_asset_protection_commander.dmi' + icon_state = "c_asset_protection_rig" diff --git a/code/modules/ghostroles/spawner/human/admin/ccia.dm b/code/modules/ghostroles/spawner/human/admin/ccia.dm index df972253f0a..9892893364d 100644 --- a/code/modules/ghostroles/spawner/human/admin/ccia.dm +++ b/code/modules/ghostroles/spawner/human/admin/ccia.dm @@ -28,6 +28,17 @@ mob_name_pick_message = "Pick a name." +/datum/ghostspawner/human/admin/corporate/vip + short_name = "vip" + name = "Very Important Person" + + outfit = /obj/outfit/admin/nt/vip + + assigned_role = "VIP" + special_role = "VIP" + + mob_name_pick_message = "Pick a name." + /datum/ghostspawner/human/admin/corporate/ccia_agent/New() desc = "Board the [SSatlas.current_map.station_name], annoy crew with your interviews and get squashed by your own shuttle." ..() diff --git a/code/modules/shuttles/antagonist.dm b/code/modules/shuttles/antagonist.dm index fbbe1800059..6e943684081 100644 --- a/code/modules/shuttles/antagonist.dm +++ b/code/modules/shuttles/antagonist.dm @@ -30,3 +30,10 @@ req_access = list(ACCESS_SYNDICATE) shuttle_tag = "Merc Elite" light_color = LIGHT_COLOR_RED + +/obj/machinery/computer/shuttle_control/multi/crescent + name = "shuttle control console" + req_access = list(ACCESS_CENT_SPECOPS) + shuttle_tag = "ICV Crescent" + light_color = LIGHT_COLOR_RED + can_rename_ship = TRUE diff --git a/html/changelogs/changelog.yml b/html/changelogs/changelog.yml new file mode 100644 index 00000000000..52021cb9b7b --- /dev/null +++ b/html/changelogs/changelog.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: ReadThisNamePlz, Noblerow + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a working HAPT shuttle." + - rscadd: "Added the VIP ghostrole to the CCIA Ghostspawner." + - rscadd: "Added a modified HAPT suit for NT HAPT use only." + - imageadd: "Added new sprites for the tweaked HAPT suit" diff --git a/icons/clothing/rig/nt_asset_protection.dmi b/icons/clothing/rig/nt_asset_protection.dmi new file mode 100644 index 00000000000..05b0c35a871 Binary files /dev/null and b/icons/clothing/rig/nt_asset_protection.dmi differ diff --git a/icons/clothing/rig/nt_asset_protection_commander.dmi b/icons/clothing/rig/nt_asset_protection_commander.dmi new file mode 100644 index 00000000000..6b10163ed8c Binary files /dev/null and b/icons/clothing/rig/nt_asset_protection_commander.dmi differ diff --git a/maps/_common/areas/shuttles.dm b/maps/_common/areas/shuttles.dm index 15c869d2037..701048cccd8 100644 --- a/maps/_common/areas/shuttles.dm +++ b/maps/_common/areas/shuttles.dm @@ -78,7 +78,7 @@ name = "Naval Transport Shuttle" area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_SPAWN_ROOF | AREA_FLAG_NO_CREW_EXPECTED -/area/shuttle/administration +/area/shuttle/hapt name = "Unidentified Corvette" base_turf = /turf/unsimulated/floor/plating sound_environment = SOUND_AREA_LARGE_ENCLOSED diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 9efa2564459..acd1d6c7ab0 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -2803,7 +2803,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, -/turf/unsimulated/floor/plating, +/turf/unsimulated/floor{ + icon_state = "dark_preview" + }, /area/centcom/specops) "ajY" = ( /obj/machinery/vending/coffee/free{ @@ -3172,22 +3174,6 @@ }, /turf/simulated/floor/airless, /area/template_noop) -"amk" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"amq" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "amr" = ( /turf/unsimulated/floor{ icon_state = "wood" @@ -3623,14 +3609,6 @@ }, /turf/space/dynamic, /area/shuttle/skipjack) -"aoN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aoO" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -3899,14 +3877,6 @@ /obj/item/bedsheet/random, /turf/simulated/floor/carpet, /area/shuttle/skipjack) -"aqt" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aqu" = ( /turf/unsimulated/floor, /area/centcom/bar) @@ -3990,14 +3960,6 @@ }, /turf/simulated/floor/shuttle/dark_blue, /area/supply/dock) -"atT" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,21"; - name = "military corvette" - }, -/area/shuttle/administration) "atW" = ( /turf/simulated/wall/shuttle/unique/cargo{ icon_state = "6,6" @@ -4131,14 +4093,6 @@ icon_state = "tiled_preview" }, /area/centcom/holding) -"axQ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "axR" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -4176,7 +4130,7 @@ /area/centcom/bar) "ayM" = ( /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /obj/machinery/door/airlock/centcom{ icon = 'icons/obj/doors/Doorglass.dmi'; @@ -4508,9 +4462,6 @@ }, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_battlemonsters) -"aDs" = ( -/turf/simulated/floor/shuttle/dark_blue, -/area/shuttle/escape) "aDA" = ( /obj/structure/dueling_table/no_collide/above_layer{ icon_state = "top_right" @@ -5702,20 +5653,6 @@ icon_state = "plating" }, /area/centcom/spawning) -"aLe" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,21"; - name = "military corvette" - }, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aLg" = ( /obj/structure/shuttle_part/arrivals{ desc = "A state-of-the-art unmanned automatic crew transport shuttle."; @@ -5935,14 +5872,6 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) -"aMN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aMT" = ( /obj/effect/floor_decal/corner/red/full, /turf/unsimulated/floor, @@ -5959,9 +5888,6 @@ "aMW" = ( /turf/unsimulated/floor, /area/centcom/spawning) -"aNc" = ( -/turf/unsimulated/floor/plating, -/area/centcom/spawning) "aNe" = ( /obj/machinery/door/airlock/hatch{ req_access = list(150); @@ -6687,14 +6613,6 @@ icon_state = "wood" }, /area/centcom/specops) -"aRw" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,21"; - name = "military corvette" - }, -/area/shuttle/administration) "aRx" = ( /obj/item/device/megaphone/red{ pixel_x = 1; @@ -6777,20 +6695,6 @@ }, /turf/simulated/floor/bluegrid, /area/tdome) -"aUs" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,21"; - name = "military corvette" - }, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aVf" = ( /obj/effect/landmark{ name = "Penguin Spawn Random" @@ -7460,14 +7364,6 @@ icon_state = "tiled_preview" }, /area/centcom/spawning) -"bcf" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,20"; - name = "military corvette" - }, -/area/shuttle/administration) "bcu" = ( /obj/machinery/light/small{ brightness_power = 0.5; @@ -7581,22 +7477,6 @@ icon_state = "lino_diamond" }, /area/centcom/bar) -"bex" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "3,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"beD" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,20"; - name = "military corvette" - }, -/area/shuttle/administration) "bfa" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/bottle/vodka{ @@ -7668,14 +7548,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"bfM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "bfN" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -7694,14 +7566,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"bgv" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,19"; - name = "military corvette" - }, -/area/shuttle/administration) "bhd" = ( /obj/structure/bed/stool/chair/shuttle{ dir = 8 @@ -7821,17 +7685,6 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"bjP" = ( -/obj/structure/closet/walllocker/firecloset{ - pixel_x = 30 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bjR" = ( /obj/structure/table/rack, /obj/item/plastique{ @@ -8100,17 +7953,9 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"bsJ" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bsS" = ( /obj/structure/table/standard, -/obj/item/storage/box/fancy/tray{ - }, +/obj/item/storage/box/fancy/tray, /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/unsimulated/floor{ icon_state = "white" @@ -8128,16 +7973,6 @@ icon_state = "dark_preview" }, /area/centcom/ferry) -"btz" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "btV" = ( /turf/simulated/wall/shuttle/unique/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -8151,21 +7986,6 @@ }, /turf/unsimulated/floor, /area/antag/burglar) -"buU" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/spline/plain/black{ - dir = 4 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1399; - id_tag = "admin_shuttle"; - pixel_x = -1; - pixel_y = 33; - req_one_access = list(101); - tag_door = "admin_shuttle_hatch" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bvm" = ( /obj/machinery/door/window/westleft{ name = "Auxillary Cryogenics" @@ -8196,13 +8016,6 @@ }, /turf/space/dynamic, /area/shuttle/skipjack) -"bwY" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 8 - }, -/area/shuttle/administration) "bxL" = ( /obj/machinery/pipedispenser/disposal/orderable, /obj/effect/floor_decal/industrial/outline/yellow, @@ -8214,18 +8027,6 @@ icon_state = "tiled_preview" }, /area/centcom/legion/hangar5) -"bxU" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 4; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "bye" = ( /obj/effect/decal/fake_object/light_source{ density = 1; @@ -8445,14 +8246,6 @@ /obj/structure/bed/stool/chair/office/bridge/pilot, /turf/simulated/floor/shuttle/black, /area/shuttle/burglar) -"bDV" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "bEa" = ( /obj/machinery/door/airlock/centcom{ name = "Washroom" @@ -8553,21 +8346,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) -"bGZ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,18"; - name = "military corvette" - }, -/area/shuttle/administration) -"bHu" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/closet/hazmat/general, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bHJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/liquid_fuel, @@ -8607,13 +8385,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"bJt" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bJv" = ( /obj/machinery/door/airlock/glass, /turf/unsimulated/floor{ @@ -8726,16 +8497,6 @@ icon_state = "2,7" }, /area/shuttle/mercenary) -"bNz" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/spline/plain/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bOg" = ( /obj/structure/table/wood, /obj/item/paper_bin{ @@ -8792,16 +8553,6 @@ "bQP" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/holding) -"bQT" = ( -/obj/item/modular_computer/console/preset/command, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/item/modular_computer/console/preset/medical{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bQZ" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -8850,18 +8601,6 @@ icon_state = "tiled_preview" }, /area/centcom/legion/hangar5) -"bSQ" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "bTd" = ( /obj/structure/table/rack, /obj/item/tank/oxygen/red, @@ -9311,18 +9050,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"ckf" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 8; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "ckl" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "1,0" @@ -9407,14 +9134,6 @@ name = "Skipjack" }, /area/shuttle/skipjack) -"con" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,17"; - name = "military corvette" - }, -/area/shuttle/administration) "cor" = ( /obj/effect/ghostspawpoint{ identifier = "TCFLSentinel"; @@ -9612,19 +9331,6 @@ }, /turf/space/dynamic, /area/shuttle/mercenary) -"cus" = ( -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "cvf" = ( /obj/structure/sign/poster{ icon_state = "tcflposter2"; @@ -9888,15 +9594,6 @@ /obj/structure/railing/mapped, /turf/unsimulated/floor/plating, /area/centcom/bar) -"cHo" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "cHx" = ( /obj/machinery/light{ dir = 8; @@ -10079,14 +9776,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/mercenary) -"cMJ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,16"; - name = "military corvette" - }, -/area/shuttle/administration) "cMK" = ( /obj/machinery/door/airlock/glass_command{ name = "Cell 2"; @@ -10337,14 +10026,6 @@ /obj/effect/decal/cleanable/dirt, /turf/unsimulated/floor/plating, /area/centcom/legion/hangar5) -"cSQ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,15"; - name = "military corvette" - }, -/area/shuttle/administration) "cSV" = ( /turf/unsimulated/wall/fakepdoor{ name = "Blast door" @@ -10359,14 +10040,6 @@ }, /turf/space/dynamic, /area/shuttle/skipjack) -"cUg" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "3,15"; - name = "military corvette" - }, -/area/shuttle/administration) "cUG" = ( /turf/simulated/wall/shuttle/unique/ert{ icon_state = "8,3" @@ -10559,14 +10232,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/specops) -"cYJ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,20"; - name = "military corvette" - }, -/area/shuttle/administration) "cYR" = ( /obj/structure/shuttle_part/arrivals{ desc = "A state-of-the-art unmanned automatic crew transport shuttle."; @@ -10596,10 +10261,8 @@ req_one_access = list(101); tag_door = "arrival_shuttle_hatch" }, -/obj/structure/flora/ausbushes/sparsegrass{ - }, -/obj/structure/flora/ausbushes/fullgrass{ - }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/pottedplant{ icon_state = "plant-01"; pixel_x = 2; @@ -10640,10 +10303,6 @@ icon_state = "black" }, /area/antag/ninja) -"dar" = ( -/obj/effect/floor_decal/corner/red, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dau" = ( /obj/structure/lattice/catwalk/indoor, /obj/machinery/door/blast/odin/open{ @@ -10699,14 +10358,6 @@ icon_state = "wood" }, /area/antag/raider) -"dbS" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,15"; - name = "military corvette" - }, -/area/shuttle/administration) "dbW" = ( /obj/effect/decal/fake_object{ name = "service ladder"; @@ -10759,14 +10410,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/legion) -"dcY" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,15"; - name = "military corvette" - }, -/area/shuttle/administration) "ddn" = ( /obj/structure/window/reinforced/crescent{ dir = 8 @@ -10825,7 +10468,7 @@ "dff" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/atmospherics/pipe/tank/air{ - dir = 8; + dir = 8 }, /turf/simulated/floor/plating, /area/shuttle/skipjack) @@ -10898,14 +10541,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"dhY" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,15"; - name = "military corvette" - }, -/area/shuttle/administration) "dib" = ( /obj/structure/ore_box{ icon_state = "orebox1" @@ -11059,14 +10694,6 @@ /obj/effect/floor_decal/corner/paleblue, /turf/unsimulated/floor, /area/centcom/holding) -"dos" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "doP" = ( /turf/unsimulated/floor{ icon_state = "wood_preview" @@ -11092,18 +10719,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"dpi" = ( -/obj/machinery/iv_drip, -/obj/machinery/vending/wallmed1{ - pixel_x = 28; - req_access = null - }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dpM" = ( /obj/structure/bed/stool/bar/padded/red, /turf/unsimulated/floor{ @@ -11126,15 +10741,6 @@ icon_state = "dark_preview" }, /area/centcom/specops) -"dqO" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dqP" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -11166,14 +10772,6 @@ icon_state = "carpet" }, /area/antag/raider) -"dtJ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "12,15"; - name = "military corvette" - }, -/area/shuttle/administration) "dtU" = ( /obj/effect/map_effect/window_spawner/reinforced/crescent, /obj/structure/sign/staff_only{ @@ -11230,22 +10828,6 @@ icon_state = "wood" }, /area/centcom/control) -"dwf" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"dxz" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "dxC" = ( /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/light{ @@ -11283,12 +10865,6 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) -"dzL" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "6,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "dzN" = ( /turf/simulated/wall/shuttle/unique/raider{ desc = "A quick, agile and sturdy shuttle. Perfect for smugglers and pirates, but recently proliferated in civilian hands."; @@ -11389,8 +10965,7 @@ /obj/item/rfd_ammo, /obj/item/rfd_ammo, /obj/item/rfd_ammo, -/obj/item/rfd/construction{ - }, +/obj/item/rfd/construction, /turf/unsimulated/floor{ icon_state = "tiled_preview" }, @@ -11443,14 +11018,6 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/specops) -"dHA" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,14"; - name = "military corvette" - }, -/area/shuttle/administration) "dHW" = ( /obj/machinery/chemical_dispenser/bar_soft/full{ pixel_y = 7 @@ -11609,55 +11176,6 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"dKe" = ( -/obj/structure/bed/stool/chair/padded/beige, -/turf/unsimulated/floor{ - icon_state = "wood" - }, -/area/centcom/bar) -"dKm" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Heavy Asset Protection"; - req_access = list(103) - }, -/obj/item/rig_module/mounted, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/shoes/magboots, -/obj/item/melee/baton/loaded, -/obj/item/storage/belt/security/tactical, -/obj/item/handcuffs, -/obj/item/handcuffs, -/obj/item/pinpointer/advpinpointer, -/obj/item/rig_module/mounted/plasmacutter, -/obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/under/syndicate/combat, -/obj/item/gun/energy/rifle/pulse, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun/incendiary, -/obj/item/ammo_magazine/assault_shotgun/shells, -/obj/item/gun/projectile/automatic/rifle/shotgun, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dKp" = ( /obj/machinery/light{ icon_state = "tube_empty" @@ -11929,18 +11447,6 @@ icon_state = "carpet" }, /area/antag/raider) -"dUP" = ( -/obj/machinery/body_scanconsole{ - dir = 4 - }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 28 - }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dUS" = ( /obj/structure/table/stone/marble, /obj/item/reagent_containers/food/condiment/enzyme{ @@ -12028,15 +11534,13 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/effect/floor_decal/corner/lime/diagonal, /obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /obj/structure/sign/nosmoking_1{ pixel_y = 30 }, @@ -12044,19 +11548,6 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"dWT" = ( -/obj/machinery/bodyscanner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "dWZ" = ( /obj/effect/landmark{ name = "CCIAEscort" @@ -12242,14 +11733,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) -"ebw" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,14"; - name = "military corvette" - }, -/area/shuttle/administration) "eby" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/fake_object{ @@ -12263,22 +11746,6 @@ icon_state = "tiled_preview" }, /area/centcom/legion) -"ecM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"edh" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "edG" = ( /turf/simulated/floor/tiled/ramp/bottom{ dir = 1 @@ -12365,15 +11832,6 @@ /obj/structure/closet/wardrobe/orange, /turf/unsimulated/floor, /area/centcom/legion) -"egh" = ( -/obj/effect/landmark{ - name = "tdome2" - }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tdome/tdome2) "egj" = ( /obj/machinery/light{ dir = 1; @@ -12429,26 +11887,10 @@ /obj/item/rig/ert/medical, /turf/unsimulated/floor/plating, /area/centcom/specops) -"ejt" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,20"; - name = "military corvette" - }, -/area/shuttle/administration) "ejA" = ( /obj/structure/sign/directions/cryo, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/ferry) -"ejY" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,13"; - name = "military corvette" - }, -/area/shuttle/administration) "ekC" = ( /obj/machinery/sleeper{ dir = 4 @@ -12498,14 +11940,6 @@ name = "shuttle bay blast door" }, /area/centcom/specops) -"eng" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "12,20"; - name = "military corvette" - }, -/area/shuttle/administration) "enn" = ( /obj/machinery/computer/slot_machine, /turf/unsimulated/floor{ @@ -12606,14 +12040,6 @@ /obj/machinery/papershredder, /turf/unsimulated/floor, /area/antag/mercenary) -"eri" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,11"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "erT" = ( /obj/structure/shuttle_part/raider{ icon_state = "16,1" @@ -12658,42 +12084,6 @@ icon_state = "white" }, /area/tdome/tdomeadmin) -"esU" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Heavy Asset Protection"; - req_access = list(103) - }, -/obj/item/rig_module/mounted, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/shoes/magboots, -/obj/item/melee/baton/loaded, -/obj/item/storage/belt/security/tactical, -/obj/item/handcuffs, -/obj/item/handcuffs, -/obj/item/pinpointer/advpinpointer, -/obj/item/rig_module/mounted/plasmacutter, -/obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/under/syndicate/combat, -/obj/item/gun/energy/rifle/pulse, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun/incendiary, -/obj/item/ammo_magazine/assault_shotgun/shells, -/obj/item/gun/projectile/automatic/rifle/shotgun, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "eta" = ( /obj/structure/closet/crate/trashcart{ anchored = 1; @@ -12791,12 +12181,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"exm" = ( -/obj/effect/floor_decal/corner/green{ - dir = 6 - }, -/turf/unsimulated/floor, -/area/centcom/bar) "exn" = ( /obj/structure/shuttle_part/arrivals{ desc = "A state-of-the-art unmanned automatic crew transport shuttle."; @@ -12805,12 +12189,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/arrival) -"exK" = ( -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "exX" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/chair{ @@ -12834,15 +12212,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/evac) -"eyk" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "eyM" = ( /obj/item/device/flashlight/lamp{ pixel_x = 6 @@ -12988,34 +12357,6 @@ }, /turf/space/dynamic, /area/shuttle/skipjack) -"eEK" = ( -/obj/machinery/sleeper{ - dir = 8 - }, -/obj/structure/closet/walllocker/medical/secure{ - name = "blood closet"; - pixel_x = 30; - pixel_y = -1; - req_access = null - }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"eEN" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "eEO" = ( /obj/machinery/door/airlock/centcom{ name = "Laundry"; @@ -13068,14 +12409,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"eFP" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "eGb" = ( /obj/structure/coatrack, /turf/unsimulated/floor{ @@ -13111,21 +12444,6 @@ icon_state = "lino_diamond" }, /area/centcom/bar) -"eHl" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 - }, -/area/shuttle/administration) -"eHG" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,12"; - name = "military corvette" - }, -/area/shuttle/administration) "eHI" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "14,7" @@ -13156,14 +12474,6 @@ }, /turf/unsimulated/floor, /area/centcom/holding) -"eIA" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,11"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "eIJ" = ( /obj/random/pottedplant{ anchored = 1; @@ -13188,14 +12498,6 @@ /obj/effect/map_effect/window_spawner/reinforced/crescent, /turf/simulated/floor, /area/centcom/holding) -"eJU" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,11"; - name = "military corvette" - }, -/area/shuttle/administration) "eKl" = ( /obj/structure/lattice/catwalk/indoor, /obj/effect/decal/cleanable/dirt, @@ -13222,14 +12524,6 @@ "eLv" = ( /turf/simulated/wall/elevator, /area/centcom/legion) -"eLI" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,10"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "eLJ" = ( /turf/simulated/wall/shuttle/unique/burglar{ icon_state = "8,0" @@ -13580,14 +12874,6 @@ }, /turf/unsimulated/floor, /area/centcom/bar) -"eWF" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,10"; - name = "military corvette" - }, -/area/shuttle/administration) "eXA" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -13638,16 +12924,6 @@ name = "transport shuttle" }, /area/shuttle/escape) -"eZA" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/status_display{ - pixel_x = 34 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "eZI" = ( /obj/structure/shuttle_part/raider{ density = 0; @@ -14083,43 +13359,13 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) -"fpJ" = ( -/obj/structure/bed/stool/chair/office/bridge/pilot, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"fpP" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black, -/obj/item/storage/belt/utility/very_full, -/obj/item/storage/belt/utility/very_full, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/structure/closet/crate/drop/grey, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "fpS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 }, -/turf/unsimulated/floor/plating, +/turf/unsimulated/floor{ + icon_state = "dark_preview" + }, /area/centcom/specops) "fpW" = ( /obj/machinery/light/small/emergency{ @@ -14257,14 +13503,6 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"ftN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,9"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fuj" = ( /obj/structure/shuttle_part/transfer{ density = 0; @@ -14280,14 +13518,6 @@ icon_state = "tiled_preview" }, /area/centcom/specops) -"fuH" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,9"; - name = "military corvette" - }, -/area/shuttle/administration) "fuZ" = ( /obj/structure/lattice/catwalk/indoor/grate/light/old{ icon_state = "grate_light_dam2" @@ -14322,14 +13552,6 @@ }, /turf/simulated/floor/tiled/white, /area/merchant_station) -"fvp" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,9"; - name = "military corvette" - }, -/area/shuttle/administration) "fvz" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/paleblue/diagonal{ @@ -14368,14 +13590,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/legion) -"fvS" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fwl" = ( /obj/machinery/sleeper{ dir = 4 @@ -14471,14 +13685,6 @@ "fAY" = ( /turf/simulated/floor/shuttle/black, /area/shuttle/burglar) -"fBT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fCl" = ( /obj/item/storage/box/cdeathalarm_kit{ pixel_x = -9; @@ -14553,14 +13759,6 @@ }, /turf/simulated/floor/tiled, /area/merchant_station) -"fEU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fEX" = ( /obj/effect/floor_decal/corner/grey/full{ dir = 4 @@ -14618,14 +13816,6 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/syndicate_elite) -"fFH" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,8"; - name = "military corvette" - }, -/area/shuttle/administration) "fFJ" = ( /obj/machinery/door/airlock/hatch{ name = "Thruster Access" @@ -14763,12 +13953,6 @@ icon_state = "lino_diamond" }, /area/centcom/bar) -"fKq" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "fKx" = ( /obj/structure/shuttle_part/cargo{ icon_state = "0,1" @@ -14828,15 +14012,6 @@ icon_state = "carpet7-3" }, /area/antag/raider) -"fMD" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/item/device/radio/intercom/east{ - pixel_y = -22 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "fMR" = ( /obj/structure/lattice/catwalk, /turf/template_noop, @@ -14997,45 +14172,12 @@ "fRx" = ( /turf/unsimulated/floor/elevatorshaft, /area/centcom/legion) -"fSi" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,8"; - name = "military corvette" - }, -/area/shuttle/administration) "fSp" = ( /turf/unsimulated/floor{ dir = 8; icon_state = "tiled_preview" }, /area/centcom/ferry) -"fSu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"fSy" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"fSP" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "7,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fSX" = ( /obj/structure/shuttle_part/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -15195,14 +14337,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/distress) -"fVu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fVC" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/industrial/warning{ @@ -15231,12 +14365,6 @@ /obj/item/device/camera, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) -"fWE" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "fWO" = ( /obj/effect/ghostspawpoint{ identifier = "OdinBartender"; @@ -15251,15 +14379,6 @@ icon_state = "wood_preview" }, /area/antag/raider) -"fXt" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "8,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "fXv" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -15305,38 +14424,6 @@ /obj/structure/closet/walllocker/emerglocker/west, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/escape) -"fZf" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"fZs" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"fZU" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,7"; - name = "military corvette" - }, -/area/shuttle/administration) -"gaA" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,7"; - name = "military corvette" - }, -/area/shuttle/administration) "gaD" = ( /obj/structure/sign/directions/com{ dir = 1; @@ -15367,14 +14454,6 @@ name = "staircase" }, /area/centcom/spawning) -"gbG" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gbL" = ( /obj/structure/lattice, /obj/structure/grille, @@ -15427,14 +14506,6 @@ icon_state = "wood" }, /area/centcom/evac) -"gdl" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gdz" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 @@ -15509,14 +14580,6 @@ icon_state = "1,3" }, /area/shuttle/mercenary) -"ggC" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ggE" = ( /obj/random/tool, /turf/unsimulated/floor/plating, @@ -15560,14 +14623,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"gij" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "giw" = ( /obj/machinery/light{ dir = 8; @@ -15618,14 +14673,6 @@ icon_state = "desert0" }, /area/centcom/shared_dream) -"gke" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gkg" = ( /obj/effect/decal/cleanable/blood/oil, /turf/unsimulated/floor, @@ -15690,22 +14737,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/unsimulated/floor/plating, /area/centcom/legion) -"glK" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"glX" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gmv" = ( /turf/simulated/wall/shuttle/unique/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -15729,14 +14760,6 @@ }, /turf/simulated/floor/wood, /area/centcom/shared_dream) -"gmY" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gnj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/fake_object{ @@ -15785,15 +14808,6 @@ }, /turf/unsimulated/floor/plating, /area/antag/loner) -"gol" = ( -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "gou" = ( /obj/structure/filingcabinet, /turf/unsimulated/floor{ @@ -15913,14 +14927,6 @@ /obj/structure/computerframe, /turf/simulated/floor/tiled/dark, /area/centcom/bar) -"gql" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,6"; - name = "military corvette" - }, -/area/shuttle/administration) "grz" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -15962,14 +14968,6 @@ icon_state = "lino_diamond" }, /area/centcom/bar) -"gty" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,6"; - name = "military corvette" - }, -/area/shuttle/administration) "gtA" = ( /obj/structure/closet{ icon_door = "blue"; @@ -16013,14 +15011,6 @@ icon_state = "3,2" }, /area/shuttle/syndicate_elite) -"guy" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "guL" = ( /obj/effect/floor_decal/industrial/loading/yellow{ dir = 1 @@ -16078,14 +15068,6 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"gvB" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gvF" = ( /obj/structure/window/shuttle/unique/mercenary{ icon_state = "6,24" @@ -16208,11 +15190,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"gyU" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "gzj" = ( /obj/machinery/light/small{ dir = 1 @@ -16252,14 +15229,6 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"gAL" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gAT" = ( /obj/machinery/light, /turf/simulated/floor/shuttle/dark_blue, @@ -16300,31 +15269,6 @@ permit_ao = 0 }, /area/antag/wizard) -"gCK" = ( -/obj/item/storage/belt/utility/very_full, -/obj/item/clothing/gloves/yellow, -/obj/item/crowbar/red, -/obj/item/clothing/glasses/welding/superior, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = -2 - }, -/obj/item/stack/material/glass{ - amount = 50; - pixel_x = 1 - }, -/obj/item/storage/bag/inflatable, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/obj/structure/table/reinforced/steel, -/obj/structure/closet/crate/drop/grey, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "gDr" = ( /obj/structure/table/rack, /obj/item/clothing/mask/breath, @@ -16433,8 +15377,7 @@ /area/antag/burglar) "gGx" = ( /obj/structure/bed/stool/chair/office/bridge/pilot, -/obj/structure/extinguisher_cabinet/north{ - }, +/obj/structure/extinguisher_cabinet/north, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "gGS" = ( @@ -16449,14 +15392,6 @@ icon_state = "8,6" }, /area/shuttle/legion) -"gHC" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gIf" = ( /obj/machinery/door/airlock/hatch{ frequency = 1337; @@ -16706,14 +15641,6 @@ icon_state = "freezer" }, /area/centcom/distress_prep) -"gOD" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "8,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gON" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -16732,14 +15659,6 @@ /obj/structure/table/reinforced, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) -"gPb" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gPm" = ( /turf/unsimulated/floor{ icon_state = "tiled_preview" @@ -16922,14 +15841,6 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, /area/shuttle/syndicate_elite) -"gTS" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gTY" = ( /obj/machinery/door/airlock/glass{ name = "Infirmary"; @@ -16944,22 +15855,6 @@ /obj/effect/step_trigger/thrower/shuttle/north, /turf/template_noop, /area/template_noop) -"gUq" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,5"; - name = "military corvette" - }, -/area/shuttle/administration) -"gUu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gUK" = ( /obj/effect/decal/fake_object{ density = 1; @@ -17005,14 +15900,6 @@ }, /turf/space/dynamic, /area/template_noop) -"gVL" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,5"; - name = "military corvette" - }, -/area/shuttle/administration) "gVU" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -17138,17 +16025,9 @@ }, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion) -"gYL" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "gYQ" = ( /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /obj/effect/decal/fake_object{ density = 1; @@ -17172,7 +16051,7 @@ /area/shuttle/escape) "gYV" = ( /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /obj/effect/decal/fake_object{ density = 1; @@ -17230,18 +16109,6 @@ icon_state = "0,9" }, /area/supply/dock) -"hap" = ( -/obj/machinery/recharger{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/device/megaphone/red, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "hax" = ( /obj/machinery/computer/shuttle_control/multi/distress, /obj/effect/floor_decal/corner/paleblue{ @@ -17257,14 +16124,6 @@ }, /turf/unsimulated/floor, /area/centcom/legion) -"hbu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hbO" = ( /obj/machinery/mech_recharger, /obj/effect/floor_decal/corner/paleblue{ @@ -17308,23 +16167,6 @@ /obj/structure/girder, /turf/unsimulated/floor/plating, /area/antag/raider) -"hfx" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"hfK" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "hfT" = ( /obj/structure/railing/mapped{ dir = 4 @@ -17366,14 +16208,6 @@ icon_state = "beach" }, /area/centcom/shared_dream) -"hhu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hhU" = ( /obj/machinery/optable, /obj/machinery/light{ @@ -17399,14 +16233,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) -"hif" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "him" = ( /obj/effect/floor_decal/corner/red/full, /turf/unsimulated/floor{ @@ -17423,14 +16249,6 @@ /obj/structure/reagent_dispensers/lube, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) -"hiQ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hjw" = ( /turf/unsimulated/floor{ dir = 4; @@ -17724,11 +16542,6 @@ /obj/effect/shuttle_landmark/arrival/start, /turf/simulated/floor/shuttle/dark_blue, /area/shuttle/arrival) -"htq" = ( -/obj/structure/bed/stool/chair/office/bridge/pilot, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "huh" = ( /obj/machinery/acting/changer, /turf/unsimulated/floor{ @@ -17805,14 +16618,6 @@ icon_state = "wood_preview" }, /area/centcom/evac) -"hyd" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,15"; - name = "military corvette" - }, -/area/shuttle/administration) "hyh" = ( /obj/structure/table/wood, /obj/random/plushie, @@ -17964,12 +16769,6 @@ /obj/item/storage/box/zipties, /turf/unsimulated/floor, /area/centcom/legion/hangar5) -"hDh" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "7,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "hDo" = ( /obj/machinery/door/airlock/centcom{ name = "Security Checkpoint"; @@ -18051,14 +16850,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"hHn" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hHP" = ( /obj/effect/map_effect/window_spawner/reinforced/crescent, /turf/unsimulated/floor/plating, @@ -18158,14 +16949,6 @@ /obj/structure/bed/stool/chair/shuttle, /turf/simulated/floor/shuttle/black, /area/shuttle/distress) -"hNV" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hNX" = ( /obj/structure/window/reinforced/crescent{ dir = 8 @@ -18209,14 +16992,6 @@ icon_state = "bcircuit" }, /area/centcom/control) -"hOD" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hOM" = ( /obj/effect/decal/fake_object{ dir = 4; @@ -18373,14 +17148,6 @@ /obj/random/toolbox, /turf/unsimulated/floor/plating, /area/centcom/spawning) -"hUU" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,3"; - name = "military corvette" - }, -/area/shuttle/administration) "hVx" = ( /obj/machinery/light{ dir = 4; @@ -18478,14 +17245,6 @@ }, /turf/space/dynamic, /area/shuttle/mercenary) -"hYK" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "1,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "hYV" = ( /obj/structure/table/reinforced/steel, /obj/structure/window/reinforced{ @@ -18676,14 +17435,6 @@ }, /turf/space/dynamic, /area/antag/raider) -"iez" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,15"; - name = "military corvette" - }, -/area/shuttle/administration) "ieC" = ( /obj/structure/flora/tree/jungle{ icon_state = "tree2" @@ -18769,23 +17520,6 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"igs" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"igz" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "igD" = ( /obj/structure/table/reinforced/wood, /obj/item/deck/cards, @@ -18849,14 +17583,6 @@ }, /turf/unsimulated/floor, /area/centcom/legion) -"ihZ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iiu" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -18955,14 +17681,6 @@ }, /turf/simulated/floor/tiled, /area/merchant_station) -"inU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iod" = ( /obj/item/ammo_magazine/mc9mm{ pixel_x = -3; @@ -19010,14 +17728,6 @@ icon_state = "tiled_preview" }, /area/antag/ninja) -"ioG" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ioV" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -19094,29 +17804,6 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) -"iqw" = ( -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"iqJ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,2"; - name = "military corvette" - }, -/area/shuttle/administration) -"iqM" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,2"; - name = "military corvette" - }, -/area/shuttle/administration) "iqR" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 @@ -19193,14 +17880,6 @@ }, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"itP" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iua" = ( /obj/structure/table/reinforced, /obj/machinery/recharger{ @@ -19565,20 +18244,6 @@ icon_state = "wood" }, /area/centcom/control) -"iFr" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/door/airlock/highsecurity{ - name = "Bridge"; - req_access = list(101); - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "iFM" = ( /turf/unsimulated/wall/fakeairlock{ icon_state = "door_locked"; @@ -19702,7 +18367,7 @@ "iKk" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/toilet{ - dir = 1; + dir = 1 }, /obj/machinery/light/small{ dir = 8; @@ -19737,26 +18402,10 @@ icon_state = "wood" }, /area/centcom/control) -"iKP" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,15"; - name = "military corvette" - }, -/area/shuttle/administration) "iLs" = ( /obj/effect/floor_decal/industrial/warning, /turf/unsimulated/floor/plating, /area/centcom/specops) -"iLO" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iLT" = ( /obj/structure/window/reinforced/crescent{ dir = 4 @@ -19784,32 +18433,6 @@ }, /turf/space/dynamic, /area/shuttle/mercenary) -"iMn" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"iMq" = ( -/obj/structure/railing/mapped, -/obj/item/storage/box/fancy/tray{ - }, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain/black, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "iMy" = ( /obj/structure/table/reinforced/steel, /obj/item/spacecash/c1000{ @@ -19835,13 +18458,6 @@ }, /turf/simulated/floor/wood, /area/merchant_station/warehouse) -"iMN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iNh" = ( /obj/structure/table/reinforced/steel, /obj/item/device/price_scanner, @@ -19868,20 +18484,6 @@ /obj/item/device/taperecorder, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) -"iOb" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 30 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "iOh" = ( /obj/structure/sign/greencross, /turf/simulated/wall/shuttle/unique/mercenary{ @@ -20008,14 +18610,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"iRA" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "iRS" = ( /obj/structure/window/reinforced{ dir = 4 @@ -20056,28 +18650,6 @@ /obj/effect/large_stock_marker, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) -"iSs" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/ramp, -/area/shuttle/administration) -"iSu" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,1"; - name = "military corvette" - }, -/area/shuttle/administration) -"iSG" = ( -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "iSL" = ( /obj/structure/table/reinforced/wood, /obj/item/reagent_containers/glass/rag{ @@ -20346,13 +18918,6 @@ icon_state = "white" }, /area/tdome/tdomeobserve) -"jdw" = ( -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "jdB" = ( /turf/simulated/wall/shuttle/unique/transfer{ desc = "A large, bloated shuttle designed for automated passenger transport."; @@ -20498,18 +19063,9 @@ icon_state = "intact-scrubbers"; name = "pipe" }, -/obj/structure/lattice/catwalk/indoor{ - }, +/obj/structure/lattice/catwalk/indoor, /turf/unsimulated/floor/plating, /area/centcom/checkpoint/fore) -"jkC" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,1"; - name = "military corvette" - }, -/area/shuttle/administration) "jlx" = ( /obj/effect/floor_decal/corner/lime/diagonal{ dir = 8 @@ -20518,14 +19074,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"jmU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "jnA" = ( /turf/simulated/wall/shuttle/unique/mercenary/small, /area/shuttle/syndicate_elite) @@ -20554,14 +19102,6 @@ icon_state = "bcircuit" }, /area/centcom/control) -"joQ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "joU" = ( /obj/structure/railing/mapped{ dir = 8 @@ -20632,12 +19172,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"jrN" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "jsg" = ( /obj/structure/grille, /obj/structure/window/reinforced/crescent{ @@ -20862,14 +19396,6 @@ /obj/structure/sign/electricshock, /turf/unsimulated/wall/darkshuttlewall, /area/centcom/legion) -"jCa" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "jCl" = ( /obj/structure/shuttle_part/merchant{ icon_state = "6,8" @@ -20934,14 +19460,6 @@ }, /turf/unsimulated/floor, /area/centcom/spawning) -"jDq" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "jDI" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced/crescent{ @@ -20952,14 +19470,6 @@ icon_state = "bcircuit" }, /area/centcom/control) -"jEc" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "jEd" = ( /obj/structure/shuttle_part/merchant{ icon_state = "7,8" @@ -21030,15 +19540,6 @@ }, /turf/space/dynamic, /area/shuttle/merchant) -"jGi" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "jGo" = ( /obj/structure/shuttle_part/merchant{ density = 0; @@ -21060,71 +19561,6 @@ }, /turf/space/dynamic, /area/shuttle/merchant) -"jGO" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/o2{ - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -2 - }, -/obj/structure/railing/mapped, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/reagent_containers/glass/bottle/bicaridine, -/obj/item/reagent_containers/glass/bottle/bicaridine, -/obj/item/reagent_containers/glass/bottle/dermaline, -/obj/item/reagent_containers/glass/bottle/dermaline, -/obj/item/reagent_containers/glass/bottle/dexalin_plus, -/obj/item/reagent_containers/glass/bottle/dexalin_plus, -/obj/item/reagent_containers/glass/bottle/mortaphenyl, -/obj/item/reagent_containers/glass/bottle/antitoxin, -/obj/item/reagent_containers/glass/bottle/peridaxon, -/obj/item/reagent_containers/glass/bottle/peridaxon, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, -/obj/item/reagent_containers/hypospray/combat, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/effect/floor_decal/spline/plain/black, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "jGV" = ( /obj/effect/floor_decal/corner/lime{ dir = 5 @@ -21277,24 +19713,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) -"jRl" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,0"; - name = "military corvette"; - outside_part = 0 - }, -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 1; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "jRx" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/westright{ @@ -21353,27 +19771,6 @@ "jTO" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/specops) -"jUu" = ( -/obj/item/clothing/suit/armor/carrier/ballistic, -/obj/item/clothing/under/rank/centcom_officer, -/obj/item/clothing/shoes/sneakers, -/obj/item/clothing/gloves/white, -/obj/item/clothing/glasses/sunglasses/sechud, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/head/beret/centcom/captain, -/obj/item/gun/energy/lawgiver, -/obj/item/card/id/centcom, -/obj/structure/closet/secure_closet/guncabinet{ - name = "captain's cabinet"; - req_access = list(101) - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "jUG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -21664,16 +20061,6 @@ "kci" = ( /turf/simulated/floor/shuttle/black, /area/shuttle/syndicate_elite) -"kdk" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black, -/obj/structure/closet/crate/freezer/rations, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "kdm" = ( /obj/structure/window/reinforced/crescent{ dir = 4 @@ -21719,20 +20106,6 @@ icon_state = "wood_preview" }, /area/centcom/legion/hangar5) -"keP" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"keV" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "kff" = ( /obj/structure/table/reinforced, /obj/item/modular_computer/handheld/pda/command/captain, @@ -21816,15 +20189,6 @@ /obj/structure/table/rack, /turf/unsimulated/floor/plating, /area/centcom/specops) -"kgY" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,0"; - name = "military corvette"; - opacity = 1 - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "khe" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/industrial/warning/corner{ @@ -21933,14 +20297,6 @@ icon_state = "wood" }, /area/antag/burglar) -"klc" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,10"; - name = "military corvette" - }, -/area/shuttle/administration) "kll" = ( /obj/structure/table/wood, /obj/item/newspaper, @@ -21985,14 +20341,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"kmO" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,16"; - name = "military corvette" - }, -/area/shuttle/administration) "kni" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon_state = "7,7" @@ -22067,20 +20415,6 @@ icon_state = "wood" }, /area/centcom/distress_prep) -"kqG" = ( -/obj/machinery/door/airlock/external{ - frequency = 1399; - icon_state = "door_locked"; - id_tag = "admin_shuttle_hatch"; - locked = 1; - name = "Corvette Hatch"; - req_access = list(13); - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/plasticflaps/airtight, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "kqN" = ( /obj/item/device/flashlight/flare, /obj/item/device/flashlight/flare, @@ -22108,15 +20442,6 @@ }, /turf/space/dynamic, /area/antag/raider) -"krm" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,0"; - name = "military corvette"; - opacity = 1 - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "krK" = ( /obj/structure/shuttle_part/transfer{ density = 0; @@ -22136,14 +20461,6 @@ /obj/structure/disposalpipe/segment, /turf/unsimulated/floor/plating, /area/tdome/tdomeobserve) -"krW" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ksI" = ( /obj/effect/decal/fake_object{ desc = "Ding."; @@ -22178,14 +20495,6 @@ /obj/effect/shuttle_landmark/research/interim, /turf/space/transit/bluespace/south, /area/template_noop) -"kuA" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,10"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "kvf" = ( /turf/unsimulated/floor, /area/centcom/ferry) @@ -22202,32 +20511,6 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /turf/unsimulated/floor, /area/centcom/holding) -"kwC" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,0"; - name = "military corvette"; - outside_part = 0 - }, -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 1; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"kwH" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "kxc" = ( /obj/machinery/conveyor{ dir = 4; @@ -22353,12 +20636,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/burglar) -"kCi" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "kCA" = ( /obj/structure/shuttle_part/ert{ icon_state = "3,0"; @@ -22494,14 +20771,6 @@ icon_state = "1,8" }, /area/shuttle/syndicate_elite) -"kHS" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,15"; - name = "military corvette" - }, -/area/shuttle/administration) "kIi" = ( /obj/structure/bed/stool/chair/padded/black{ dir = 4 @@ -23103,17 +21372,6 @@ }, /turf/unsimulated/floor, /area/centcom/holding) -"lbr" = ( -/obj/machinery/mech_recharger, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/mob/living/heavy_vehicle/premade/superheavy, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "lbB" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon_state = "18,7" @@ -23263,19 +21521,6 @@ }, /turf/space/dynamic, /area/shuttle/merchant) -"lhw" = ( -/obj/machinery/computer/shuttle_control/multi{ - req_access = list(101); - shuttle_tag = "Crescent Shuttle" - }, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/item/modular_computer/console/preset/security{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "lhC" = ( /obj/structure/shuttle_part/mercenary/small{ icon_state = "7,11" @@ -23372,14 +21617,6 @@ icon_state = "tiled_preview" }, /area/centcom/spawning) -"llc" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "llv" = ( /obj/structure/sign/electricshock, /turf/unsimulated/wall/darkshuttlewall, @@ -23479,14 +21716,6 @@ /obj/item/pen, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) -"lov" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "loL" = ( /obj/machinery/light{ dir = 4; @@ -23737,14 +21966,6 @@ icon_state = "tiled_preview" }, /area/antag/raider) -"lxO" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "lzh" = ( /obj/item/clothing/gloves/yellow/specialu, /obj/item/clothing/gloves/yellow/specialt, @@ -24778,14 +22999,6 @@ icon_state = "6,9" }, /area/shuttle/syndicate_elite) -"mdt" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "mdI" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -25035,12 +23248,6 @@ }, /turf/unsimulated/floor, /area/antag/mercenary) -"mnj" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "mnl" = ( /obj/effect/floor_decal/corner/red/full{ dir = 1 @@ -25359,13 +23566,6 @@ }, /turf/simulated/floor/wood, /area/shuttle/merchant) -"mvf" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - name = "military corvette" - }, -/area/shuttle/administration) "mvu" = ( /obj/machinery/vending/tool{ random_itemcount = 0 @@ -25641,13 +23841,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/distress) -"mGI" = ( -/obj/machinery/computer/security, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "mGV" = ( /obj/structure/table/reinforced, /obj/item/storage/box/fancy/donut, @@ -25846,15 +24039,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"mNS" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "mOm" = ( /obj/machinery/papershredder, /obj/structure/sign/poster{ @@ -26231,14 +24415,6 @@ }, /turf/unsimulated/floor, /area/centcom/legion/hangar5) -"nbs" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "nbD" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 1 @@ -26563,8 +24739,7 @@ icon_state = "intact-supply"; name = "pipe" }, -/obj/structure/lattice/catwalk/indoor{ - }, +/obj/structure/lattice/catwalk/indoor, /turf/unsimulated/floor/plating, /area/centcom/checkpoint/aft) "nkc" = ( @@ -26667,16 +24842,6 @@ icon_state = "carpet" }, /area/centcom/specops) -"nmJ" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - icon_state = "tube_empty" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "nmO" = ( /obj/structure/sign/flag/nanotrasen/large/north, /obj/structure/bed/stool/chair/office/bridge, @@ -26748,15 +24913,6 @@ }, /turf/unsimulated/floor/plating, /area/supply/dock) -"npA" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "14,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "nqa" = ( /obj/effect/floor_decal/corner/dark_blue{ dir = 5 @@ -27199,8 +25355,7 @@ pixel_x = 6; pixel_y = 8 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) "nEt" = ( @@ -27292,14 +25447,6 @@ icon_state = "6,4" }, /area/shuttle/distress) -"nFF" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,9"; - name = "military corvette" - }, -/area/shuttle/administration) "nFM" = ( /obj/effect/floor_decal/corner/orange/diagonal, /obj/effect/decal/fake_object/light_source/invisible, @@ -27888,16 +26035,6 @@ }, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"nXl" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "nXw" = ( /obj/effect/landmark{ name = "skrell_entry" @@ -27929,15 +26066,6 @@ /obj/structure/sign/nosmoking_2, /turf/simulated/wall, /area/merchant_station/warehouse) -"nYH" = ( -/obj/effect/landmark{ - name = "tdome1" - }, -/obj/effect/floor_decal/corner/grey/diagonal{ - dir = 4 - }, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tdome/tdome1) "nYX" = ( /obj/structure/table/rack, /obj/item/tank/emergency_oxygen/double{ @@ -28058,22 +26186,6 @@ icon_state = "rub_carpet" }, /area/centcom/control) -"oaC" = ( -/obj/structure/table/reinforced/wood, -/obj/machinery/door/blast/odin{ - dir = 4; - icon_state = "shutter1"; - icon_state_closed = "shutter1"; - icon_state_closing = "shutterc1"; - icon_state_open = "shutter0"; - icon_state_opening = "shutterc0"; - id = "CentComBarShutters"; - name = "Bar Shutter" - }, -/turf/unsimulated/floor{ - icon_state = "lino_diamond" - }, -/area/centcom/bar) "obP" = ( /obj/structure/shuttle_part/ert{ icon_state = "0,0"; @@ -28107,13 +26219,6 @@ icon_state = "wood" }, /area/centcom/specops) -"odb" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/shuttle_landmark/admin/start, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "odx" = ( /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor, @@ -28293,27 +26398,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"okE" = ( -/obj/machinery/turretid{ - check_arrest = 0; - check_records = 0; - pixel_x = 28; - req_access = list(101) - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light{ - dir = 4; - icon_state = "tube_empty" - }, -/obj/machinery/button/remote/blast_door{ - id = "corvette_exterior"; - name = "aft blast door"; - pixel_x = 32; - pixel_y = 12; - req_access = null - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "okP" = ( /obj/machinery/cryopod{ dir = 4 @@ -28355,14 +26439,6 @@ icon_state = "tiled_preview" }, /area/centcom/legion) -"onj" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,3"; - name = "military corvette" - }, -/area/shuttle/administration) "onk" = ( /obj/structure/sign/staff_only{ pixel_y = -2 @@ -28375,14 +26451,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/merchant) -"ool" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,12"; - name = "military corvette" - }, -/area/shuttle/administration) "ooJ" = ( /obj/machinery/vending/snack, /obj/machinery/light{ @@ -28444,14 +26512,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/transport1) -"orN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "orV" = ( /turf/unsimulated/floor{ icon_state = "tiled_preview" @@ -28686,14 +26746,6 @@ icon_state = "dark_preview" }, /area/centcom/ferry) -"oDa" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,11"; - name = "military corvette" - }, -/area/shuttle/administration) "oDl" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -29096,14 +27148,6 @@ /obj/structure/flora/ausbushes/leafybush, /turf/simulated/floor/grass, /area/centcom/shared_dream) -"oRM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "oRO" = ( /turf/simulated/wall/shuttle/unique/mercenary{ icon_state = "15,3" @@ -29146,17 +27190,6 @@ }, /turf/unsimulated/floor/plating, /area/supply/dock) -"oUy" = ( -/obj/item/storage/secure/briefcase{ - pixel_y = 12 - }, -/obj/item/storage/briefcase/aluminium, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "oUZ" = ( /obj/machinery/door/blast/shutters/open{ dir = 2; @@ -29255,16 +27288,6 @@ icon_state = "rub_carpet" }, /area/centcom/specops) -"oYn" = ( -/obj/machinery/optable, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "oYo" = ( /obj/structure/grille, /obj/structure/lattice, @@ -29283,13 +27306,6 @@ }, /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) -"oZj" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain/black, -/turf/simulated/floor/tiled/ramp, -/area/shuttle/administration) "oZm" = ( /obj/structure/closet/gimmick{ name = "emergency response team wardrobe" @@ -29406,14 +27422,6 @@ }, /turf/simulated/floor/plating, /area/merchant_station/warehouse) -"pfD" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "7,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "pfR" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -29547,14 +27555,6 @@ name = "Service Airlock" }, /area/centcom/legion/hangar5) -"pkN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "plr" = ( /obj/machinery/light{ icon_state = "tube_empty" @@ -29655,18 +27655,6 @@ icon_state = "0,3" }, /area/centcom/specops) -"ppR" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 8; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "ppV" = ( /obj/effect/decal/fake_object{ density = 1; @@ -29831,14 +27819,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"ptW" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,18"; - name = "military corvette" - }, -/area/shuttle/administration) "puj" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -29982,7 +27962,7 @@ dir = 1 }, /obj/item/tape/engineering{ - icon_state = "engineering_door"; + icon_state = "engineering_door" }, /turf/simulated/floor/tiled/dark, /area/centcom/bar) @@ -30063,10 +28043,6 @@ icon_state = "5,0" }, /area/shuttle/legion) -"pCZ" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "pDr" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -30440,12 +28416,6 @@ icon_state = "dark_preview" }, /area/centcom/specops) -"pKX" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "9,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "pLc" = ( /turf/simulated/wall/shuttle/unique/merchant{ icon_state = "16,3" @@ -31531,14 +29501,6 @@ icon_state = "9,1" }, /area/shuttle/merchant) -"qDG" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,4"; - name = "military corvette" - }, -/area/shuttle/administration) "qDS" = ( /turf/unsimulated/floor, /area/centcom/legion) @@ -32357,27 +30319,11 @@ icon_state = "dark_preview" }, /area/centcom/holding) -"riI" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "riT" = ( /turf/simulated/wall/shuttle/unique/tcfl{ icon_state = "3,5" }, /area/shuttle/legion) -"rjX" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "rkf" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/railing/mapped{ @@ -32642,14 +30588,6 @@ icon_state = "tiled_preview" }, /area/antag/raider) -"rvo" = ( -/obj/structure/table/standard, -/obj/item/storage/box/fancy/tray, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/unsimulated/floor{ - icon_state = "white" - }, -/area/centcom/holding) "rvq" = ( /obj/structure/closet/walllocker/emerglocker/south{ pixel_y = -27 @@ -32693,14 +30631,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/bar) -"rwc" = ( -/obj/structure/bed/stool/chair{ - dir = 1 - }, -/turf/unsimulated/floor{ - icon_state = "dark_preview" - }, -/area/centcom/holding) "rwj" = ( /obj/structure/shuttle_part/tcfl{ icon_state = "13,5"; @@ -32917,26 +30847,6 @@ icon_state = "white" }, /area/tdome/tdomeadmin) -"rFI" = ( -/obj/machinery/door/airlock/external{ - frequency = 1399; - icon_state = "door_locked"; - id_tag = "admin_shuttle_hatch"; - locked = 1; - name = "Corvette Hatch"; - req_access = list(13); - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/plasticflaps/airtight, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "corvette_exterior"; - name = "blast door" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) "rFJ" = ( /obj/structure/railing/mapped{ dir = 1 @@ -33423,14 +31333,6 @@ icon_state = "wood_preview" }, /area/antag/mercenary) -"rWN" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,2"; - name = "military corvette" - }, -/area/shuttle/administration) "rXE" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "2,1" @@ -33489,14 +31391,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/legion) -"saG" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,2"; - name = "military corvette" - }, -/area/shuttle/administration) "saQ" = ( /obj/structure/sign/double/map/right{ desc = "A framed picture of a station."; @@ -33712,14 +31606,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"skK" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,9"; - name = "military corvette" - }, -/area/shuttle/administration) "slj" = ( /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/grey{ @@ -33745,14 +31631,6 @@ icon_state = "tiled_preview" }, /area/antag/raider) -"slS" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "smn" = ( /obj/structure/bed/stool/chair/shuttle{ dir = 4 @@ -34367,14 +32245,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"sHl" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "sHn" = ( /obj/effect/floor_decal/corner/red/full{ dir = 4 @@ -34425,14 +32295,6 @@ icon_state = "tiled_preview" }, /area/antag/mercenary) -"sJN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "sKg" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -34456,14 +32318,6 @@ icon_state = "lino_diamond" }, /area/centcom/bar) -"sLn" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,20"; - name = "military corvette" - }, -/area/shuttle/administration) "sLq" = ( /obj/machinery/vending/zora{ density = 0; @@ -36086,7 +33940,7 @@ "tRu" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/toilet{ - dir = 1; + dir = 1 }, /obj/machinery/light/small{ dir = 8; @@ -36483,14 +34337,6 @@ }, /turf/space/dynamic, /area/shuttle/mercenary) -"uiO" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,9"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ujo" = ( /obj/machinery/door/blast/odin/shuttle/tcfl/shutter{ density = 1; @@ -36960,15 +34806,6 @@ icon_state = "dark_preview" }, /area/centcom/control) -"uyB" = ( -/obj/effect/floor_decal/corner/lime/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "uyK" = ( /obj/structure/shuttle_part/arrivals{ desc = "A state-of-the-art unmanned automatic crew transport shuttle."; @@ -37100,14 +34937,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"uGa" = ( -/obj/structure/bed/roller, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/corner/black, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "uGw" = ( /obj/structure/shuttle_part/mercenary{ icon_state = "0,2" @@ -37180,14 +35009,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/syndicate_elite) -"uJt" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,13"; - name = "military corvette" - }, -/area/shuttle/administration) "uJv" = ( /obj/effect/floor_decal/spline/plain/black, /turf/unsimulated/floor{ @@ -37409,14 +35230,6 @@ icon_state = "wood_preview" }, /area/centcom/holding) -"uPa" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "uPw" = ( /obj/item/flame/candle{ pixel_x = -4; @@ -37693,14 +35506,6 @@ }, /turf/simulated/floor/plating, /area/shuttle/skipjack) -"uUg" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,17"; - name = "military corvette" - }, -/area/shuttle/administration) "uUx" = ( /obj/effect/decal/cleanable/dirt, /turf/unsimulated/wall/fakepdoor{ @@ -38247,8 +36052,7 @@ /obj/structure/closet/crate/trashcart{ opened = 1 }, -/obj/item/trash/koisbar{ - }, +/obj/item/trash/koisbar, /obj/item/device/paicard, /obj/random/junk, /turf/unsimulated/floor{ @@ -38850,13 +36654,6 @@ }, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"vNE" = ( -/obj/structure/bed/roller, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "vNR" = ( /obj/effect/floor_decal/corner/grey{ dir = 10 @@ -39375,18 +37172,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/escape) -"weU" = ( -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain/black{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "wfu" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -40087,14 +37872,6 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"wwo" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,20"; - name = "military corvette" - }, -/area/shuttle/administration) "wwD" = ( /obj/item/gun/energy/blaster{ pixel_y = 6 @@ -40577,12 +38354,6 @@ /obj/item/trash/liquidfood, /turf/unsimulated/floor, /area/centcom/legion) -"wKp" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "wKL" = ( /obj/structure/table/standard, /obj/item/reagent_containers/food/drinks/bottle{ @@ -40622,13 +38393,6 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/distress) -"wLO" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "wMn" = ( /obj/structure/table/standard, /obj/item/reagent_containers/glass/bottle/bicaridine{ @@ -41250,12 +39014,6 @@ icon_state = "8,4" }, /area/centcom/specops) -"xfB" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "xfN" = ( /obj/structure/sign/flag/nanotrasen/unmovable, /obj/effect/floor_decal/corner/paleblue/full{ @@ -42265,14 +40023,6 @@ /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/tiled/dark, /area/shuttle/mercenary) -"xKz" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "xKM" = ( /obj/machinery/light/small{ brightness_power = 0.5; @@ -42322,19 +40072,6 @@ opacity = 0 }, /area/centcom/shared_dream) -"xLO" = ( -/obj/structure/closet/crate/freezer/rations, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/storage/firstaid/o2, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "xMf" = ( /obj/machinery/light{ dir = 1; @@ -42608,8 +40345,7 @@ /obj/item/gun/projectile/gauss{ pixel_y = 8 }, -/obj/item/gun/projectile/gauss{ - }, +/obj/item/gun/projectile/gauss, /turf/unsimulated/floor, /area/centcom/legion/hangar5) "xVe" = ( @@ -42845,7 +40581,7 @@ "ydO" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/toilet{ - dir = 1; + dir = 1 }, /obj/machinery/light/small{ dir = 8; @@ -42955,14 +40691,6 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) -"yhj" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,19"; - name = "military corvette" - }, -/area/shuttle/administration) "yhm" = ( /obj/structure/table/wood/gamblingtable, /obj/item/material/ashtray/bronze, @@ -42983,12 +40711,6 @@ /obj/effect/map_effect/window_spawner/reinforced/crescent, /turf/unsimulated/floor/plating, /area/antag/wizard) -"yil" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "8,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) "yiw" = ( /obj/machinery/button/remote/blast_door{ id = "crescent_checkpoint_access"; @@ -59144,30 +56866,30 @@ aaM aaM emP ajX -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -keV -kCi +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -59400,31 +57122,31 @@ aaM aaM aaM emP -wtW -awz -awz -awz -awz -bxU -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -bxU -hYK -awz -awz -iLs +oRn +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -59657,31 +57379,31 @@ aaM aaM aaM emP -wtW -awz -axQ -bcf -bgv -bGZ -con -cMJ -cSQ -dwf -ecM -eEN -awz -awz -awz -fvS -fVu -glK -gHC -hfx -hHn -ihZ -iLO -awz -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa ujN @@ -59914,31 +57636,31 @@ aaM aaM aaM emP -wtW -bDV -aLe -bex -bsJ -bHu -cus -oUy -cUg -dxz -edh -eFP -eIA -eLI -ftN -fBT -fZf -glX -gPb -hhu -hNV -inU -iMn -jEc -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa tfG ujN @@ -60171,31 +57893,31 @@ aaM aaM aaM emP -wtW -aqt -aMN -beD -btz -bJt -bJt -bJt -dbS -dHA -ejY -eHG -eJU -eWF -fuH -fEU -fZs -gmY -gTS -hif -hOD -ioG -iMN -jRl -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa ujN @@ -60428,31 +58150,31 @@ aaM aaM aaM emP -wtW -aoN -aRw -cYJ -buU -bNz -bNz -pCZ -dcY -dKm -esU -esU -esU -fpP -fvp -fFH -fZU -gql -gUq -mvf -hUU -iqJ -iRA -keP -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa lxi @@ -60685,31 +58407,31 @@ aaM aaM aaM emP -wtW -xKz -amk -dzL -eHl -fKq -fWE -pCZ -hyd -iOb -xfB -xfB -xfB -kdk -lbr -nmJ -mNS -mNS -mNS -mNS -nmJ -iqM -iSu -kgY -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa lxi @@ -60942,31 +58664,31 @@ aaM aaM aaM emP -wtW -fSP -pfD -hDh -gyU -lhw -htq -pCZ -iFr -jGi -jGi -jGi -dqO -fWE -iSs -jrN -fWE -fWE -fWE -fWE -odb -rFI -iSG -kqG -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa ujN @@ -61199,31 +58921,31 @@ aaM aaM aaM emP -wtW -fXt -gOD -yil -gyU -bQT -fpJ -fMD -kHS -vNE -vNE -uGa -uyB -eyk -oZj -dar -wKp -wKp -wKp -wKp -wKp -rFI -jdw -kqG -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa tfG ujN @@ -61456,31 +59178,31 @@ aaM aaM aaM emP -wtW -rjX -amq -pKX -bwY -mnj -mGI -xfB -iez -dUP -exK -iqw -gol -jGO -nXl -bjP -wLO -wLO -eZA -wLO -okE -rWN -jkC -krm -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa ujN @@ -61713,31 +59435,31 @@ aaM aaM aaM emP -wtW -gdl -atT -wwo -hfK -weU -weU -xfB -iez -dWT -eEK -dpi -oYn -iMq -skK -fSi -gaA -gty -gVL -qDG -onj -saG -jmU -krW -iLs +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -61970,31 +59692,31 @@ aaM aaM aaM emP -wtW -ggC -gUu -ejt -bSQ -igs -igs -igs -dhY -ebw -uJt -ool -oDa -klc -nFF -fSu -gbG -guy -riI -mdt -orN -slS -joQ -kwC -iLs +oRn +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -62227,31 +59949,31 @@ aaM aaM aaM emP -wtW -gij -aUs -eng -jUu -xLO -gCK -hap -dtJ -igz -sJN -dos -eri -kuA -uiO -fSy -gke -gvB -hbu -hiQ -oRM -itP -jCa -kwH -iLs +oRn +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -62484,31 +60206,31 @@ aaM aaM aaM emP -wtW -awz -gYL -sLn -yhj -ptW -uUg -kmO -iKP -bfM -llc -cHo -awz -awz -awz -lov -lxO -gAL -uPa -nbs -pkN -sHl -jDq -awz -iLs +oRn +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa lIa @@ -62741,31 +60463,31 @@ aaM aaM aaM emP -wtW -awz -awz -awz -awz -ckf -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -awz -ppR -npA -awz -awz -iLs +oRn +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa oNa jTO @@ -62999,30 +60721,30 @@ aaM aaM emP fpS -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -wIl -vGd +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa +oNa oNa kVA jTO @@ -63583,7 +61305,7 @@ mLh khA qKr lvy -egh +qKr qKr lvy qKr @@ -67160,7 +64882,7 @@ aDb kVk ebr kYq -rwc +nUK aDb mAD bLK @@ -67663,7 +65385,7 @@ bsS iGC tRr bCG -rvo +bsS bQP wfu liY @@ -67674,7 +65396,7 @@ aDb qnC qhn kYq -rwc +nUK aDb mAD bLK @@ -67931,7 +65653,7 @@ bQP tjd wqv kYq -rwc +nUK bQP mAD bLK @@ -69237,7 +66959,7 @@ iAl lDL cik wGT -nYH +cik cik wGT cik @@ -69703,7 +67425,7 @@ ulK hLp xQs eBz -oaC +rky rky rky rky @@ -70469,7 +68191,7 @@ tAC ahe aqu fOK -exm +ifi ujM ifi xps @@ -71763,7 +69485,7 @@ jcv hmF xhC vpg -dKe +aXz eCE mUH kOI @@ -75108,16 +72830,16 @@ ngm dgF aVG fSX -aDs +xFq btV aVL fYX -aDs +xFq aOC xFq -aDs -aDs -aDs +xFq +xFq +xFq sxl smn wgf @@ -75374,7 +73096,7 @@ aWu aWu aVP aWu -aDs +xFq txn aWu aWu @@ -75631,7 +73353,7 @@ aWc aWc aWm aWu -aDs +xFq dvz isd dnd @@ -76145,7 +73867,7 @@ aWd aWd aWn aWu -aDs +xFq fmE aWv aWv @@ -76402,7 +74124,7 @@ aWc aWc aWm aWu -aDs +xFq cCU lSL jwX @@ -76679,7 +74401,7 @@ aKK aTs isr siZ -aNc +aJH qce pDr aOa @@ -76916,7 +74638,7 @@ aWd aWd aWn aWu -aDs +xFq iqr aWT hrI @@ -77173,7 +74895,7 @@ aWc aWc aWm aWu -aDs +xFq bPc aGQ aGQ @@ -77430,7 +75152,7 @@ aWu aWu aWu aWu -aDs +xFq bPc wMw aGQ @@ -77678,7 +75400,7 @@ aRB lkN aIf wGN -aDs +xFq aVJ aVV xSL diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index bf093fa49e5..3117674003f 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -3119,7 +3119,7 @@ /area/tcommsat/chamber) "cwm" = ( /obj/machinery/atmospherics/pipe/tank/air{ - dir = 8; + dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark, @@ -3353,8 +3353,7 @@ req_access = null; dir = 1 }, -/obj/effect/spider/stickyweb{ - }, +/obj/effect/spider/stickyweb, /obj/machinery/door/blast/shutters{ id = "commissary_counter"; name = "Shutter" @@ -4824,10 +4823,6 @@ /obj/item/stock_parts/subspace/crystal, /turf/simulated/floor/tiled, /area/turret_protected/tcomsat) -"elM" = ( -/obj/effect/shuttle_landmark/admin/green, -/turf/unsimulated/floor/asteroid/ash, -/area/mine/explored) "elP" = ( /obj/machinery/door/airlock/glass{ name = "Kitchen"; @@ -11885,8 +11880,7 @@ pixel_x = -4; pixel_y = 3 }, -/obj/item/storage/firstaid/fire{ - }, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/dark, /area/shuttle/research) "kAm" = ( @@ -12931,8 +12925,7 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "lvK" = ( -/obj/structure/closet/cabinet{ - }, +/obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, /obj/random/booze, /obj/effect/decal/cleanable/cobweb2, @@ -16844,8 +16837,7 @@ dir = 1 }, /obj/machinery/door/firedoor, -/obj/machinery/status_display{ - }, +/obj/machinery/status_display, /turf/simulated/floor/plating, /area/hallway/secondary/exit) "oQX" = ( @@ -17397,8 +17389,7 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "pqk" = ( -/obj/structure/closet/cabinet{ - }, +/obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, /obj/random/random_flag, /obj/random/random_flag, @@ -24315,10 +24306,6 @@ }, /turf/simulated/floor/tiled, /area/turret_protected/tcomsat) -"vgQ" = ( -/obj/effect/shuttle_landmark/admin/command, -/turf/unsimulated/floor/asteroid/ash, -/area/mine/explored) "vhb" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -25570,8 +25557,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/status_display{ - }, +/obj/machinery/status_display, /turf/simulated/floor/plating, /area/hallway/secondary/exit) "wlt" = ( @@ -27620,8 +27606,7 @@ /turf/simulated/floor/carpet, /area/security/vacantoffice) "yav" = ( -/obj/structure/closet/cabinet{ - }, +/obj/structure/closet/cabinet, /obj/effect/decal/cleanable/dirt, /obj/structure/bed/stool/padded/red, /obj/structure/bed/stool/padded/red, @@ -48326,7 +48311,7 @@ fdu fdu fdu fdu -elM +kKF fdu fdu fdu @@ -77871,7 +77856,7 @@ fdu fdu fdu fdu -vgQ +kKF fdu fdu fdu diff --git a/maps/aurora/code/aurora.dm b/maps/aurora/code/aurora.dm index 59407f916b1..d7438ac8266 100644 --- a/maps/aurora/code/aurora.dm +++ b/maps/aurora/code/aurora.dm @@ -77,7 +77,6 @@ /datum/shuttle/autodock/ferry/arrival/aurora, /datum/shuttle/autodock/ferry/supply/aurora, /datum/shuttle/autodock/ferry/merchant_aurora, - /datum/shuttle/autodock/multi/admin, /datum/shuttle/autodock/ferry/autoreturn/ccia, /datum/shuttle/autodock/ferry/specops/ert_aurora, /datum/shuttle/autodock/multi/antag/skipjack_aurora, diff --git a/maps/aurora/code/aurora_shuttles.dm b/maps/aurora/code/aurora_shuttles.dm index 940b12c920d..250558180c1 100644 --- a/maps/aurora/code/aurora_shuttles.dm +++ b/maps/aurora/code/aurora_shuttles.dm @@ -161,39 +161,6 @@ AURORA_ESCAPE_POD(4) base_turf = /turf/space base_area = /area/space -//-// Admin Corvette //-// - -/datum/shuttle/autodock/multi/admin - name = "Crescent Shuttle" - current_location = "nav_admin_start" - warmup_time = 10 - shuttle_area = /area/shuttle/administration - dock_target = "admin_shuttle" - destination_tags = list( - "nav_admin_start", - "nav_admin_green", - "nav_admin_command" - ) - -/obj/effect/shuttle_landmark/admin/start - name = "Corvette Hangar" - landmark_tag = "nav_admin_start" - docking_controller = "admin_shuttle_bay" - base_turf = /turf/unsimulated/floor/plating - base_area = /area/centcom - -/obj/effect/shuttle_landmark/admin/green - name = "Emergency Services Dock" - landmark_tag = "nav_admin_green" - docking_controller = "green_dock_north" - landmark_flags = SLANDMARK_FLAG_AUTOSET - -/obj/effect/shuttle_landmark/admin/command - name = "Command Surface Dock" - landmark_tag = "nav_admin_command" - docking_controller = "admin_shuttle_dock_airlock" - landmark_flags = SLANDMARK_FLAG_AUTOSET - //-// CCIA Shuttle //-// /datum/shuttle/autodock/ferry/autoreturn/ccia @@ -227,7 +194,7 @@ AURORA_ESCAPE_POD(4) warmup_time = 10 shuttle_area = /area/shuttle/specops dock_target = "specops_shuttle_port" - waypoint_station = "nav_ert_dock" + waypoint_station = "nav_horizon_dock_deck_3_port_5" waypoint_offsite = "nav_ert_start" /obj/effect/shuttle_landmark/ert/start @@ -239,7 +206,7 @@ AURORA_ESCAPE_POD(4) /obj/effect/shuttle_landmark/ert/dock name = "Third Deck Port Dock 3" - landmark_tag = "nav_ert_dock" + landmark_tag = "nav_horizon_dock_deck_3_port_5" docking_controller = "specops_dock_airlock" special_dock_targets = list("Phoenix Shuttle" = "specops_shuttle_fore") landmark_flags = SLANDMARK_FLAG_AUTOSET diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index b8848f5f41c..c08ac4da642 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -115,6 +115,7 @@ /datum/shuttle/autodock/multi/antag/merc_ship, /datum/shuttle/autodock/multi/legion, /datum/shuttle/autodock/multi/distress, + /datum/shuttle/autodock/multi/crescent, /datum/shuttle/autodock/overmap/intrepid, /datum/shuttle/autodock/overmap/mining, /datum/shuttle/autodock/overmap/canary, diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index 8012906fde1..d858e893fa6 100644 --- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm +++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm @@ -197,3 +197,22 @@ docking_controller = "cargo_shuttle_dock" base_turf = /turf/simulated/floor/plating base_area = /area/hangar/operations + +//-// Admin Corvette //-// +/datum/shuttle/autodock/multi/crescent + name = "ICV Crescent" + current_location = "nav_crescent_start" + warmup_time = 10 + shuttle_area = /area/shuttle/hapt + dock_target = "crescent_shuttle" + destination_tags = list( + "nav_crescent_start", + "nav_horizon_dock_deck_3_starboard_2" + ) + +/obj/effect/shuttle_landmark/crescent/start + name = "Corvette Hangar" + landmark_tag = "nav_crescent_start" + docking_controller = "crescent_shuttle_bay" + base_turf = /turf/unsimulated/floor/plating + base_area = /area/centcom diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 9cf3cde6565..73e6f3245b3 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -427,11 +427,17 @@ /turf/unsimulated/wall/darkshuttlewall, /area/centcom/specops) "abm" = ( -/turf/unsimulated/wall/fakepdoor{ - dir = 4; - name = "shuttle bay blast door" +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/area/centcom/specops) +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/shuttle/hapt) "abn" = ( /obj/machinery/door/airlock/centcom{ name = "Personnel Files"; @@ -492,24 +498,12 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/unsimulated/floor, /area/centcom/evac) -"abt" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "abu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/unsimulated/floor/plating, /area/centcom/specops) -"abv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "abw" = ( /obj/structure/table/reinforced/wood, /obj/machinery/chemical_dispenser/coffee/full{ @@ -565,97 +559,9 @@ icon_state = "dark_preview" }, /area/centcom/control) -"abI" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) "abJ" = ( /turf/unsimulated/floor/plating, /area/centcom/specops) -"abK" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abL" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abO" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "7,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abP" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "8,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abQ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abR" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abS" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"abT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,22"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "abU" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -696,114 +602,18 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"aca" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"acb" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,21"; - name = "military corvette" - }, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"acc" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"acd" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,21"; - name = "military corvette" - }, -/area/shuttle/administration) -"ace" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"acf" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "7,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "acg" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "8,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ach" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/machinery/vending/tacticool/ert, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "aci" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,21"; - name = "military corvette" +/obj/machinery/porta_turret/cannon, +/obj/effect/floor_decal/industrial/warning/full, +/obj/machinery/light/colored/red{ + dir = 4 }, -/area/shuttle/administration) -"acj" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ack" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,21"; - name = "military corvette" - }, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"acl" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,21"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) "acm" = ( /obj/effect/floor_decal/corner/grey/full{ dir = 8 @@ -862,94 +672,6 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"acu" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acv" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "3,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acw" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acx" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acy" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "6,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"acz" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "7,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"acA" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "8,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"acB" = ( -/obj/structure/window/shuttle/unique/hapt{ - icon_state = "9,20" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) -"acC" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acD" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acE" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "12,20"; - name = "military corvette" - }, -/area/shuttle/administration) -"acF" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,20"; - name = "military corvette" - }, -/area/shuttle/administration) "acG" = ( /obj/effect/floor_decal/corner/grey/full, /obj/structure/bed/stool/chair/padded/black{ @@ -987,115 +709,19 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"acN" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,19"; - name = "military corvette" - }, -/area/shuttle/administration) -"acO" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/closet/emcloset, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"acP" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"acQ" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1399; - id_tag = "admin_shuttle"; - pixel_x = -1; - pixel_y = 33; - req_one_access = list(101); - tag_door = "admin_shuttle_hatch" - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"acR" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 4 - }, -/area/shuttle/administration) -"acS" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"acT" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/ramp/bottom{ - dir = 8 - }, -/area/shuttle/administration) -"acU" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "acV" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 +/obj/structure/closet/crate/drop{ + name = "problemsolver crate" }, -/obj/machinery/status_display{ - pixel_y = 30 +/obj/item/ammo_magazine/a762, +/obj/item/ammo_magazine/a762, +/obj/item/ammo_magazine/a762, +/obj/item/gun/projectile/automatic/rifle/l6_saw, +/obj/machinery/light/colored/red{ + dir = 4 }, -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"acW" = ( -/obj/item/clothing/suit/armor/carrier/ballistic, -/obj/item/clothing/under/rank/centcom_officer, -/obj/item/clothing/shoes/sneakers, -/obj/item/clothing/gloves/white, -/obj/item/clothing/glasses/sunglasses/sechud, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/holster/hip, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/head/beret/centcom/captain, -/obj/item/gun/energy/lawgiver, -/obj/item/card/id/centcom, -/obj/structure/closet/secure_closet/guncabinet{ - name = "captain's cabinet"; - req_access = list(101) - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"acX" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,19"; - name = "military corvette" - }, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ada" = ( /obj/machinery/door/airlock/centcom{ dir = 1; @@ -1132,138 +758,40 @@ /turf/unsimulated/floor, /area/centcom/control) "adh" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 4; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"adi" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,18"; - name = "military corvette" - }, -/area/shuttle/administration) -"adj" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/closet/hazmat/general, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adk" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adl" = ( -/obj/structure/railing/mapped{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adm" = ( -/obj/effect/floor_decal/corner/red/full{ +/obj/machinery/light/colored/red{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adn" = ( -/obj/machinery/computer/shuttle_control/multi{ - req_access = list(101); - shuttle_tag = "Crescent Shuttle" +/obj/machinery/porta_turret/cannon, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) +"adm" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 }, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/item/modular_computer/console/preset/security{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ado" = ( -/obj/item/modular_computer/console/preset/command, -/obj/effect/floor_decal/corner/red{ - dir = 5 - }, -/obj/item/modular_computer/console/preset/medical{ +/obj/structure/sign/flag/nanotrasen{ pixel_x = 32 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/area/shuttle/hapt) "adp" = ( -/obj/effect/floor_decal/corner/red/full{ - dir = 1 +/obj/machinery/button/remote/blast_door{ + id = "corvette__bridge_exterior"; + name = "Blast Doors"; + pixel_x = 35; + pixel_y = 5; + dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adq" = ( -/obj/structure/railing/mapped{ - dir = 8 +/obj/machinery/button/remote/blast_door{ + id = "corvette_exterior"; + name = "aft blast door"; + pixel_x = 25; + pixel_y = 5; + dir = 5 }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adr" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ads" = ( -/obj/structure/closet/crate/freezer/rations, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/storage/firstaid/o2, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adt" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,18"; - name = "military corvette" - }, -/area/shuttle/administration) -"adu" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 8; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) +/obj/machinery/computer/shuttle_control/multi/crescent, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "adv" = ( /obj/structure/filingcabinet, /turf/unsimulated/floor{ @@ -1318,79 +846,26 @@ }, /turf/unsimulated/floor, /area/centcom/control) -"adE" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,17"; - name = "military corvette" - }, -/area/shuttle/administration) "adF" = ( -/obj/item/device/camera_film, -/obj/item/device/camera, -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/structure/shuttle/engine/propulsion{ + dir = 1 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/turf/unsimulated/floor/plating, +/area/shuttle/hapt) "adH" = ( -/obj/structure/bed/stool/chair/office/bridge/pilot, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adI" = ( -/obj/structure/bed/stool/chair/office/bridge/pilot, -/obj/effect/floor_decal/corner/red/diagonal{ +/obj/effect/floor_decal/corner/dark_blue/full{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adJ" = ( -/obj/machinery/computer/security{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 +/obj/structure/sign/flag/nanotrasen{ + pixel_x = -32 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adK" = ( -/obj/item/storage/belt/utility/very_full, -/obj/item/clothing/gloves/yellow, -/obj/item/crowbar/red, -/obj/item/clothing/glasses/welding/superior, -/obj/item/stack/material/steel{ - amount = 50; - pixel_x = -2 - }, -/obj/item/stack/material/glass{ - amount = 50; - pixel_x = 1 - }, -/obj/item/storage/bag/inflatable, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/reinforced/steel, -/obj/structure/closet/crate/drop/grey, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/area/shuttle/hapt) "adL" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,17"; - name = "military corvette" - }, -/area/shuttle/administration) +/obj/structure/table/reinforced/wood, +/obj/item/storage/box/fancy/donut, +/turf/simulated/floor/wood, +/area/shuttle/hapt) "adM" = ( /obj/structure/bed/stool/chair/padded/black, /turf/unsimulated/floor{ @@ -1595,64 +1070,23 @@ "adV" = ( /turf/unsimulated/wall/darkshuttlewall, /area/centcom/bar) -"adW" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,16"; - name = "military corvette" - }, -/area/shuttle/administration) -"adX" = ( -/obj/item/storage/secure/briefcase{ - pixel_y = 12 - }, -/obj/item/storage/briefcase/aluminium, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"adY" = ( -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "adZ" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 +/obj/machinery/door/airlock/highsecurity{ + dir = 4; + name = "Medical Bay"; + req_access = list(103) }, -/obj/item/device/radio/intercom/east{ - pixel_y = -22 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aea" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aeb" = ( -/obj/machinery/recharger{ - pixel_x = 7; - pixel_y = 9 - }, -/obj/item/device/megaphone/red, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "aec" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,16"; - name = "military corvette" +/obj/structure/bed/stool/chair/shuttle{ + dir = 8 }, -/area/shuttle/administration) +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/shuttle/hapt) "aed" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -1777,100 +1211,6 @@ }, /turf/unsimulated/floor/plating, /area/centcom/bar) -"aen" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "2,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aeo" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "3,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aep" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aeq" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aer" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aes" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/door/airlock/highsecurity{ - dir = 1; - name = "Bridge"; - req_access = list(101) - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aet" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aeu" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aev" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aew" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "12,15"; - name = "military corvette" - }, -/area/shuttle/administration) -"aex" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "13,15"; - name = "military corvette" - }, -/area/shuttle/administration) "aey" = ( /obj/machinery/photocopier, /turf/unsimulated/floor{ @@ -1946,151 +1286,31 @@ /obj/effect/floor_decal/industrial/warning, /turf/unsimulated/floor/plating, /area/centcom/bar) -"aeJ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aeK" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aeL" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,14"; - name = "military corvette" - }, -/area/shuttle/administration) -"aeM" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Heavy Asset Protection"; - req_access = list(103) - }, -/obj/item/rig_module/mounted, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/shoes/magboots, -/obj/item/melee/baton/loaded, -/obj/item/storage/belt/security/tactical, -/obj/item/handcuffs, -/obj/item/handcuffs, -/obj/item/pinpointer/advpinpointer, -/obj/item/rig_module/mounted/plasmacutter, -/obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/under/syndicate/combat, -/obj/item/gun/energy/rifle/pulse, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1; - maxhealth = 140 - }, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun/incendiary, -/obj/item/ammo_magazine/assault_shotgun/shells, -/obj/item/gun/projectile/automatic/rifle/shotgun, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aeN" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 30 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 - }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/mob/living/heavy_vehicle/premade/superheavy, +/obj/machinery/mech_recharger, +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "aeO" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 6 - }, -/obj/effect/floor_decal/corner/red{ +/obj/effect/floor_decal/corner/black{ dir = 9 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aeP" = ( -/obj/structure/bed/roller, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"aeQ" = ( -/obj/machinery/body_scanconsole{ - dir = 4 - }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 28 - }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/area/shuttle/hapt) "aeR" = ( -/obj/machinery/bodyscanner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/turf/simulated/floor/wood, +/area/shuttle/hapt) "aeS" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,14"; - name = "military corvette" - }, -/area/shuttle/administration) +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "aeT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,14"; - name = "military corvette" +/obj/structure/table/reinforced/steel, +/obj/item/storage/box/fancy/tray{ + layer = 2.99 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aeU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,14"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "aeV" = ( /obj/machinery/papershredder, /turf/unsimulated/floor{ @@ -2167,114 +1387,75 @@ /turf/simulated/floor/tiled/dark, /area/centcom/bar) "afd" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"afe" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aff" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,13"; - name = "military corvette" - }, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "afg" = ( -/obj/structure/closet/secure_closet/guncabinet{ - name = "Heavy Asset Protection"; - req_access = list(103) +/obj/item/gun/projectile/automatic/rifle/z8{ + layer = 2.99; + pixel_y = 10 }, -/obj/item/rig_module/mounted, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/shoes/magboots, -/obj/item/melee/baton/loaded, -/obj/item/storage/belt/security/tactical, -/obj/item/handcuffs, -/obj/item/handcuffs, -/obj/item/pinpointer/advpinpointer, -/obj/item/rig_module/mounted/plasmacutter, -/obj/item/rig/ert/assetprotection, -/obj/item/device/radio/headset/ert, -/obj/item/clothing/under/syndicate/combat, -/obj/item/gun/energy/rifle/pulse, -/obj/item/gun/projectile/revolver/mateba, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/item/ammo_magazine/a454, -/obj/structure/window/reinforced{ - dir = 8 +/obj/item/gun/projectile/automatic/rifle/z8{ + pixel_y = 5 }, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun, -/obj/item/ammo_magazine/assault_shotgun/incendiary, -/obj/item/ammo_magazine/assault_shotgun/shells, -/obj/item/gun/projectile/automatic/rifle/shotgun, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afh" = ( -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afi" = ( -/obj/machinery/sleeper{ - dir = 8 +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -8 }, -/obj/structure/closet/walllocker/medical/secure{ - name = "blood closet"; - pixel_x = 30; - pixel_y = -1; - req_access = null +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -8 }, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/item/reagent_containers/blood/OMinus, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -8 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -8 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -11 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -11 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = -6; + pixel_y = -11 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -11 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -11 + }, +/obj/item/ammo_magazine/a556{ + pixel_x = 5; + pixel_y = -11 + }, +/obj/structure/table/reinforced/steel, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "afj" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,13"; - name = "military corvette" +/obj/machinery/light/colored/red{ + dir = 4 }, -/area/shuttle/administration) -"afk" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"afl" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,13"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/machinery/porta_turret/cannon, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) "afm" = ( /obj/structure/table/reinforced/wood, /obj/item/reagent_containers/food/drinks/bottle/cognac{ @@ -2368,83 +1549,75 @@ }, /turf/unsimulated/floor/plating, /area/centcom/bar) -"afu" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"afv" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"afw" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,12"; - name = "military corvette" - }, -/area/shuttle/administration) "afx" = ( -/obj/structure/bed/roller, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/obj/effect/floor_decal/spline/plain/corner, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afy" = ( -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/area/shuttle/hapt) "afz" = ( /obj/machinery/iv_drip, -/obj/machinery/vending/wallmed1{ - pixel_x = 28; - req_access = null +/obj/machinery/light{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afA" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,12"; - name = "military corvette" - }, -/area/shuttle/administration) -"afB" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,12"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "afC" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,12"; - name = "military corvette" +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/item/storage/firstaid/regular{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 5 + }, +/obj/item/storage/firstaid/o2{ + layer = 2.8; + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/fire{ + layer = 2.9; + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/storage/firstaid/adv{ + pixel_x = -2 + }, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/inhaler/pneumalin, +/obj/item/reagent_containers/hypospray/autoinjector/survival, +/obj/item/reagent_containers/hypospray/autoinjector/survival, +/obj/item/reagent_containers/hypospray/autoinjector/survival, +/obj/item/reagent_containers/hypospray/autoinjector/survival, +/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/item/reagent_containers/glass/bottle/bicaridine, +/obj/item/reagent_containers/glass/bottle/bicaridine, +/obj/item/reagent_containers/glass/bottle/dermaline, +/obj/item/reagent_containers/glass/bottle/dermaline, +/obj/item/reagent_containers/glass/bottle/dexalin_plus, +/obj/item/reagent_containers/glass/bottle/dexalin_plus, +/obj/item/reagent_containers/glass/bottle/mortaphenyl, +/obj/item/reagent_containers/glass/bottle/antitoxin, +/obj/item/reagent_containers/glass/bottle/peridaxon, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "afD" = ( /obj/structure/table/reinforced/wood, /obj/item/modular_computer/laptop/preset/command/captain, @@ -2527,74 +1700,34 @@ }, /area/centcom/control) "afM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,11"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"afN" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,11"; - name = "military corvette" - }, -/area/shuttle/administration) -"afO" = ( -/obj/effect/floor_decal/corner/lime{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afP" = ( -/obj/effect/floor_decal/corner/lime/full{ - dir = 1 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/obj/machinery/light/colored/red, +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "afQ" = ( -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 +/obj/machinery/access_button{ + dir = 4; + pixel_x = -23; + pixel_y = -4; + master_tag = "crescent_shuttle" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, +/obj/effect/floor_decal/corner/dark_blue/full, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/area/shuttle/hapt) "afR" = ( -/obj/machinery/optable, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ +/obj/effect/floor_decal/corner/lime/full{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) +"afT" = ( +/obj/effect/floor_decal/corner/lime{ dir = 5 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"afS" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,11"; - name = "military corvette" - }, -/area/shuttle/administration) -"afT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,11"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "afU" = ( /obj/machinery/door/airlock/glass_centcom{ dir = 1; @@ -2740,172 +1873,64 @@ /obj/structure/window/reinforced/crescent, /turf/unsimulated/floor/plating, /area/centcom/bar) -"age" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,10"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"agf" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,10"; - name = "military corvette" - }, -/area/shuttle/administration) -"agg" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain, -/obj/item/storage/belt/utility/very_full, -/obj/item/storage/belt/utility/very_full, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/item/crowbar/red, -/obj/structure/closet/crate/drop/grey, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agh" = ( -/obj/structure/railing/mapped, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/closet/crate/freezer/rations, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) "agi" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "crescent_exterior_blast"; + name = "blast door" + }, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_effect/marker/airlock/shuttle{ + master_tag = "crescent_shuttle"; + name = "crescent_shuttle"; + shuttle_tag = "crescent_shuttle"; + req_access = list(103); + req_one_access = null + }, +/obj/machinery/door/airlock/external{ + dir = 1; + icon_state = "door_locked"; + locked = 1; + name = "Shuttle Hatch"; + req_access = list(13) + }, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "crescent_exterior_blast"; + name = "blast door" }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agj" = ( +/area/shuttle/hapt) +"agl" = ( +/obj/effect/floor_decal/corner/lime/full, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) +"agm" = ( /obj/effect/floor_decal/corner/lime{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agk" = ( -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular{ - pixel_x = -2; - pixel_y = 4 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/bodybag/cryobag{ - pixel_x = 5 - }, -/obj/item/storage/firstaid/o2{ - layer = 2.8; - pixel_x = 4; - pixel_y = 6 - }, -/obj/item/storage/box/masks, -/obj/item/storage/box/gloves, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/fire{ - layer = 2.9; - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/storage/firstaid/adv{ - pixel_x = -2 - }, -/obj/structure/railing/mapped, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/inhaler/pneumalin, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/hypospray/autoinjector/survival, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/reagent_containers/glass/bottle/bicaridine, -/obj/item/reagent_containers/glass/bottle/bicaridine, -/obj/item/reagent_containers/glass/bottle/dermaline, -/obj/item/reagent_containers/glass/bottle/dermaline, -/obj/item/reagent_containers/glass/bottle/dexalin_plus, -/obj/item/reagent_containers/glass/bottle/dexalin_plus, -/obj/item/reagent_containers/glass/bottle/mortaphenyl, -/obj/item/reagent_containers/glass/bottle/antitoxin, -/obj/item/reagent_containers/glass/bottle/peridaxon, -/obj/item/reagent_containers/glass/bottle/peridaxon, -/obj/item/reagent_containers/hypospray, -/obj/item/reagent_containers/hypospray, -/obj/item/storage/belt/medical, -/obj/item/clothing/glasses/hud/health, -/obj/item/reagent_containers/hypospray/combat, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/effect/floor_decal/spline/plain, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agl" = ( -/obj/structure/railing/mapped, -/obj/item/storage/box/fancy/tray{ - layer = 2.99 +/obj/structure/closet/walllocker/medical{ + pixel_y = -32; + name = "Blood Locker" }, -/obj/effect/floor_decal/corner_wide/paleblue/diagonal{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/effect/floor_decal/spline/plain, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/reinforced/steel, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agm" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,10"; - name = "military corvette" - }, -/area/shuttle/administration) +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "agn" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,10"; - name = "military corvette" +/obj/effect/floor_decal/corner/lime{ + dir = 10 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "ago" = ( /obj/machinery/porta_turret/crescent, /obj/effect/floor_decal/industrial/warning/full, @@ -3017,89 +2042,49 @@ }, /turf/unsimulated/floor, /area/centcom/bar) -"agC" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,9"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"agD" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "4,9"; - name = "military corvette" - }, -/area/shuttle/administration) "agE" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,9"; - name = "military corvette" +/obj/structure/sign/flag/nanotrasen{ + pixel_y = 30 }, -/area/shuttle/administration) -"agF" = ( -/obj/machinery/mech_recharger, -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/mob/living/heavy_vehicle/premade/superheavy, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "agG" = ( -/obj/structure/railing/mapped{ +/obj/structure/bed/stool/chair/shuttle{ dir = 8 }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/ramp, -/area/shuttle/administration) +/obj/effect/floor_decal/spline/fancy/wood/cee, +/obj/machinery/light, +/turf/simulated/floor/carpet, +/area/shuttle/hapt) "agH" = ( -/obj/structure/railing/mapped{ +/obj/machinery/porta_turret/cannon, +/obj/machinery/light/colored/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) +"agI" = ( +/obj/effect/floor_decal/corner/lime/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) +"agK" = ( +/obj/machinery/door/airlock/glass_command{ + dir = 8; + name = "Passengers" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) +"agL" = ( +/obj/machinery/porta_turret/cannon, +/obj/machinery/light/colored/red{ dir = 4 }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/tiled/ramp, -/area/shuttle/administration) -"agI" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"agJ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,9"; - name = "military corvette" - }, -/area/shuttle/administration) -"agK" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "11,9"; - name = "military corvette" - }, -/area/shuttle/administration) -"agL" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,9"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) "agM" = ( /obj/machinery/porta_turret/crescent, /obj/effect/floor_decal/industrial/warning/full, @@ -3168,98 +2153,31 @@ /turf/simulated/floor/grass, /area/centcom/bar) "agW" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,8"; - name = "military corvette" +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 8; + name = "worn chair" }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"agX" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"agY" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"agZ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,8"; - name = "military corvette" - }, -/area/shuttle/administration) -"aha" = ( -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahb" = ( -/obj/effect/floor_decal/corner/red{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahc" = ( -/obj/effect/floor_decal/corner/red, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahd" = ( -/obj/structure/closet/walllocker/firecloset{ - pixel_x = 30 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light{ +/obj/machinery/light/colored/red{ dir = 4 }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) +"agX" = ( +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) +"aha" = ( +/turf/simulated/wall/shuttle/hapt/blue, +/area/shuttle/hapt) +"ahc" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 6 + }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahe" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,8"; - name = "military corvette" - }, -/area/shuttle/administration) -"ahf" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahg" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahh" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,8"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/area/shuttle/hapt) "ahi" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -3373,92 +2291,56 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass, /area/centcom/bar) -"ahy" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahz" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahA" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahB" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,7"; - name = "military corvette" - }, -/area/shuttle/administration) "ahC" = ( -/obj/structure/bed/stool/chair/shuttle{ +/obj/machinery/porta_turret/cannon, +/obj/machinery/light/colored/red, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) +"ahD" = ( +/obj/machinery/door/airlock/external{ + dir = 1; + icon_state = "door_locked"; + locked = 1; + name = "Shuttle Hatch"; + req_access = list(13) + }, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "crescent_exterior_blast"; + name = "blast door" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/map_effect/marker_helper/airlock/interior, +/obj/effect/map_effect/marker/airlock/shuttle{ + master_tag = "crescent_shuttle"; + name = "crescent_shuttle"; + shuttle_tag = "crescent_shuttle"; + req_access = list(103); + req_one_access = null + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) +"ahE" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) +"ahF" = ( +/obj/machinery/turretid{ + check_arrest = 0; + check_records = 0; + pixel_x = -26; + req_access = list(103); dir = 4 }, -/obj/effect/floor_decal/corner/red/diagonal{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahD" = ( -/obj/effect/floor_decal/corner/red{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahE" = ( -/obj/structure/bed/stool/chair/shuttle{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/diagonal, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ahF" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,7"; - name = "military corvette" - }, -/area/shuttle/administration) -"ahG" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "ahH" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,7"; - name = "military corvette" +/obj/machinery/computer/security{ + dir = 8 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahI" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,7"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ahJ" = ( /obj/machinery/light{ dir = 4 @@ -3501,70 +2383,31 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/centcom/bar) -"ahP" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ahQ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,6"; - name = "military corvette" +/obj/machinery/door/blast/regular{ + dir = 4; + name = "Rapid Deployment"; + id = "crescent_shuttle_rapid_deploy" }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "ahR" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,6"; - name = "military corvette" +/obj/effect/floor_decal/corner/black{ + dir = 6 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/structure/sign/flag/nanotrasen{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "ahS" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,6"; - name = "military corvette" +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 8; + name = "worn chair" }, -/area/shuttle/administration) -"ahT" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,6"; - name = "military corvette" - }, -/area/shuttle/administration) -"ahU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahV" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ahW" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,6"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ahX" = ( /obj/structure/table/reinforced/steel, /obj/machinery/recharger{ @@ -3736,80 +2579,33 @@ icon_state = "whiteshiny" }, /area/centcom/bar) -"ais" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ait" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aiu" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aiv" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,5"; - name = "military corvette" - }, -/area/shuttle/administration) -"aiw" = ( /obj/structure/bed/stool/chair/shuttle{ + dir = 4 + }, +/obj/machinery/light/colored/red{ dir = 8 }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/status_display{ - pixel_x = 34 +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) +"aiw" = ( +/obj/machinery/light/colored/red{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) +/obj/machinery/porta_turret/cannon, +/obj/effect/floor_decal/industrial/warning/full, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) "aix" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,5"; - name = "military corvette" - }, -/area/shuttle/administration) -"aiy" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "aiz" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,5"; - name = "military corvette" +/obj/structure/table/steel, +/obj/machinery/light/colored/red{ + dir = 4 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aiA" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,5"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "aiB" = ( /obj/structure/table/reinforced/steel, /turf/unsimulated/floor{ @@ -3996,69 +2792,24 @@ }, /turf/unsimulated/floor, /area/centcom/bar) -"aiT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aiU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aiV" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aiW" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - name = "military corvette" +/obj/item/storage/belt/utility/very_full, +/obj/item/storage/belt/utility/very_full, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/item/crowbar/red, +/obj/structure/closet/crate/drop/grey, +/obj/structure/sign/flag/nanotrasen{ + pixel_y = 30 }, -/area/shuttle/administration) -"aiX" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,4"; - name = "military corvette" +/obj/machinery/light/colored/red{ + dir = 8 }, -/area/shuttle/administration) -"aiY" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aiZ" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"aja" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,4"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ajb" = ( /turf/unsimulated/floor{ icon_state = "dark_preview" @@ -4226,108 +2977,32 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/bar) -"ajw" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ajx" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajy" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajz" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,3"; - name = "military corvette" - }, -/area/shuttle/administration) -"ajA" = ( -/obj/effect/floor_decal/corner/red{ - dir = 9 - }, -/obj/effect/shuttle_landmark/admin/start, -/turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ajB" = ( -/obj/machinery/turretid{ - check_arrest = 0; - check_records = 0; - pixel_x = 28; - req_access = list(101) - }, -/obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light{ +/obj/structure/bed/stool/chair/shuttle{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "corvette_exterior"; - name = "aft blast door"; - pixel_x = 32; - pixel_y = 12 +/obj/structure/sign/vacuum{ + pixel_x = -32 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) +"ajC" = ( +/obj/machinery/porta_turret/cannon, +/obj/effect/floor_decal/industrial/warning/full, +/obj/machinery/light/colored/red{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) +"ajE" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/machinery/light/colored/blue{ + dir = 4 }, /turf/simulated/floor/tiled/dark, -/area/shuttle/administration) -"ajC" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,3"; - name = "military corvette" - }, -/area/shuttle/administration) -"ajD" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajE" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajF" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,3"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajG" = ( -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 8; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/plating, -/area/shuttle/administration) +/area/shuttle/hapt) "ajH" = ( /obj/machinery/light{ dir = 4 @@ -4408,123 +3083,171 @@ "ajR" = ( /turf/simulated/wall, /area/merchant_station) -"ajS" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "1,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ajT" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "ajU" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,2"; - name = "military corvette" +/obj/structure/closet/secure_closet/guncabinet{ + name = "Heavy Asset Protection"; + req_access = list(103) }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/item/rig_module/mounted, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/shoes/magboots, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/pinpointer/advpinpointer, +/obj/item/rig_module/mounted/plasmacutter, +/obj/item/rig/ert/assetprotection, +/obj/item/device/radio/headset/ert, +/obj/item/clothing/under/syndicate/combat, +/obj/item/gun/energy/rifle/pulse, +/obj/item/gun/projectile/revolver/mateba, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun/incendiary, +/obj/item/ammo_magazine/assault_shotgun/shells, +/obj/item/gun/projectile/automatic/rifle/shotgun, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ajV" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/structure/table/reinforced/wood, +/obj/item/storage/box/fancy/cookiesnack, +/turf/simulated/floor/wood, +/area/shuttle/hapt) "ajW" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "5,2"; - name = "military corvette" +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 }, -/area/shuttle/administration) -"ajX" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,2"; - name = "military corvette" - }, -/area/shuttle/administration) +/obj/effect/floor_decal/spline/fancy/wood/cee, +/turf/simulated/floor/carpet, +/area/shuttle/hapt) "ajY" = ( -/obj/machinery/door/airlock/external{ - dir = 1; - frequency = 1399; - icon_state = "door_locked"; - id_tag = "admin_shuttle_hatch"; - locked = 1; - name = "Corvette Hatch"; - req_access = list(13) +/obj/item/clothing/suit/armor/carrier/ballistic, +/obj/item/clothing/shoes/sneakers, +/obj/item/clothing/gloves/white, +/obj/item/clothing/glasses/sunglasses/sechud, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/holster/hip, +/obj/item/device/radio/headset/ert, +/obj/item/clothing/head/beret/centcom/captain, +/obj/item/gun/energy/lawgiver, +/obj/item/card/id/centcom, +/obj/structure/closet/secure_closet/guncabinet{ + name = "Captain's Cabinet"; + req_access = list(101) }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/plasticflaps/airtight, -/obj/machinery/door/blast/regular/open{ - dir = 8; - id = "corvette_exterior"; - name = "blast door" +/obj/item/clothing/under/rank/centcom, +/obj/machinery/light/colored/red{ + dir = 8 }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"ajZ" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,2"; - name = "military corvette" - }, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "aka" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "10,2"; - name = "military corvette" +/obj/structure/table/reinforced/wood, +/obj/item/modular_computer/laptop/preset/command{ + pixel_y = 9 }, -/area/shuttle/administration) +/turf/simulated/floor/wood, +/area/shuttle/hapt) "akb" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,2"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/obj/structure/bed/stool/chair/office/bridge/pilot, +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "akc" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,2"; - name = "military corvette" +/obj/machinery/door/airlock/highsecurity{ + dir = 4; + name = "Ready Room"; + req_access = list(103) }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "akd" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,2"; - name = "military corvette" +/obj/item/gun/launcher/grenade{ + pixel_x = -2; + pixel_y = -7 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"ake" = ( -/obj/structure/shuttle_part/hapt{ - density = 0; - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "14,2"; - name = "military corvette" +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/flashbang{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/grenade/flashbang{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/grenade/flashbang{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/grenade/flashbang{ + pixel_x = -1; + pixel_y = 9 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/item/grenade/empgrenade{ + pixel_x = 9; + pixel_y = 11 + }, +/obj/structure/table/reinforced/steel, +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/frag{ + pixel_x = -10; + pixel_y = 9 + }, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, +/obj/machinery/light/colored/red{ + dir = 4 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "akf" = ( /obj/effect/ghostspawpoint{ identifier = "DeathERTSpawn"; @@ -4769,96 +3492,81 @@ /turf/simulated/floor/tiled/white, /area/merchant_station) "akE" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "2,1"; - name = "military corvette" +/obj/structure/table/reinforced/wood, +/obj/machinery/chemical_dispenser/coffeemaster/full{ + pixel_y = 14 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akF" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,1"; - name = "military corvette" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt{ + pixel_x = -7 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akG" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - name = "military corvette" +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt, +/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/nt{ + pixel_x = 7 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akH" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akI" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "6,1"; - name = "military corvette" - }, -/area/shuttle/administration) +/turf/simulated/floor/wood, +/area/shuttle/hapt) "akJ" = ( -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/effect/map_effect/marker/airlock/shuttle{ + master_tag = "crescent_shuttle"; + name = "crescent_shuttle"; + shuttle_tag = "crescent_shuttle"; + req_access = list(103); + req_one_access = null + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = null; + id_tag = "crescent_shuttle"; + dir = 4; + pixel_x = -26 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) +"akK" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 }, +/obj/machinery/airlock_sensor{ + frequency = null; + id_tag = "centcom_shuttle_dock_sensor"; + pixel_x = 31; + pixel_y = -2; + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + id = "crescent_exterior_blast"; + name = "aft blast door"; + pixel_x = 23; + pixel_y = -4; + dir = 5; + req_access = list(103) + }, +/obj/effect/map_effect/marker/airlock/shuttle{ + master_tag = "crescent_shuttle"; + name = "crescent_shuttle"; + shuttle_tag = "crescent_shuttle"; + req_access = list(103); + req_one_access = null + }, /turf/simulated/floor/reinforced, -/area/shuttle/administration) -"akK" = ( -/obj/machinery/light{ +/area/shuttle/hapt) +"akM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"akL" = ( -/turf/simulated/wall/shuttle/unique/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon = 'icons/turf/shuttles_unique/hapt_shuttle.dmi'; - icon_state = "9,1"; - name = "military corvette" +/obj/effect/floor_decal/corner/dark_blue/full{ + dir = 4 }, -/area/shuttle/administration) -"akM" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akN" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "akO" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,1"; - name = "military corvette" +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"akP" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "13,1"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "akQ" = ( /obj/machinery/newscaster/east{ pixel_y = 3 @@ -4989,106 +3697,37 @@ }, /turf/simulated/floor/wood, /area/merchant_station) -"alj" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "3,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"alk" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "4,0"; - name = "military corvette"; - outside_part = 0 - }, -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 1; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"all" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "5,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) -"alm" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "6,0"; - name = "military corvette"; - opacity = 1 - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) "aln" = ( /obj/machinery/door/airlock/external{ dir = 1; - frequency = 1399; icon_state = "door_locked"; - id_tag = "admin_shuttle_hatch"; locked = 1; - name = "Corvette Hatch"; + name = "Shuttle Hatch"; req_access = list(13) }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/plasticflaps/airtight, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"alo" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "9,0"; - name = "military corvette"; - opacity = 1 +/obj/effect/map_effect/marker_helper/airlock/exterior, +/obj/effect/map_effect/marker/airlock/shuttle{ + master_tag = "crescent_shuttle"; + name = "crescent_shuttle"; + shuttle_tag = "crescent_shuttle"; + req_access = list(103); + req_one_access = null }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/reinforced, +/area/shuttle/hapt) "alp" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "10,0"; - name = "military corvette" +/obj/machinery/bodyscanner{ + dir = 8 }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "alq" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "11,0"; - name = "military corvette"; - outside_part = 0 +/obj/machinery/computer/ship/navigation{ + dir = 8 }, -/obj/effect/decal/warning_stripes, -/obj/machinery/porta_turret/cannon, -/obj/machinery/light/spot{ - brightness_color = "#fa8282"; - color = "#fa8282"; - dir = 1; - icon_state = "tube1"; - name = "military spotlight" - }, -/turf/simulated/floor/reinforced, -/area/shuttle/administration) -"alr" = ( -/obj/structure/shuttle_part/hapt{ - desc = "A scary armed military corvette. Carries no branding or emblem of any sort. This thing looks mean."; - icon_state = "12,0"; - name = "military corvette" - }, -/turf/unsimulated/floor/plating, -/area/shuttle/administration) +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "als" = ( /obj/machinery/porta_turret/crescent, /obj/effect/floor_decal/industrial/warning/full, @@ -5339,11 +3978,8 @@ /turf/simulated/floor/wood, /area/merchant_station) "alQ" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/turf/unsimulated/floor/plating, -/area/centcom/specops) +/turf/simulated/wall/shuttle/hapt, +/area/shuttle/hapt) "alR" = ( /obj/effect/floor_decal/industrial/warning, /turf/unsimulated/floor/plating, @@ -5820,11 +4456,11 @@ /area/centcom/specops) "amX" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1399; - id_tag = "admin_shuttle_bay"; + frequency = 1380; + id_tag = "crescent_shuttle_bay"; name = "shuttle bay controller"; pixel_y = -25; - tag_door = "admin_shuttle_bay_door" + tag_door = "crescent_shuttle_bay_door" }, /turf/unsimulated/floor{ icon_state = "dark_preview" @@ -13424,7 +12060,9 @@ name = "Forward Docking Hatch"; req_access = list(13) }, -/obj/effect/shuttle_landmark/ert/start, +/obj/effect/shuttle_landmark/ert/start{ + dir = 8 + }, /turf/simulated/floor/shuttle/black, /area/shuttle/specops) "aHn" = ( @@ -26648,6 +25286,10 @@ }, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) +"bnS" = ( +/obj/machinery/vending/security, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "bnZ" = ( /obj/structure/lattice, /obj/structure/window/reinforced/crescent, @@ -30702,6 +29344,12 @@ /obj/structure/shuttle/engine/propulsion/burst/left, /turf/simulated/floor/plating, /area/shuttle/mercenary) +"bxq" = ( +/obj/effect/floor_decal/corner/red/full{ + dir = 8 + }, +/turf/space, +/area/centcom/control) "bxv" = ( /obj/structure/shuttle/engine/propulsion, /turf/simulated/floor/plating, @@ -30793,6 +29441,44 @@ density = 1 }, /area/antag/ninja) +"bxE" = ( +/obj/structure/table/rack, +/obj/item/plastique{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/plastique{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/plastique{ + pixel_x = 8 + }, +/obj/item/plastique{ + pixel_x = 8 + }, +/obj/item/grenade/flashbang/clusterbang{ + pixel_y = -10; + pixel_x = -5 + }, +/obj/item/grenade/flashbang/clusterbang{ + pixel_y = -10; + pixel_x = -5 + }, +/obj/item/grenade/flashbang/clusterbang{ + pixel_y = -10; + pixel_x = -5 + }, +/obj/item/grenade/flashbang/clusterbang{ + pixel_y = -10; + pixel_x = -5 + }, +/obj/item/grenade/flashbang/clusterbang{ + pixel_y = -10; + pixel_x = -5 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "bxG" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -35219,6 +33905,10 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) +"cbe" = ( +/obj/item/modular_computer/console/preset/command, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "ccr" = ( /obj/effect/floor_decal/corner/white{ dir = 5 @@ -35344,6 +34034,10 @@ /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/holofloor/carpet/rubber, /area/horizon/holodeck/source_basketball) +"cLI" = ( +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/shuttle/hapt) "cNb" = ( /obj/effect/decal/cleanable/cobweb2, /turf/simulated/floor/exoplanet/barren/raskara, @@ -35438,6 +34132,15 @@ /obj/effect/decal/cleanable/blood/oil, /turf/unsimulated/floor, /area/antag/jockey) +"dgh" = ( +/obj/structure/bed/stool/chair/shuttle{ + dir = 4 + }, +/obj/effect/floor_decal/spline/fancy/wood/cee{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/shuttle/hapt) "dgN" = ( /obj/structure/railing/mapped, /obj/effect/floor_decal/corner/grey{ @@ -35481,6 +34184,15 @@ name = "shallow water" }, /area/horizon/holodeck/source_konyang) +"djl" = ( +/obj/effect/floor_decal/corner/black{ + dir = 6 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "doG" = ( /obj/effect/floor_decal/spline/plain{ dir = 10 @@ -35682,6 +34394,10 @@ }, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) +"dVb" = ( +/obj/effect/shuttle_landmark/crescent/start, +/turf/unsimulated/floor/plating, +/area/centcom/specops) "dWC" = ( /obj/effect/floor_decal/corner/black{ dir = 5 @@ -36493,6 +35209,15 @@ /obj/structure/window/reinforced/holowindow, /turf/simulated/floor/holofloor/tiled, /area/horizon/holodeck/source_gym) +"hbO" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "hbU" = ( /obj/structure/bed/stool/chair/folding{ dir = 1 @@ -36905,6 +35630,12 @@ name = "shallow water" }, /area/horizon/holodeck/source_konyang) +"ikQ" = ( +/obj/machinery/chemical_dispenser/ert{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "ipe" = ( /obj/structure/sign/vacuum{ pixel_x = -32 @@ -37009,6 +35740,14 @@ name = "overgrowth" }, /area/horizon/holodeck/source_moghes) +"iMi" = ( +/obj/machinery/access_button{ + pixel_x = 32; + pixel_y = 29; + master_tag = "crescent_shuttle" + }, +/turf/unsimulated/floor/plating, +/area/centcom/specops) "iNk" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -37417,6 +36156,13 @@ /obj/effect/decal/fake_object/light_source/invisible, /turf/simulated/floor/carpet, /area/antag/jockey) +"kbE" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Ready Room"; + req_access = list(103) + }, +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "kcw" = ( /obj/effect/floor_decal/corner/red/diagonal, /turf/simulated/floor/marble/dark, @@ -37782,6 +36528,15 @@ /obj/effect/floor_decal/corner/full, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) +"lhf" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/machinery/light/colored/blue{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "ljU" = ( /obj/machinery/acting/changer, /turf/simulated/floor/carpet, @@ -37919,6 +36674,14 @@ }, /turf/simulated/floor/exoplanet/grass/grove, /area/centcom/shared_dream) +"lCF" = ( +/obj/machinery/portable_atmospherics/canister/air/airlock, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/door/window/westright, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "lDj" = ( /obj/structure/table/stone/marble, /obj/item/flame/candle, @@ -38138,6 +36901,25 @@ name = "overgrowth" }, /area/horizon/holodeck/source_moghes) +"mqr" = ( +/obj/item/storage/belt/medical{ + pixel_x = -3; + pixel_y = -11 + }, +/obj/item/reagent_containers/hypospray/cmo{ + layer = 2.99; + pixel_x = -2; + pixel_y = -3 + }, +/obj/structure/table/steel, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/chem_disp_cartridge/rezadone{ + pixel_x = 9; + pixel_y = 11 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "mrZ" = ( /turf/simulated/floor/exoplanet/water/shallow{ dir = 8; @@ -38529,6 +37311,10 @@ }, /turf/unsimulated/floor/plating, /area/shuttle/transport1) +"nXn" = ( +/obj/machinery/hologram/holopad/long_range, +/turf/simulated/floor/shuttle/dark_red, +/area/shuttle/hapt) "nZM" = ( /obj/item/banhammer, /obj/structure/table/rack, @@ -38727,6 +37513,23 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) +"oLP" = ( +/obj/structure/bed/stool/chair/shuttle{ + can_dismantle = 1; + dir = 8; + name = "worn chair" + }, +/obj/machinery/light/colored/red{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + id = "crescent_shuttle_rapid_deploy"; + name = "Rapid Deployment"; + req_access = list(103); + pixel_y = -20 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "oNM" = ( /obj/structure/dueling_table/no_collide{ icon_state = "bottom_right" @@ -38932,6 +37735,15 @@ /obj/item/clothing/mask/trinary_mask, /turf/simulated/floor/marble, /area/horizon/holodeck/source_trinary) +"pgV" = ( +/obj/effect/floor_decal/corner/dark_blue/full{ + dir = 1 + }, +/obj/structure/sign/flag/nanotrasen{ + pixel_x = 32 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "pic" = ( /obj/machinery/light/small/emergency{ dir = 4 @@ -39356,6 +38168,24 @@ }, /turf/simulated/floor/holofloor/carpet, /area/horizon/holodeck/source_meetinghall) +"qTA" = ( +/obj/item/clothing/suit/armor/carrier/ballistic, +/obj/item/clothing/shoes/sneakers, +/obj/item/clothing/gloves/white, +/obj/item/clothing/glasses/sunglasses/sechud, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/holster/hip, +/obj/item/device/radio/headset/ert, +/obj/item/clothing/head/beret/centcom/captain, +/obj/item/gun/energy/lawgiver, +/obj/item/card/id/centcom, +/obj/structure/closet/secure_closet/guncabinet{ + name = "Captain's Cabinet"; + req_access = list(101) + }, +/obj/item/clothing/under/rank/centcom_commander, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "qVG" = ( /obj/effect/step_trigger/thrower/shuttle/north, /obj/effect/shuttle_landmark/intrepid/transit{ @@ -39551,6 +38381,15 @@ }, /turf/simulated/floor/beach/water/alt, /area/centcom/shared_dream) +"rvp" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "crescent_bridge_blast"; + name = "blast door" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "rzL" = ( /obj/effect/floor_decal/carpet, /turf/simulated/floor/holofloor/carpet, @@ -39564,6 +38403,14 @@ }, /turf/simulated/floor/tiled, /area/merchant_station/warehouse) +"rIq" = ( +/obj/machinery/door/airlock/highsecurity{ + dir = 4; + name = "Cockpit"; + req_access = list(103) + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "rIW" = ( /obj/structure/window/reinforced/holowindow, /obj/structure/bed/stool/chair/holochair, @@ -39668,6 +38515,16 @@ }, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_trinary) +"syj" = ( +/obj/machinery/door/blast/regular/open{ + dir = 8; + id = "crescent_exterior_blast"; + name = "blast door" + }, +/turf/unsimulated/floor{ + icon_state = "dark_preview" + }, +/area/centcom/specops) "szG" = ( /obj/structure/bonfire/fireplace, /obj/item/clothing/accessory/scarf/zebra{ @@ -39805,6 +38662,15 @@ icon_state = "beach" }, /area/horizon/holodeck/source_beach) +"tdh" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 9 + }, +/obj/structure/sign/flag/nanotrasen{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "tdq" = ( /turf/simulated/floor/exoplanet/water/shallow{ icon = 'icons/turf/flooring/exoplanet/konyang.dmi'; @@ -40359,6 +39225,39 @@ /obj/effect/floor_decal/corner/full, /turf/simulated/floor/marble/dark, /area/horizon/holodeck/source_tribunal) +"uYM" = ( +/obj/structure/closet/secure_closet/guncabinet{ + name = "Heavy Asset Protection"; + req_access = list(103) + }, +/obj/item/rig_module/mounted, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/shoes/magboots, +/obj/item/melee/baton/loaded, +/obj/item/storage/belt/security/tactical, +/obj/item/handcuffs, +/obj/item/handcuffs, +/obj/item/pinpointer/advpinpointer, +/obj/item/rig_module/mounted/plasmacutter, +/obj/item/rig/ert/assetprotection, +/obj/item/device/radio/headset/ert, +/obj/item/clothing/under/syndicate/combat, +/obj/item/gun/energy/rifle/pulse, +/obj/item/gun/projectile/revolver/mateba, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/a454, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun, +/obj/item/ammo_magazine/assault_shotgun/incendiary, +/obj/item/ammo_magazine/assault_shotgun/shells, +/obj/item/gun/projectile/automatic/rifle/shotgun, +/obj/machinery/light/colored/red{ + dir = 8 + }, +/turf/simulated/floor/shuttle/black, +/area/shuttle/hapt) "uZh" = ( /obj/structure/flora/rock{ icon_state = "basalt2"; @@ -40859,6 +39758,15 @@ name = "shallow water" }, /area/horizon/holodeck/source_konyang) +"wBC" = ( +/obj/machinery/body_scanconsole{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/shuttle/hapt) "wCE" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green{ @@ -40883,6 +39791,14 @@ }, /turf/unsimulated/floor, /area/antag/jockey) +"wOw" = ( +/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, +/obj/machinery/door/blast/regular/open{ + id = "crescent_bridge_blast"; + name = "blast door" + }, +/turf/simulated/floor/tiled/dark/full, +/area/shuttle/hapt) "wUz" = ( /obj/structure/table/wood, /turf/simulated/floor/holofloor/grass{ @@ -41282,6 +40198,15 @@ name = "shallow water" }, /area/horizon/holodeck/source_konyang) +"ygc" = ( +/obj/effect/floor_decal/corner/black{ + dir = 9 + }, +/obj/structure/sign/flag/nanotrasen{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/dark, +/area/shuttle/hapt) "ygU" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -48935,28 +47860,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl aaa aaa aaa @@ -49192,28 +48117,28 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abl +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abl aaa aaa aaa @@ -49450,26 +48375,26 @@ aaa abl abl abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +afj +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ abl abl abl @@ -49704,32 +48629,32 @@ aaa aaa aaa aaa -abm -abt -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI -abI +abl +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +aha alQ +alQ +alQ +alQ +alQ +alQ +aci +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ ajb ajb abl @@ -49961,13 +48886,23 @@ aaa aaa aaa aaa -abm -abu +abl abJ +alQ +alQ abJ -abJ -abJ -adh +agL +alQ +alQ +alQ +aha +uYM +ajU +ajU +uYM +alQ +alQ +aha abJ abJ abJ @@ -49977,16 +48912,6 @@ abJ abJ abJ abJ -abJ -abJ -abJ -abJ -abJ -adh -ajS -abJ -abJ -alR ajb ajb abl @@ -50218,32 +49143,32 @@ aaa aaa aaa aaa -abm -abu +abl abJ -aca -acu -acN -adi -adE -adW -aen -aeJ +adF +alQ +alQ +alQ +alQ +alQ +alQ +bnS afd -afu +afd +afd +afd +alQ +alQ +aha +alQ +alQ +alQ +alQ +aha +aiw abJ abJ abJ -agW -ahy -ahP -ais -aiT -ajw -ajT -akE -abJ -alR ajb ajb anE @@ -50475,32 +49400,32 @@ aaa aaa aaa aaa -abm -abu -abK -acb -acv -acO -adj +abl +abJ adF -adX -aeo +alQ +alQ +alQ +alQ +alQ +alQ aeK -afe -afv +aix +aix +aix afM -age -agC +alQ +aiW agX -ahz -ahQ -ait -aiU +agX +aiu ajx -ajU -akF -alj -alR +ahQ +abJ +abJ +abJ +abJ +abJ ajb amW anE @@ -50732,32 +49657,32 @@ aaa aaa aaa aaa -abm -abu -abL -acc -acw -acP -adk -adk -adk -aep -aeL -aff -afw -afN -agf -agD -agY -ahA -ahR -aiu -aiV -ajy -ajV -akG -alk -alR +abl +abJ +adF +alQ +alQ +alQ +alQ +alQ +alQ +acg +afd +afd +afd +aix +kbE +aix +aix +aix +aix +aix +ahQ +abJ +abJ +abJ +abJ +abJ ajb ajb anE @@ -50989,32 +49914,32 @@ aaa aaa aaa aaa -abm -abu -abM -acd -acx -acQ -adl -adl -adY -aeq -aeM +abl +abJ +alQ +alQ +abJ +alQ +alQ +alQ +alQ +aha +akd +bxE afg -afg -afg -agg +acV +alQ agE -agZ -ahB +agW ahS -aiv -aiW -ajz -ajW -akH -all -alR +ahS +oLP +alQ +aha +alQ +abJ +abJ +abJ ajb ajb anF @@ -51246,32 +50171,32 @@ aaa aaa aaa aaa -abm -abu -abN -ace -acy -acR -adm -agi -adY -aer -aeN -aea -aea -aea -agh -agF +abl +abJ +abJ +abJ +ahC +alQ +alQ +alQ +alQ aha -ahC -ahC -ahC -ahC +alQ +alQ +alQ +alQ +alQ +akc aha -ajX -akI -alm -alR +alQ +alQ +alQ +alQ +aha +alQ +alQ +alQ +abJ ajb ajb anF @@ -51503,32 +50428,32 @@ aaa aaa aaa aaa -abm -abu -abO -acf -acz -acS -adn +abl +abJ +abJ +abJ +abJ +abJ +ahE adH -adY -aes +hbO aeO aeO +akO +hbO +ygc aeO -afO +akO +akO +aeO +aeO +lhf +tdh +afQ agi -agG -ahb -agi -agi -agi -agi -ajA -ajY akJ aln -alR +dVb ajb ajb anE @@ -51760,32 +50685,32 @@ aaa aaa aaa aaa -abm -abu -abP -acg -acA -acS -ado -adI -adZ -aet -aeP -aeP +abl +abJ +abJ +abJ +abJ +abJ +ahE +pgV +afx +afx afx -afP -agj -agH ahc +djl +ahR +afx +ahc +ahc +afx +afx +ajE +adm +akM ahD -ahD -ahD -ahD -ahD -ajY akK aln -alR +iMi ajb amW anE @@ -52017,32 +50942,32 @@ aaa aaa aaa aaa -abm -abu -abQ -ach -acB -acT -adp -adJ -aea -aeu -aeQ -afh -afy -afQ -agk -agI -ahd +abl +abJ +abJ +abJ +ahC +alQ +alQ +alQ ahE -ahE -aiw -ahE -ajB -ajZ -akL -alo -alR +aha +agK +alQ +alQ +alQ +adZ +alQ +aha +alQ +rIq +alQ +alQ +lCF +alQ +alQ +alQ +abJ ajb ajb anE @@ -52274,32 +51199,32 @@ aaa aaa aaa aaa -abm -abu -abR -aci -acC -acU -adq -adq -aea -aeu -aeR -afi +abl +abJ +alQ +alQ +abJ +alQ +alQ +akE +dgh +ajW +cLI +alQ afz afR agl -agJ -ahe +alQ +ajY ahF -ahT aix -aiX -ajC -aka -akM -alp -alR +cbe +alQ +aha +alQ +abJ +abJ +abJ ajb ajb abl @@ -52531,32 +51456,32 @@ aaa aaa aaa aaa -abm -abu -abS -acj -acD -acV -adr -adr -adr -aev +abl +abJ +adF +alQ +alQ +alQ +alQ +aka +aeR +aeR +aeR +alQ aeS -afj -afA -afS +afT agm -agK -ahf -ahG -ahU -aiy -aiY -ajD +alQ +qTA +nXn akb -akN -alq -alR +adp +rvp +abJ +abJ +abJ +abJ +abJ ajb ajb abl @@ -52788,32 +51713,32 @@ aaa aaa aaa aaa -abm -abu -abT -ack -acE -acW -ads -adK -aeb -aew +abl +abJ +adF +alQ +alQ +alQ +alQ +ajV +aeR +aeR +aeR +alQ aeT -afk -afB afT agn -agL -ahg -ahH -ahV +alQ aiz -aiZ -ajE -akc -akO -alr -alR +ahH +alq +aiz +rvp +abJ +abJ +abJ +abJ +abJ ajb ajb abl @@ -53045,32 +51970,32 @@ aaa aaa aaa aaa -abm -abu +abl abJ -acl -acF -acX -adt +adF +alQ +alQ +alQ +alQ adL aec -aex -aeU -afl +abm +agG +alQ afC +agI +wBC +alQ +aha +wOw +wOw +alQ +alQ +aha +aiw abJ abJ abJ -ahh -ahI -ahW -aiA -aja -ajF -akd -akP -abJ -alR ajb ajb anG @@ -53302,13 +52227,23 @@ aaa aaa aaa aaa -abm -abu +abl abJ +alQ +alQ abJ -abJ -abJ -adu +agH +alQ +alQ +wOw +wOw +wOw +alQ +mqr +ikQ +alp +alQ +aha abJ abJ abJ @@ -53318,16 +52253,6 @@ abJ abJ abJ abJ -abJ -abJ -abJ -abJ -abJ -ajG -ake -abJ -abJ -alR ajb ajb abl @@ -53559,32 +52484,32 @@ aaa aaa aaa aaa -abm -abv -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -abU -alS +abl +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +alQ +alQ +alQ +alQ +alQ +ajC +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ ajb amX abl @@ -53819,6 +52744,22 @@ aaa abl abl abl +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +abJ +adh +abJ +abJ +abJ +abJ +abJ +abJ abl abl abl @@ -53826,22 +52767,6 @@ abl abl abl abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -abl -ajb -ajb -ajb -ajb -ajb -ajb ajb ajb abl @@ -54075,23 +53000,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abl +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU +abU abl ajc ajb @@ -54332,23 +53257,23 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl +abl abl ajb ajb @@ -54613,7 +53538,7 @@ akf akf akf ajb -ajb +syj ajb abl aor @@ -55373,7 +54298,7 @@ aaa aaa aaI ago -agp +bxq ahi ahi ahi