From a7cc2ce61ab66b850b462e027e204e7727d6fbc2 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Thu, 22 Dec 2022 12:33:25 -0500 Subject: [PATCH] getting close --- .../subtypes/animal/alien animals/catslug.dm | 10 + maps/stellar_delight/ship_centcom.dmm | 1 + maps/stellar_delight/stellar_delight1.dmm | 619 ++++++------------ maps/stellar_delight/stellar_delight2.dmm | 12 +- maps/tether/submaps/tether_centcom.dmm | 1 + 5 files changed, 230 insertions(+), 413 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 5f287863d0f..8da34312868 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -851,6 +851,16 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/custom/pilotslug) say_list_type = /datum/say_list/catslug/custom/pilotslug +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug/Initialize() + . = ..() + if(prob(25)) + var/list/possible_targets = list() + for(var/obj/machinery/computer/ship/helm/h in world) + if(h.z in using_map.player_levels) + possible_targets |= h + var/final = pick(possible_targets) + forceMove(get_turf(final)) + /datum/category_item/catalogue/fauna/catslug/custom/pilotslug name = "Alien Wildlife - Catslug - Navigator Purrverick" desc = "A resident at NSB Rascal's Pass, Navigator Purrverick \ diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 4b5c60d3f47..895ed753825 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -8403,6 +8403,7 @@ pixel_x = -24; pixel_y = 25 }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug, /turf/simulated/floor/tiled, /area/centcom/holding) "HK" = ( diff --git a/maps/stellar_delight/stellar_delight1.dmm b/maps/stellar_delight/stellar_delight1.dmm index bb3d5036a76..0819007ec5a 100644 --- a/maps/stellar_delight/stellar_delight1.dmm +++ b/maps/stellar_delight/stellar_delight1.dmm @@ -244,8 +244,13 @@ /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "ay" = ( -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/multitool/sd_buffered{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploequipment) "az" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -364,11 +369,16 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "aJ" = ( -/obj/structure/bed/chair/office/dark{ +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/command{ dir = 4 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "aK" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -2065,11 +2075,26 @@ /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "em" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/device/gps{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/device/gps{ + pixel_x = 6; + pixel_y = -4 }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "en" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -2195,7 +2220,7 @@ icon_state = "1-2" }, /turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/exploration) "ez" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/sterile/latex, @@ -2289,9 +2314,25 @@ /turf/simulated/floor/carpet, /area/library) "eJ" = ( -/obj/machinery/mineral/equipment_vendor/survey, +/obj/structure/table/rack/shelf, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) +/area/stellardelight/deck1/exploequipment) "eL" = ( /obj/structure/mirror{ pixel_y = 38 @@ -2660,10 +2701,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardfore) "fD" = ( -/obj/structure/closet/secure_closet/pathfinder, -/obj/item/device/bluespaceradio/sd_prelinked, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -64 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "fE" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -4850,15 +4893,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) -"jS" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "jT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -5460,8 +5494,8 @@ pixel_x = -32 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -5691,8 +5725,8 @@ /obj/machinery/door/airlock/angled_bay/standard/glass{ dir = 4; door_color = "#333333"; - name = "Exploration Equipment Room"; - req_one_access = list(19,43,66); + name = "Auxiliary EVA Equipment Room"; + req_one_access = list(18,19,43); stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -5844,14 +5878,14 @@ /turf/simulated/floor/tiled/monotile, /area/janitor) "md" = ( -/obj/structure/bed/chair/office/dark{ +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair/backed_red{ dir = 8 }, -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "me" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6167,20 +6201,15 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "mH" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/exploration, -/obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /obj/machinery/firealarm/angled, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "mI" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -6321,8 +6350,8 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ dir = 8; door_color = "#333333"; - name = "Exploration"; - req_one_access = list(19,43,66); + name = "Away Mission Meeting Room"; + req_one_access = null; stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -6361,16 +6390,6 @@ /obj/effect/floor_decal/milspec/color/black, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"na" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "nb" = ( /obj/structure/disposaloutlet, /obj/structure/disposalpipe/trunk{ @@ -6388,7 +6407,16 @@ /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) "nd" = ( -/obj/structure/closet/secure_closet/sar, +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(5) + }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ne" = ( @@ -7283,14 +7311,11 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "pd" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, /obj/machinery/computer/ship/navigation/telescreen{ pixel_x = -64 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "pe" = ( /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/stellardelight/deck1/miningshuttle) @@ -7552,9 +7577,6 @@ "pF" = ( /turf/simulated/wall/bay/purple, /area/stellardelight/deck1/researchequip) -"pG" = ( -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "pH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ @@ -7847,9 +7869,6 @@ /area/stellardelight/deck1/explobriefing) "ql" = ( /obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Exploration Briefing" - }, /obj/machinery/light{ dir = 1 }, @@ -8382,25 +8401,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/assembly/robotics) -"rv" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) "rw" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -8553,22 +8553,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/medical/morgue) "rM" = ( -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "rN" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8981,8 +8971,7 @@ /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/double/glass{ door_color = "#333333"; - name = "Exploration"; - req_one_access = null; + name = "Shuttle Bay"; stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -8993,12 +8982,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardfore) -"sE" = ( -/obj/structure/bed/chair/backed_red{ - dir = 4 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "sF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9100,8 +9083,8 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "sO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -9244,6 +9227,7 @@ /area/maintenance/stellardelight/deck1/portcent) "te" = ( /obj/machinery/firealarm/angled, +/obj/machinery/chemical_analyzer, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "tf" = ( @@ -9291,8 +9275,8 @@ "tm" = ( /obj/structure/dogbed, /mob/living/simple_mob/animal/passive/tindalos/twigs, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "tn" = ( /obj/machinery/light{ dir = 4 @@ -9639,10 +9623,17 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "uc" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(43) }, +/obj/item/device/bluespaceradio/sd_prelinked, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ue" = ( @@ -9661,14 +9652,11 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uf" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "ug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -9796,22 +9784,10 @@ /turf/space/internal_edge/left, /area/stellardelight/deck1/starboard) "ux" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/angled_bay/standard/color{ - door_color = "#333333"; - fill_color = "#757575"; - name = "Pathfinder"; - req_access = list(44); - stripe_color = "#5a19a8" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "uy" = ( /obj/structure/table/rack/shelf/steel, /obj/item/weapon/gun/energy/ionrifle/pistol, @@ -10129,8 +10105,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "vf" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/yellow{ @@ -10611,11 +10587,6 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "wk" = ( -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = -30 - }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" @@ -11633,14 +11604,6 @@ /obj/random/maintenance, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/starboardcent) -"ys" = ( -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "yt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11771,16 +11734,6 @@ }, /turf/simulated/floor/tiled/dark, /area/assembly/robotics) -"yJ" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "yK" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12013,12 +11966,6 @@ }, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm8) -"zh" = ( -/obj/structure/bed/chair/backed_red{ - dir = 8 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "zi" = ( /obj/machinery/space_heater, /turf/simulated/floor, @@ -12055,10 +12002,8 @@ "zm" = ( /obj/structure/closet/walllocker_double/east, /obj/item/device/camera, -/obj/item/device/universal_translator, /obj/item/weapon/folder/yellow, /obj/item/weapon/pen, -/obj/item/weapon/storage/box/lights/mixed, /obj/structure/cable/green{ color = "#42038a"; icon_state = "1-2" @@ -12258,13 +12203,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/xenobiology) "zK" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/expedition_medical, -/obj/item/clothing/head/helmet/space/void/expedition_medical, /obj/machinery/light, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -12320,7 +12258,7 @@ color = "#42038a"; icon_state = "4-8" }, -/obj/machinery/camera/network/exploration, +/obj/machinery/camera/network/command, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "zP" = ( @@ -12700,10 +12638,6 @@ }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) -"AE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "AF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13495,36 +13429,11 @@ /turf/simulated/floor/wood, /area/library) "Cl" = ( -/obj/structure/table/rack/shelf, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/marker_beacon/thirty{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = -6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, -/obj/item/device/gps{ - pixel_x = 6; - pixel_y = -4 - }, /obj/machinery/light{ dir = 1 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/exploration{ +/obj/machinery/camera/network/command{ dir = 4 }, /turf/simulated/floor/tiled, @@ -13706,10 +13615,6 @@ "CG" = ( /turf/simulated/wall/bay/white, /area/stellardelight/deck1/resleeving) -"CH" = ( -/obj/structure/closet/secure_closet/explorer, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "CI" = ( /obj/machinery/computer/secure_data, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -13756,10 +13661,6 @@ /obj/structure/low_wall/bay/reinforced/red, /turf/simulated/floor, /area/prison/cell_block/C) -"CN" = ( -/obj/structure/bed/chair/office/dark, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/explobriefing) "CO" = ( /obj/structure/table/woodentable, /obj/machinery/librarycomp, @@ -13802,7 +13703,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/table/standard, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "CU" = ( @@ -14553,38 +14454,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"EF" = ( -/obj/structure/table/rack/shelf, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = -4 - }, -/obj/item/device/radio{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/device/radio{ - pixel_x = 4; - pixel_y = 5 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 28 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 36 - }, -/turf/simulated/floor/tiled, -/area/stellardelight/deck1/explobriefing) "EG" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -14985,8 +14854,8 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/machinery/camera/network/exploration{ - dir = 8 +/obj/machinery/camera/network/command{ + dir = 9 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) @@ -15139,18 +15008,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) -"FS" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = -4 - }, -/obj/item/weapon/hand_labeler, -/obj/item/device/multitool/sd_buffered{ - pixel_y = 2 - }, -/obj/item/weapon/hand_labeler, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploequipment) "FT" = ( /turf/simulated/wall/bay/brown, /area/library) @@ -15355,19 +15212,6 @@ "Gr" = ( /turf/simulated/wall/bay/r_wall/red, /area/security/tactical) -"Gt" = ( -/obj/machinery/power/apc/angled{ - dir = 4 - }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "Gu" = ( /obj/item/weapon/bedsheet/bluedouble, /obj/structure/bed/double/padded, @@ -15667,17 +15511,18 @@ /turf/simulated/floor, /area/stellardelight/deck1/explobriefing) "Hf" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/requests_console{ - department = "Exploration"; - name = "Exploration Requests Console"; - pixel_x = -30 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/obj/structure/bed/chair/backed_red{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "Hg" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15915,15 +15760,11 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "HG" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Pathfinder's Office" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/exploration) "HH" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -16337,8 +16178,8 @@ /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#525252"; - name = "Exploration Shuttle"; - req_one_access = list(19,43,67,66,5); + name = "EVA Shuttle"; + req_one_access = list(18,19,43); stripe_color = "#408f3b" }, /obj/structure/cable/green{ @@ -16937,9 +16778,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/rnd/research) -"JL" = ( -/turf/simulated/wall/bay/r_wall/steel, -/area/stellardelight/deck1/pathfinder) "JM" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -17101,10 +16939,17 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Ke" = ( -/obj/structure/closet/secure_closet/explorer, -/obj/machinery/camera/network/exploration{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/exploration, +/obj/item/clothing/head/helmet/space/void/exploration, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(43) }, +/obj/item/device/mapping_unit, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Kf" = ( @@ -17447,8 +17292,8 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "KU" = ( -/obj/machinery/camera/network/exploration{ - dir = 8 +/obj/machinery/camera/network/command{ + dir = 9 }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) @@ -18481,16 +18326,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/stellardelight/substation/exploration) -"MW" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/bay/reinforced, -/obj/machinery/door/blast/angled/open{ - dir = 2; - id = "explowindowlockdown" - }, -/obj/structure/low_wall/bay/reinforced/steel, -/turf/simulated/floor, -/area/stellardelight/deck1/pathfinder) "MX" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -18765,9 +18600,15 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "Nx" = ( -/obj/structure/closet/secure_closet/sar, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/table/rack/shelf, +/obj/item/weapon/tank/oxygen, +/obj/item/device/suit_cooling_unit, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/expedition_medical, +/obj/item/clothing/head/helmet/space/void/expedition_medical, +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(5) }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) @@ -18954,7 +18795,7 @@ icon_state = "1-2" }, /turf/simulated/wall/bay/r_wall/steel, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/exploration) "NZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -20766,7 +20607,7 @@ /area/rnd/xenobiology/xenoflora) "RS" = ( /turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/pathfinder) +/area/stellardelight/deck1/explobriefing) "RT" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/white{ @@ -21163,8 +21004,8 @@ icon_state = "1-8" }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = 32 }, /obj/structure/sign/directions/science{ @@ -21208,8 +21049,8 @@ dir = 8 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_y = -32 }, /turf/simulated/floor/tiled/techmaint, @@ -21591,10 +21432,6 @@ color = "#42038a"; icon_state = "4-8" }, -/obj/structure/cable/green{ - color = "#42038a"; - icon_state = "2-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21708,9 +21545,9 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; + desc = "A direction sign, pointing out the way to the shuttle bay."; dir = 10; - name = "\improper Exploration Department"; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -22005,7 +21842,6 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Up" = ( -/obj/machinery/chemical_analyzer, /obj/machinery/status_display{ pixel_y = 32 }, @@ -22284,6 +22120,7 @@ dir = 4; pixel_x = 24 }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "US" = ( @@ -22347,8 +22184,6 @@ /area/rnd/xenobiology) "UW" = ( /obj/effect/floor_decal/industrial/outline, -/obj/structure/closet/secure_closet/guncabinet/excursion, -/obj/item/weapon/pickaxe/drill, /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/stellardelight/deck1/exploshuttle) "UX" = ( @@ -22450,9 +22285,6 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) -"Vj" = ( -/turf/simulated/wall/bay/purple, -/area/stellardelight/deck1/exploequipment) "Vk" = ( /obj/structure/closet/walllocker_double/east{ desc = "A wall mounted storage cabinet marked with a cross and warning icon. This seems to contain an assortment of emergency supplies."; @@ -22506,9 +22338,7 @@ color = "#42038a"; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "Vp" = ( @@ -23673,7 +23503,7 @@ dir = 4; door_color = "#ffffff"; name = "maintenance access"; - req_one_access = list(19,43,66); + req_one_access = null; stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -23972,10 +23802,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) -"Yl" = ( -/obj/machinery/photocopier, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "Ym" = ( /obj/structure/cable/pink{ icon_state = "1-8" @@ -24147,15 +23973,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora_storage) -"YD" = ( -/obj/structure/bed/chair/backed_red{ - dir = 4 - }, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/milspec, -/area/stellardelight/deck1/exploration) "YE" = ( /turf/simulated/floor, /area/maintenance/stellardelight/substation/cargo) @@ -24329,12 +24146,6 @@ "YT" = ( /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) -"YU" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/steel/cargo, -/area/stellardelight/deck1/pathfinder) "YV" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -24716,16 +24527,10 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "ZN" = ( -/obj/structure/table/rack/shelf, -/obj/item/weapon/tank/oxygen, -/obj/item/device/suit_cooling_unit, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/exploration, -/obj/item/clothing/head/helmet/space/void/exploration, /obj/machinery/light{ dir = 1 }, +/obj/machinery/mineral/equipment_vendor/survey, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "ZO" = ( @@ -31485,11 +31290,11 @@ Jp um if WM -EF +Rz Rz Uo kg -aJ +kg kg ji kO @@ -31629,11 +31434,11 @@ XM WM Up Rz -CN +TC zZ yP zZ -rv +OB Rz ny bD @@ -31911,12 +31716,12 @@ Pu Ua Ec WM -eJ +Rz Rz NA -em An -em +An +An sN Rz ny @@ -32195,7 +32000,7 @@ pC pC pC pC -Vj +pC vy mW RS @@ -32203,7 +32008,7 @@ RS RS RS RS -JL +nk RF vF uq @@ -32332,20 +32137,20 @@ ma pC uc Ke -CH +pC Aa -FS +pC nd Nx -Vj +pC XH TR -RS +WH mH -Yl -fD +WH +WH Hf -JL +LZ bD hE JE @@ -32474,20 +32279,20 @@ fO pC Vo Tr -Tr +aJ tW -AE +ZQ ZQ sO -Vj +pC CK jZ -RS +DO uf -ay +DO pd ve -MW +uB uq vF bD @@ -32613,23 +32418,23 @@ Aj vj vU uu -Vj +pC ZN -yJ -yJ +tY +tY GB tY -na +tY zK -Vj +pC By TD ux rM -jS -YU +Qt +Qt HG -MW +uB uq vF uq @@ -32755,23 +32560,23 @@ Aj gn OZ Bl -Vj +pC te tY At vw tY tY -pG -Vj +eJ +pC PE jZ -RS -Gt -ay +PC +PC +PC md tm -JL +LZ bD vF uq @@ -32897,15 +32702,15 @@ Aj rk OZ Bl -Vj +pC CT -AE -AE +ay +em eu AD UR xk -Vj +pC Jz LO ey @@ -33039,21 +32844,21 @@ Aj Dm Gh Bl -Vj +pC tu tu -Vj +pC lO -Vj +pC tu tu -Vj +pC zL SE vz WH -YD -sE +WH +WH gh uB bD @@ -33194,7 +32999,7 @@ UT Md Qt Qt -Qt +fD Qt ho uB @@ -33325,7 +33130,7 @@ nY fS xb PN -ys +DO ce zs DO @@ -33334,8 +33139,8 @@ Pw DO iQ KU -zh -zh +PC +PC lw PC Ty diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index 3f3a844f2ec..5cc8f0e0de2 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -615,8 +615,8 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = 32; pixel_y = -6 }, @@ -685,8 +685,8 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; + desc = "A direction sign, pointing out the way to the shuttle bay."; + name = "\improper Shuttle Bay"; pixel_x = -32; pixel_y = -6 }, @@ -5509,9 +5509,9 @@ pixel_y = 6 }, /obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; + desc = "A direction sign, pointing out the way to the shuttle bay."; dir = 1; - name = "\improper Exploration Department"; + name = "\improper Shuttle Bay"; pixel_x = 32; pixel_y = -12 }, diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index 6ef6173ce04..a0c998a91bd 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -8437,6 +8437,7 @@ pixel_x = -24; pixel_y = 25 }, +/mob/living/simple_mob/vore/alienanimals/catslug/custom/pilotslug, /turf/simulated/floor/tiled, /area/centcom/holding) "HK" = (