From ef74d4ee5f67576b970dac1abee0b0663b2b033b Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Date: Tue, 25 Nov 2025 14:57:30 +0000 Subject: [PATCH] Allows the Trader Shuttle to be Manipulated by the Shuttle Manipulator + Very minor other trade shuttle content (#30849) * A surprising number of file changes, this needed. * lateload wooo * Update centcomm.dmm * Update centcomm.dmm * Update shuttles.dm --------- Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com> --- _maps/map_files/generic/centcomm.dmm | 137 ++-- ...trader_base_glint.dmm => trader_glint.dmm} | 0 ...trader_base_guild.dmm => trader_guild.dmm} | 0 .../{trader_base_skip.dmm => trader_skip.dmm} | 0 ...ader_base_skrell.dmm => trader_skrell.dmm} | 0 .../{trader_base_sol.dmm => trader_sol.dmm} | 10 +- ...trader_base_stead.dmm => trader_stead.dmm} | 0 ...ase_syndicate.dmm => trader_syndicate.dmm} | 0 ...trader_base_synth.dmm => trader_synth.dmm} | 0 ...ader_base_techno.dmm => trader_techno.dmm} | 0 .../{trader_base_ussp.dmm => trader_ussp.dmm} | 21 +- _maps/map_files/stations/boxstation.dmm | 10 +- _maps/map_files/stations/cerestation.dmm | 12 +- _maps/map_files/stations/deltastation.dmm | 614 +++++++++--------- _maps/map_files/stations/emeraldstation.dmm | 12 +- _maps/map_files/stations/metastation.dmm | 12 +- code/controllers/subsystem/SSshuttles.dm | 5 +- .../subsystem/non_firing/SSlate_mapping.dm | 7 +- .../subsystem/non_firing/SSmapping.dm | 2 + code/datums/shuttles.dm | 9 +- code/modules/shuttle/shuttle.dm | 16 +- 21 files changed, 432 insertions(+), 435 deletions(-) rename _maps/map_files/shuttles/trader/{trader_base_glint.dmm => trader_glint.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_guild.dmm => trader_guild.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_skip.dmm => trader_skip.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_skrell.dmm => trader_skrell.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_sol.dmm => trader_sol.dmm} (99%) rename _maps/map_files/shuttles/trader/{trader_base_stead.dmm => trader_stead.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_syndicate.dmm => trader_syndicate.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_synth.dmm => trader_synth.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_techno.dmm => trader_techno.dmm} (100%) rename _maps/map_files/shuttles/trader/{trader_base_ussp.dmm => trader_ussp.dmm} (98%) diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index a09c4262470..fe7556da059 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -2349,6 +2349,16 @@ }, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) +"if" = ( +/obj/structure/mirror{ + pixel_x = 28 + }, +/obj/structure/sink/directional/east, +/obj/structure/mirror{ + pixel_x = 28 + }, +/turf/simulated/floor/plasteel/freezer, +/area/trader_station/sol) "ig" = ( /turf/simulated/floor/plating/airless, /area/trader_station/sol) @@ -5633,6 +5643,10 @@ }, /turf/simulated/floor/plasteel/dark, /area/ghost_bar) +"sJ" = ( +/obj/docking_port/stationary/trader/centcom, +/turf/space, +/area/space/centcomm) "sK" = ( /turf/simulated/floor/plasteel/stairs/left, /area/syndicate_mothership) @@ -5849,7 +5863,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "tA" = ( -/obj/item/kirbyplants/large, +/obj/machinery/economy/vending/cigarette/free, /turf/simulated/floor/wood, /area/trader_station/sol) "tB" = ( @@ -5962,24 +5976,11 @@ /obj/structure/table/glass/reinforced/plastitanium, /turf/simulated/floor/plasteel/dark, /area/syndicate_mothership) -"tY" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 11; - height = 30; - id = "trader_base"; - name = "docking bay at Trading Satellite"; - width = 22 - }, -/turf/space, -/area/space/centcomm) "tZ" = ( -/obj/machinery/door/airlock/external{ - id_tag = "trader_base"; - name = "Docking Port" - }, /obj/structure/fans/tiny, -/obj/effect/mapping_helpers/airlock/locked, +/obj/machinery/door/airlock/external/glass{ + id_tag = "trader_away" + }, /turf/simulated/floor/wood, /area/trader_station/sol) "ua" = ( @@ -6348,6 +6349,7 @@ /area/trader_station/sol) "vs" = ( /obj/structure/railing, +/obj/item/kirbyplants/large, /turf/simulated/floor/wood, /area/trader_station/sol) "vt" = ( @@ -6692,13 +6694,6 @@ "wB" = ( /turf/simulated/floor/plasteel/freezer, /area/trader_station/sol) -"wD" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, -/obj/structure/sink/directional/east, -/turf/simulated/floor/plasteel/freezer, -/area/trader_station/sol) "wE" = ( /obj/structure/rack, /obj/item/gun/energy/meteorgun, @@ -43442,6 +43437,18 @@ aN aN aN aN +Db +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +Db aN aN aN @@ -43454,19 +43461,7 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN -aN +Db aN aN aN @@ -47554,6 +47549,7 @@ aN aN aN aN +Db aN aN aN @@ -47577,8 +47573,7 @@ aN aN aN aN -aN -aN +Db aN aN aN @@ -51163,8 +51158,8 @@ aN aN aN aN +sJ aN -tY aN aN aN @@ -51409,8 +51404,7 @@ aN aN aN aN -aN -aN +Db aN aN aN @@ -51434,6 +51428,7 @@ aN aN aN aN +Db aN aN aN @@ -51675,7 +51670,6 @@ aN aN aN aN -aN vG sv tF @@ -51696,6 +51690,7 @@ aN aN aN aN +aN vy pa Em @@ -51932,14 +51927,13 @@ aN aN aN aN -aN vG tl tF tF vG -wd wB +wd xa vG aN @@ -51953,6 +51947,7 @@ aN aN aN aN +aN vy yD Em @@ -52189,14 +52184,13 @@ aN aN aN aN -aN vG tt tF tF vr wf -wD +if vG vG aN @@ -52205,6 +52199,7 @@ aN aN aN aN +aN Db aN aN @@ -52446,7 +52441,6 @@ aN aN aN aN -aN vG tA tF @@ -52455,7 +52449,8 @@ vG vG vG vG -vG +aN +aN aN aN aN @@ -52703,7 +52698,6 @@ aN aN aN aN -aN vG tB tF @@ -52719,6 +52713,7 @@ aN aN aN aN +aN Db aN aN @@ -52960,7 +52955,6 @@ aN aN aN aN -aN vG tD tF @@ -52981,6 +52975,7 @@ aN aN aN aN +aN od od EF @@ -53217,7 +53212,6 @@ aN aN aN aN -aN vG tE tF @@ -53239,6 +53233,7 @@ aN aN aN aN +aN od vy od @@ -53473,7 +53468,6 @@ aN aN aN aN -aN vG vG Ai @@ -53500,6 +53494,7 @@ aN aN aN aN +aN od od nj @@ -53730,7 +53725,6 @@ aN aN aN aN -aN po qB tF @@ -53758,6 +53752,7 @@ aN aN aN aN +aN vy nj Mb @@ -53987,7 +53982,6 @@ aN aN aN aN -aN po qB tF @@ -54004,6 +53998,7 @@ aN aN aN aN +aN Db aN aN @@ -54244,7 +54239,6 @@ aN aN aN aN -aN po qB tF @@ -54272,6 +54266,7 @@ aN aN aN aN +aN od vy Md @@ -54501,15 +54496,15 @@ aN aN aN aN +vG +vG +tH +Tu +Tu +tH +vG +vG aN -vG -vG -tH -Tu -Tu -tH -vG -vG aN aN aN @@ -54759,7 +54754,6 @@ aN aN aN aN -aN vG ig ig @@ -54907,6 +54901,7 @@ aN aN aN aN +aN "} (156,1,1) = {" aN @@ -55016,12 +55011,12 @@ aN aN aN aN -aN -aN -aN -aN -aN -aN +vG +vG +vG +vG +vG +vG aN aN aN diff --git a/_maps/map_files/shuttles/trader/trader_base_glint.dmm b/_maps/map_files/shuttles/trader/trader_glint.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_glint.dmm rename to _maps/map_files/shuttles/trader/trader_glint.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_guild.dmm b/_maps/map_files/shuttles/trader/trader_guild.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_guild.dmm rename to _maps/map_files/shuttles/trader/trader_guild.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_skip.dmm b/_maps/map_files/shuttles/trader/trader_skip.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_skip.dmm rename to _maps/map_files/shuttles/trader/trader_skip.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_skrell.dmm b/_maps/map_files/shuttles/trader/trader_skrell.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_skrell.dmm rename to _maps/map_files/shuttles/trader/trader_skrell.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_sol.dmm b/_maps/map_files/shuttles/trader/trader_sol.dmm similarity index 99% rename from _maps/map_files/shuttles/trader/trader_base_sol.dmm rename to _maps/map_files/shuttles/trader/trader_sol.dmm index 3172d9578e4..a779d6d93b2 100644 --- a/_maps/map_files/shuttles/trader/trader_base_sol.dmm +++ b/_maps/map_files/shuttles/trader/trader_sol.dmm @@ -285,13 +285,13 @@ pixel_x = 9; pixel_y = 6 }, -/obj/item/storage/fancy/cigarettes/cigpack_carp{ - pixel_x = -6; - pixel_y = 4 - }, /obj/effect/turf_decal/tiles/department/command{ dir = 4 }, +/obj/item/storage/fancy/cigarettes/cigpack_solar_rays{ + pixel_x = -6; + pixel_y = 4 + }, /turf/simulated/floor/plasteel/dark, /area/shuttle/trade/sol) "IG" = ( @@ -786,7 +786,7 @@ Fb Fb Fb Fb -hM +Fb hi fZ Xi diff --git a/_maps/map_files/shuttles/trader/trader_base_stead.dmm b/_maps/map_files/shuttles/trader/trader_stead.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_stead.dmm rename to _maps/map_files/shuttles/trader/trader_stead.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_syndicate.dmm b/_maps/map_files/shuttles/trader/trader_syndicate.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_syndicate.dmm rename to _maps/map_files/shuttles/trader/trader_syndicate.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_synth.dmm b/_maps/map_files/shuttles/trader/trader_synth.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_synth.dmm rename to _maps/map_files/shuttles/trader/trader_synth.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_techno.dmm b/_maps/map_files/shuttles/trader/trader_techno.dmm similarity index 100% rename from _maps/map_files/shuttles/trader/trader_base_techno.dmm rename to _maps/map_files/shuttles/trader/trader_techno.dmm diff --git a/_maps/map_files/shuttles/trader/trader_base_ussp.dmm b/_maps/map_files/shuttles/trader/trader_ussp.dmm similarity index 98% rename from _maps/map_files/shuttles/trader/trader_base_ussp.dmm rename to _maps/map_files/shuttles/trader/trader_ussp.dmm index aa57f58c9a9..6633cd31316 100644 --- a/_maps/map_files/shuttles/trader/trader_base_ussp.dmm +++ b/_maps/map_files/shuttles/trader/trader_ussp.dmm @@ -24,6 +24,12 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) +"eJ" = ( +/obj/effect/turf_decal/tiles/department/security/corner{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/shuttle/trade/sol) "fg" = ( /obj/machinery/flasher_button{ id = "trader_flash"; @@ -271,11 +277,11 @@ /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) "vU" = ( -/obj/effect/spawner/random/traders/donksoft, /obj/structure/closet, /obj/effect/turf_decal/tiles/department/security/side{ dir = 8 }, +/obj/effect/spawner/random/traders/donksoft, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) "wu" = ( @@ -364,12 +370,12 @@ /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) "Cr" = ( -/obj/item/stack/tile/disco_light/thirty, -/obj/effect/spawner/random/traders/service, /obj/structure/closet, /obj/effect/turf_decal/tiles/department/security/side{ dir = 4 }, +/obj/item/stack/tile/disco_light/thirty, +/obj/effect/spawner/random/traders/service, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) "Dj" = ( @@ -386,7 +392,6 @@ /area/shuttle/trade/sol) "DW" = ( /obj/structure/table/reinforced, -/obj/item/storage/fancy/cigarettes/cigpack_carp, /obj/effect/decal/cleanable/dirt, /obj/item/lighter/random{ pixel_x = 9; @@ -395,6 +400,7 @@ /obj/effect/turf_decal/tiles/department/security/side{ dir = 6 }, +/obj/item/storage/fancy/cigarettes/cigpack_our_brand, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) "Ek" = ( @@ -598,9 +604,6 @@ }, /turf/simulated/floor/plasteel, /area/shuttle/trade/sol) -"Wq" = ( -/turf/open/floor/plating, -/area/shuttle/trade/sol) "Xl" = ( /obj/structure/chair/sofa/bench/left, /obj/machinery/light/spot{ @@ -717,7 +720,7 @@ RE ah ah uM -SC +eJ nI Mv oM @@ -739,7 +742,7 @@ Tv xe Tv gK -Wq +KF Mv oM "} diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 45d9ea0db84..40f4264d265 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -45239,7 +45239,7 @@ /area/station/security/brig) "dGd" = ( /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Port Bay 4 Airlock" }, /obj/effect/mapping_helpers/airlock/locked, @@ -70176,12 +70176,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/storage) "pNm" = ( -/obj/docking_port/stationary{ - dwidth = 11; - height = 23; - id = "trade_dock"; - name = "Port Bay 4 at NSS Cyberiad"; - width = 23 +/obj/docking_port/stationary/trader{ + name = "Docking bay 4 at NSS Cyberiad" }, /turf/space, /area/space) diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 17c8101b743..ca223d87289 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -19982,7 +19982,7 @@ /area/station/public/sleep) "dgs" = ( /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Docking Port 4" }, /obj/effect/mapping_helpers/airlock/locked, @@ -98885,13 +98885,9 @@ /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) "uBa" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 23; - id = "trade_dock"; - name = "port bay 4 at NSS Farragus"; - width = 23 +/obj/docking_port/stationary/trader{ + name = "Docking bay 4 at NSS Farragus"; + dir = 2 }, /turf/space, /area/space) diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 52ba3c4948b..964612eed1e 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -4918,6 +4918,17 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/fore2) +"axa" = ( +/obj/structure/chair/sofa/left{ + color = "#6ae226"; + dir = 8 + }, +/obj/effect/landmark/start/virologist, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "axb" = ( /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall, @@ -9872,13 +9883,9 @@ /turf/simulated/wall/r_wall, /area/station/engineering/atmos) "aOn" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 11; - height = 23; - id = "trade_dock"; - name = "port bay 4 at NSS Kerberos"; - width = 23 +/obj/docking_port/stationary/trader{ + name = "Docking bay 4 at NSS Kerberos"; + dir = 8 }, /turf/space, /area/space) @@ -17973,15 +17980,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/east) -"bwl" = ( -/obj/structure/chair/sofa/corner{ - color = "#6ae226" - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 5 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "bwm" = ( /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 @@ -46343,10 +46341,6 @@ /obj/structure/chair, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) -"dFF" = ( -/obj/structure/sign/biohazard, -/turf/simulated/wall/r_wall, -/area/station/medical/medbay) "dFG" = ( /turf/simulated/wall/r_wall, /area/station/medical/virology) @@ -47133,6 +47127,7 @@ /obj/effect/turf_decal/tiles/department/virology/side{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "dLf" = ( @@ -47471,12 +47466,6 @@ /obj/effect/turf_decal/tiles/department/science/side, /turf/simulated/floor/plasteel/dark, /area/station/science/robotics) -"dOd" = ( -/obj/effect/turf_decal/tiles/department/virology/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "dOq" = ( /obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel/dark, @@ -49298,6 +49287,10 @@ }, /turf/space, /area/space) +"dZw" = ( +/obj/structure/sign/biohazard, +/turf/simulated/wall/r_wall, +/area/station/medical/medbay) "dZE" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -50957,6 +50950,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"eEY" = ( +/obj/structure/bed/dogbed, +/mob/living/basic/mouse/white/brain, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "eFp" = ( /obj/machinery/computer/atmoscontrol{ dir = 4 @@ -51575,29 +51574,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/primary/aft/south) -"eQz" = ( -/obj/machinery/access_button{ - autolink_id = "virolab_btn_ext"; - layer = 3.6; - name = "Virology Lab Access Button"; - pixel_x = -24; - req_access = list(39) - }, -/obj/machinery/door/airlock/virology{ - autoclose = 0; - id_tag = "virolab_door_ext"; - locked = 1; - name = "Virology Lab External Airlock" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel/white, -/area/station/medical/medbay) "eQB" = ( /obj/structure/cable/extra_insulated{ icon_state = "1-2" @@ -53182,10 +53158,6 @@ /obj/effect/turf_decal/tiles/department/engineering/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/port/north) -"fBW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "fCA" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -53324,13 +53296,6 @@ /obj/effect/turf_decal/delivery/red/hollow, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) -"fEG" = ( -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "fEY" = ( /obj/machinery/alarm/directional/north, /turf/simulated/floor/wood, @@ -53931,14 +53896,6 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) -"fPb" = ( -/obj/structure/table, -/obj/item/clothing/mask/gas, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 9 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "fPx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -54830,6 +54787,15 @@ /obj/effect/turf_decal/tiles/neutral/side, /turf/simulated/floor/plasteel, /area/station/public/fitness) +"giV" = ( +/obj/structure/chair/sofa/corner{ + color = "#6ae226" + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 5 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "gjk" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, @@ -56761,21 +56727,6 @@ /obj/machinery/alarm/directional/west, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"hfU" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/color/latex{ - pixel_y = 6 - }, -/obj/item/clothing/glasses/hud/health{ - pixel_y = 3 - }, -/obj/item/healthanalyzer, -/obj/item/storage/belt/medical, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "hgo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -59207,13 +59158,6 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/carpet/grimey, /area/station/public/vacant_office) -"imG" = ( -/obj/structure/table/glass, -/obj/machinery/computer/med_data/laptop{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "imL" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -60811,7 +60755,7 @@ dir = 1 }, /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Docking Port 4" }, /obj/effect/mapping_helpers/airlock/locked, @@ -61834,6 +61778,13 @@ /obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel, /area/station/security/processing) +"jrW" = ( +/obj/item/kirbyplants/large, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "jsh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -62784,13 +62735,6 @@ }, /turf/simulated/floor/plating, /area/station/security/permabrig) -"jQA" = ( -/obj/item/kirbyplants/large, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "jQN" = ( /obj/machinery/door/poddoor{ density = 0; @@ -63616,6 +63560,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/station/maintenance/electrical/aft_starboard) +"kiU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "kiW" = ( /obj/structure/extinguisher_cabinet{ name = "east bump"; @@ -64539,6 +64488,16 @@ /obj/structure/cable, /turf/simulated/floor/wood, /area/station/legal/courtroom) +"kFG" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper/precision, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "kFS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -66594,6 +66553,20 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore2) +"lyR" = ( +/obj/machinery/door/airlock/virology/glass{ + name = "Workstation" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "lzN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -67087,6 +67060,17 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"lKY" = ( +/obj/machinery/smartfridge/secure/chemistry/virology/preloaded, +/obj/structure/reagent_dispensers/virusfood{ + pixel_x = -30 + }, +/obj/machinery/requests_console/directional/south, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 10 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "lLN" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -67533,6 +67517,15 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) +"lXn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "lXp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -68042,6 +68035,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/transmission_laser) +"mjG" = ( +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "mjS" = ( /obj/structure/weightmachine/stacklifter, /obj/machinery/camera{ @@ -68347,6 +68346,13 @@ "mpZ" = ( /turf/simulated/floor/carpet/purple, /area/station/medical/psych) +"mqc" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "mqk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -68599,6 +68605,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"mtU" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "mtV" = ( /obj/structure/shelf/service, /obj/item/storage/box/lights/mixed, @@ -69075,15 +69088,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/port) -"mJw" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "mJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -70160,15 +70164,6 @@ /obj/effect/spawner/random/fungus/frequent, /turf/simulated/wall, /area/station/maintenance/abandoned_garden) -"ncB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "ncZ" = ( /obj/effect/turf_decal/tiles/department/security/corner{ dir = 1 @@ -70456,17 +70451,6 @@ /obj/effect/turf_decal/tiles/department/security, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) -"njF" = ( -/obj/structure/chair/sofa/left{ - color = "#6ae226"; - dir = 8 - }, -/obj/effect/landmark/start/virologist, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "njU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -71526,6 +71510,15 @@ }, /turf/simulated/floor/engine, /area/station/engineering/controlroom) +"nIf" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 1 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "nIr" = ( /obj/item/clothing/glasses/sunglasses, /obj/structure/table/wood, @@ -71822,6 +71815,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/dark, /area/station/maintenance/apmaint) +"nQW" = ( +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "nQX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -71895,13 +71894,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/service/bar) -"nSq" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "nSv" = ( /obj/machinery/economy/vending/cola, /obj/effect/turf_decal/delivery, @@ -73662,6 +73654,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/medical/coldroom) +"oBT" = ( +/obj/effect/turf_decal/tiles/department/virology/corner{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "oCh" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -73669,13 +73667,6 @@ }, /turf/simulated/wall, /area/station/hallway/secondary/entry/east) -"oCp" = ( -/obj/machinery/economy/vending/virodrobe, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 9 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "oCK" = ( /obj/item/radio/intercom{ name = "north bump"; @@ -74359,6 +74350,13 @@ temperature = 80 }, /area/station/science/xenobiology) +"oSp" = ( +/obj/structure/table/glass, +/obj/machinery/computer/med_data/laptop{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "oSN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75114,7 +75112,7 @@ "pjO" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Docking Port 4" }, /obj/effect/mapping_helpers/airlock/locked, @@ -75539,13 +75537,11 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) -"psH" = ( -/obj/structure/closet/crate/freezer/iv_storage, -/obj/machinery/light{ - dir = 1 - }, +"psE" = ( +/obj/structure/table, +/obj/item/clothing/mask/gas, /obj/effect/turf_decal/tiles/department/virology/side{ - dir = 5 + dir = 9 }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -75757,6 +75753,21 @@ /obj/effect/turf_decal/tiles/department/security/corner, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) +"pzu" = ( +/obj/structure/table/glass, +/obj/item/storage/fancy/donut_box{ + pixel_x = -3; + pixel_y = 5 + }, +/obj/item/storage/box/donkpockets, +/obj/machinery/camera{ + c_tag = "Virology Break Room"; + dir = 10; + network = list("Medical","SS13") + }, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "pzy" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -76242,6 +76253,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) +"pIP" = ( +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "pIS" = ( /obj/structure/table/wood, /obj/item/storage/fancy/cigarettes/cigpack_random{ @@ -76977,6 +76992,15 @@ }, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/pod_2) +"pZA" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "pZI" = ( /obj/structure/safe{ known_by = list("captain") @@ -77193,13 +77217,6 @@ icon_state = "showroomfloor" }, /area/station/medical/surgery) -"qfH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "qgd" = ( /obj/structure/cable{ icon_state = "4-8" @@ -77432,6 +77449,21 @@ }, /turf/simulated/floor/plasteel/white, /area/station/science/research) +"qkN" = ( +/obj/structure/table/glass, +/obj/item/clothing/gloves/color/latex{ + pixel_y = 6 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 3 + }, +/obj/item/healthanalyzer, +/obj/item/storage/belt/medical, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "qlz" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -77924,13 +77956,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/storage) -"qyb" = ( -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 4 - }, -/mob/living/carbon/human/monkey, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "qyi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -78271,7 +78296,6 @@ /area/station/service/chapel/office) "qGc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/tiles/department/virology/side, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "qGf" = ( @@ -78681,6 +78705,7 @@ /obj/effect/turf_decal/tiles/department/virology/side{ dir = 4 }, +/mob/living/carbon/human/monkey, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "qPT" = ( @@ -79150,11 +79175,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/supply/qm) -"qYo" = ( -/obj/machinery/light, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "qYL" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/transit_tube/horizontal, @@ -79315,12 +79335,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/prisonershuttle) -"rbC" = ( -/obj/structure/bed/dogbed, -/mob/living/basic/mouse/white/brain, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "rbD" = ( /obj/machinery/light/small{ dir = 8 @@ -79411,21 +79425,6 @@ }, /turf/simulated/floor/plating, /area/station/command/office/ntrep) -"rdA" = ( -/obj/structure/table/glass, -/obj/item/storage/fancy/donut_box{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/storage/box/donkpockets, -/obj/machinery/camera{ - c_tag = "Virology Break Room"; - dir = 10; - network = list("Medical","SS13") - }, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "rdF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -83126,16 +83125,6 @@ icon_state = "freezerfloor" }, /area/station/security/permabrig) -"sAa" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/dropper/precision, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "sAq" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes/cigpack_our_brand{ @@ -87906,6 +87895,29 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) +"urz" = ( +/obj/machinery/access_button{ + autolink_id = "virolab_btn_ext"; + layer = 3.6; + name = "Virology Lab Access Button"; + pixel_x = -24; + req_access = list(39) + }, +/obj/machinery/door/airlock/virology{ + autoclose = 0; + id_tag = "virolab_door_ext"; + locked = 1; + name = "Virology Lab External Airlock" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel/white, +/area/station/medical/medbay) "urW" = ( /obj/structure/cable/extra_insulated{ icon_state = "4-8" @@ -87960,15 +87972,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) -"uuh" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "uvp" = ( /obj/structure/sink/kitchen/directional/north, /turf/simulated/floor/plasteel{ @@ -89337,26 +89340,6 @@ /obj/effect/turf_decal/tiles/neutral, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"uZh" = ( -/obj/machinery/door_control{ - id = "viroshutters"; - name = "Privacy Shutters Control"; - pixel_x = -6; - pixel_y = 8 - }, -/obj/item/hand_labeler{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 8 - }, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "uZj" = ( /obj/machinery/door/airlock/engineering{ name = "Tech Storage" @@ -89586,12 +89569,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) -"veV" = ( -/obj/machinery/atmospherics/binary/valve{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/medical/virology) "vfh" = ( /obj/effect/turf_decal, /obj/machinery/atmospherics/portable/scrubber/huge, @@ -90371,6 +90348,13 @@ /obj/machinery/light/floor, /turf/simulated/floor/plating, /area/station/hallway/secondary/entry/north) +"vwR" = ( +/obj/machinery/economy/vending/virodrobe, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 9 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "vxk" = ( /obj/structure/cable{ icon_state = "1-2" @@ -91497,20 +91481,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/exit) -"vTs" = ( -/obj/machinery/door/airlock/virology/glass{ - name = "Workstation" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "vTw" = ( /obj/structure/chair/sofa/bench/left, /obj/effect/turf_decal/tiles/department/medical/checker, @@ -91924,10 +91894,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"wdL" = ( -/obj/effect/turf_decal/tiles/department/virology/side, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "wdS" = ( /obj/machinery/firealarm/directional/south, /obj/structure/cable{ @@ -92002,6 +91968,12 @@ /obj/item/hand_labeler, /turf/simulated/floor/plasteel/dark, /area/station/security/evidence) +"wfK" = ( +/obj/machinery/atmospherics/binary/valve{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/medical/virology) "wfO" = ( /obj/structure/closet/crate, /obj/item/food/sliced/bread, @@ -94209,11 +94181,23 @@ /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "wWX" = ( -/obj/machinery/pandemic, -/obj/effect/turf_decal/delivery/green, +/obj/machinery/door_control{ + id = "viroshutters"; + name = "Privacy Shutters Control"; + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/hand_labeler{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/effect/turf_decal/tiles/department/virology/side{ dir = 8 }, +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) "wXn" = ( @@ -94983,6 +94967,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) +"xlX" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tiles/department/virology/side, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "xme" = ( /obj/structure/chair/sofa/corp/left{ dir = 4 @@ -95798,13 +95787,10 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "xES" = ( -/obj/machinery/smartfridge/secure/chemistry/virology/preloaded, -/obj/structure/reagent_dispensers/virusfood{ - pixel_x = -30 - }, -/obj/machinery/requests_console/directional/south, +/obj/machinery/pandemic, +/obj/effect/turf_decal/delivery/green, /obj/effect/turf_decal/tiles/department/virology/side{ - dir = 10 + dir = 8 }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) @@ -96521,19 +96507,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) -"xUg" = ( -/obj/structure/table, -/obj/item/storage/box/syringes, -/obj/item/storage/box/monkeycubes, -/obj/machinery/camera{ - c_tag = "Virology Pen"; - network = list("SS13","Medical") - }, -/obj/effect/turf_decal/tiles/department/virology/side{ - dir = 1 - }, -/turf/simulated/floor/plasteel/white, -/area/station/medical/virology) "xUl" = ( /obj/machinery/light/small{ dir = 1 @@ -96605,6 +96578,16 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, /area/station/service/kitchen) +"xVV" = ( +/obj/structure/closet/crate/freezer/iv_storage, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 5 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "xVX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -96696,6 +96679,19 @@ }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) +"xZc" = ( +/obj/structure/table, +/obj/item/storage/box/syringes, +/obj/item/storage/box/monkeycubes, +/obj/machinery/camera{ + c_tag = "Virology Pen"; + network = list("SS13","Medical") + }, +/obj/effect/turf_decal/tiles/department/virology/side{ + dir = 1 + }, +/turf/simulated/floor/plasteel/white, +/area/station/medical/virology) "xZj" = ( /obj/structure/window/reinforced{ dir = 4 @@ -144080,7 +144076,7 @@ aKE tzg aKE auO -eQz +urz dNu nZk gLq @@ -144337,7 +144333,7 @@ unq rfa oRe fXw -dFF +dZw tpR cBf pax @@ -144854,7 +144850,7 @@ yeb rZl kTY cBf -jQA +jrW dGw dJJ hDw @@ -145368,7 +145364,7 @@ suJ rZl kGo dPU -rbC +eEY dGw dGw oKO @@ -145625,7 +145621,7 @@ mNF rZl mkH dPU -wdL +pIP dGw eeq pgP @@ -145882,20 +145878,20 @@ sds rZl qBj dPU -qYo +xlX dGw vDR dWX pcJ oaI xJo -wdL +pIP dGw jDT ebB -uZh wWX xES +lKY dFG abj abj @@ -146139,7 +146135,7 @@ tAC rZl rEg dPU -nSq +mtU dGw sia myW @@ -146151,8 +146147,8 @@ dNn wYx mXf tOS -fBW qGc +kiU oWo rEn oTr @@ -146396,7 +146392,7 @@ abj dFG dvR dPU -wdL +pIP dGw dGw dNr @@ -146409,7 +146405,7 @@ kMN dWX ezr wWW -qfH +mqc sRk uNq acF @@ -146653,10 +146649,10 @@ aaa dFG mvd dPU -dOd +oBT uBB -mJw -dLe +pZA +mjG mYt jjB jhr @@ -146666,7 +146662,7 @@ lVl tqY mrs cEB -sAa +kFG wkW pqY pDw @@ -146912,17 +146908,17 @@ xOG adX qTE jGI -ncB +lXn mcy xTt qsg mJU -vTs +lyR gfJ miC ipg sMn -hfU +qkN bIw dFG abj @@ -147169,10 +147165,10 @@ hDq sKx gBx qiP -qPN -qPN +nQW +nQW pcJ -qPN +nQW oJi fdp dGw @@ -147432,8 +147428,8 @@ scc dNr dGw dGw -fPb -fEG +psE +dLe gbQ pAB dFG @@ -147683,13 +147679,13 @@ mpL fYc hPN dGw -oCp -dLe +vwR +mjG pcJ -dLe +mjG svD dGw -xUg +xZc vqa dPU vVX @@ -147937,7 +147933,7 @@ abj abj dFG vQS -veV +wfK qmB dGw wro @@ -147946,7 +147942,7 @@ liE dWX mJY dGw -uuh +nIf eoJ pGL rYa @@ -148198,13 +148194,13 @@ reh opY dGw uZp -imG +oSp tig mXf -rdA +pzu dGw -psH -qyb +xVV +qPN rHX hDu dFG @@ -148454,8 +148450,8 @@ pUL pUL ssx dGw -bwl -njF +giV +axa dMx sYf rOl diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 5b4c85c1eac..2d55e0d48a0 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -7185,7 +7185,7 @@ /area/station/supply/qm) "bxY" = ( /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Docking Port 4" }, /obj/effect/mapping_helpers/airlock/locked, @@ -118168,13 +118168,9 @@ /turf/simulated/floor/plasteel, /area/station/medical/storage) "xNo" = ( -/obj/docking_port/stationary{ - dir = 2; - dwidth = 11; - height = 23; - id = "trade_dock"; - name = "port bay 4 at NSS Diagoras"; - width = 23 +/obj/docking_port/stationary/trader{ + name = "Docking bay 4 at NSS Diagoras"; + dir = 2 }, /turf/space, /area/space) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 97f103ff8fe..8e458e653ba 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -9868,7 +9868,7 @@ /area/station/maintenance/turbine) "biC" = ( /obj/machinery/door/airlock/external/glass{ - id_tag = "trade_dock"; + id_tag = "trader_home"; name = "Docking Port 4" }, /obj/effect/mapping_helpers/airlock/locked, @@ -71037,13 +71037,9 @@ /turf/simulated/floor/plasteel, /area/station/science/research) "rHu" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 11; - height = 23; - id = "trade_dock"; - name = "port bay 4 at NSS Cerebron"; - width = 23 +/obj/docking_port/stationary/trader{ + name = "Docking bay 4 at NSS Cerebron"; + dir = 8 }, /turf/space, /area/space) diff --git a/code/controllers/subsystem/SSshuttles.dm b/code/controllers/subsystem/SSshuttles.dm index 7088608a0f2..8ea973a0c49 100644 --- a/code/controllers/subsystem/SSshuttles.dm +++ b/code/controllers/subsystem/SSshuttles.dm @@ -490,12 +490,12 @@ SUBSYSTEM_DEF(shuttle) var/obj/docking_port/mobile/trader/trade_shuttle = getShuttle("trader") if(trade_shuttle) var/obj/docking_port/stationary/docked_id = trade_shuttle.get_docked() - if(docked_id?.id != "trader_base") + if(docked_id?.id != "trader_away") CRASH("Attempted to load a new trade shuttle while the existing one was not at its home base.") // Dispose of the old shuttle. trade_shuttle.jumpToNullSpace() - var/obj/docking_port/mobile/trader/dock = getDock("trader_base") + var/obj/docking_port/mobile/trader/dock = getDock("trader_away") if(!dock) CRASH("Unable to load trading shuttle, no trading dock found.") @@ -510,7 +510,6 @@ SUBSYSTEM_DEF(shuttle) CRASH("New trading shuttle unable to dock at the trading dock: [result]") trade_shuttle.dock(dock) - trade_shuttle.register() // TODO indicate to the user that success happened, rather than just diff --git a/code/controllers/subsystem/non_firing/SSlate_mapping.dm b/code/controllers/subsystem/non_firing/SSlate_mapping.dm index d1f05f99c3b..f6da3fe036e 100644 --- a/code/controllers/subsystem/non_firing/SSlate_mapping.dm +++ b/code/controllers/subsystem/non_firing/SSlate_mapping.dm @@ -14,7 +14,12 @@ SUBSYSTEM_DEF(late_mapping) GLOB.air_alarms = sortAtom(GLOB.air_alarms) GLOB.apcs = sortAtom(GLOB.apcs) - // Load a Gamma Armoury shuttle at Centcom. + if(SSmapping.trader_shuttle_id) + var/template = new SSmapping.trader_shuttle_id() + SSshuttle.set_trader_shuttle(template) + else + WARNING("no valid trader shuttle template was set in SSmapping") + if(SSmapping.gamma_armory_shuttle_id) SSshuttle.load_initial_gamma_armory_shuttle(SSmapping.gamma_armory_shuttle_id) else diff --git a/code/controllers/subsystem/non_firing/SSmapping.dm b/code/controllers/subsystem/non_firing/SSmapping.dm index aabbbeabcb0..95f69cceb8b 100644 --- a/code/controllers/subsystem/non_firing/SSmapping.dm +++ b/code/controllers/subsystem/non_firing/SSmapping.dm @@ -8,6 +8,8 @@ SUBSYSTEM_DEF(mapping) var/datum/map/next_map /// What map was used last round? var/datum/map/last_map + /// The trader shuttle to load at Centcom in late_mapping. + var/datum/map_template/shuttle/trader_shuttle_id = /datum/map_template/shuttle/trader/synthetic /// The Gamma Armory shuttle to load at Centcom in late_mapping. var/gamma_armory_shuttle_id = "gamma_armory_base" /// List of all areas that can be accessed via IC means diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 8fec84d54f7..3db2b5a8199 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -33,15 +33,16 @@ port_id = "admin" name = "Base Shuttle Template (Admin)" +/datum/map_template/shuttle/trader + port_id = "trader" + name = "Base Shuttle Template (Trader)" + prefix = "_maps/map_files/shuttles/trader/" + /datum/map_template/shuttle/gamma_armory port_id = "gamma_armory" name = "Base Gamma Armory Template" prefix = "_maps/map_files/shuttles/gamma_armory/" -/datum/map_template/shuttle/trader - port_id = "trader_base" - prefix = "_maps/map_files/shuttles/trader/" - // MARK: Emergency /datum/map_template/shuttle/emergency/bar suffix = "bar" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index dbfe82f1f60..08c215617c2 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -920,12 +920,24 @@ width = 5 preferred_direction = EAST +/obj/docking_port/stationary/trader + id = "trader_home" + name = "Docking bay 4 at station" + width = 22 + dwidth = 11 + height = 30 + +/obj/docking_port/stationary/trader/centcom + id = "trader_away" + name = "Docking bay at trade hub" + dir = 8 + /obj/docking_port/mobile/trader dir = 8 dwidth = 11 height = 30 id = "trader" - name = "sol trade shuttle" + name = "trade shuttle" width = 22 preferred_direction = EAST timid = TRUE @@ -1141,7 +1153,7 @@ /obj/machinery/computer/shuttle/trade/sol req_access = list(ACCESS_TRADE_SOL) - possible_destinations = "trader_base;trade_dock" + possible_destinations = "trader_away;trader_home" shuttleId = "trader" //#undef DOCKING_PORT_HIGHLIGHT