From ada071db98bfe73c0b0b35b741bda1b032f68093 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:07:35 -0700 Subject: [PATCH 01/19] Random Bars: QC Pass Fixing minor errors with bars after an audit of each and every one. --- .../RandomBars/Icebox/clockwork_icebox.dmm | 20 ++- .../_maps/RandomBars/Icebox/disco_icebox.dmm | 168 +++++++++--------- .../RandomBars/Icebox/green_bar_disco.dmm | 10 ++ .../RandomBars/Icebox/icebox_bar_abductor.dmm | 3 + .../RandomBars/Icebox/icebox_bar_arcade.dmm | 19 +- .../_maps/RandomBars/Tram/tram_bar_ocean.dmm | 4 +- 6 files changed, 134 insertions(+), 90 deletions(-) diff --git a/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm b/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm index 7c23ea377a2a..30541e54f31e 100644 --- a/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm +++ b/monkestation/_maps/RandomBars/Icebox/clockwork_icebox.dmm @@ -107,6 +107,8 @@ "eZ" = ( /obj/structure/table/bronze, /obj/item/gun/ballistic/revolver/russian, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "fc" = ( @@ -300,6 +302,15 @@ }, /turf/open/floor/bronze, /area/station/commons/lounge) +"oS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/junction/flip{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/bronze, +/area/station/commons/lounge) "qk" = ( /obj/machinery/newscaster/directional/north, /turf/open/floor/bronze, @@ -364,6 +375,7 @@ /area/station/service/bar) "tm" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "tF" = ( @@ -418,6 +430,7 @@ dir = 4 }, /obj/effect/mapping_helpers/mail_sorting/service/bar, +/obj/structure/cable, /turf/open/floor/bronze, /area/station/commons/lounge) "vh" = ( @@ -525,6 +538,7 @@ "Bl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "Cd" = ( @@ -633,6 +647,7 @@ }, /obj/machinery/door/firedoor/border_only, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "HC" = ( @@ -730,6 +745,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "Pw" = ( @@ -811,6 +827,7 @@ /area/station/service/theater) "Ti" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/bronze, /area/station/commons/lounge) "Ts" = ( @@ -899,6 +916,7 @@ /turf/open/floor/bronze/filled, /area/station/service/bar) "YM" = ( +/obj/structure/cable, /turf/open/floor/carpet/lone, /area/station/service/theater) "YU" = ( @@ -1000,7 +1018,7 @@ Pi Hj Ti Ti -ux +oS TP EK EK diff --git a/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm b/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm index 77cd09b67802..bf806ccefdc2 100644 --- a/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm +++ b/monkestation/_maps/RandomBars/Icebox/disco_icebox.dmm @@ -21,7 +21,7 @@ dir = 4 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "cz" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/eighties, @@ -34,7 +34,7 @@ dir = 4 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "de" = ( /obj/structure/table/wood, /obj/effect/spawner/random/entertainment/dice, @@ -62,7 +62,7 @@ dir = 4 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "fW" = ( /obj/structure/table/wood, /obj/item/food/pie/cream, @@ -77,7 +77,7 @@ /obj/machinery/door/firedoor, /obj/structure/cable, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "gG" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/light/colour_cycle, @@ -92,16 +92,13 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/eighties, /area/station/commons/lounge) -"hI" = ( -/turf/open/floor/wood, -/area/station/commons/lounge) "jr" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "jI" = ( /obj/structure/table/wood/fancy/black, /obj/item/clothing/neck/tie/disco, @@ -112,11 +109,11 @@ "ke" = ( /obj/effect/landmark/start/bartender, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "kO" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "ly" = ( /turf/open/floor/eighties, /area/station/commons/lounge) @@ -127,6 +124,9 @@ }, /turf/open/floor/eighties, /area/station/commons/lounge) +"mQ" = ( +/turf/open/floor/eighties/red, +/area/station/service/bar) "nn" = ( /obj/structure/table/wood, /obj/item/food/pie/cream, @@ -158,13 +158,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "qx" = ( /obj/structure/chair/sofa/corner/maroon{ dir = 4 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "qP" = ( /obj/structure/chair/wood, /turf/open/floor/eighties, @@ -172,25 +172,25 @@ "si" = ( /obj/machinery/smartfridge/food, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "sP" = ( /obj/structure/sign/poster/official/get_your_legs, /turf/closed/wall, -/area/station/commons/lounge) +/area/station/service/bar) "sQ" = ( /obj/structure/table/wood/fancy/blue, /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "tJ" = ( /obj/structure/table/wood/fancy/blue, /obj/structure/displaycase/forsale/kitchen{ pixel_y = 6 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "ut" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -214,7 +214,10 @@ /obj/structure/cable, /obj/machinery/vending/boozeomat, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) +"zP" = ( +/turf/closed/wall, +/area/station/service/bar) "zT" = ( /obj/structure/table/wood/fancy/black, /obj/item/instrument/piano_synth, @@ -237,7 +240,7 @@ dir = 4 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Bb" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -261,11 +264,11 @@ dir = 4 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "BK" = ( /obj/structure/chair/sofa/middle/maroon, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "BL" = ( /obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/structure/cable, @@ -274,7 +277,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "BO" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, @@ -284,6 +287,13 @@ "BS" = ( /obj/structure/cable, /turf/open/floor/wood, +/area/station/service/bar/backroom) +"Cf" = ( +/obj/structure/table/wood, +/obj/item/food/pie/cream/nostun{ + desc = thisone...looks...different.... + }, +/turf/open/floor/light/colour_cycle/dancefloor_b, /area/station/commons/lounge) "Cj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -299,7 +309,7 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "Ed" = ( /obj/structure/cable, /turf/open/floor/eighties, @@ -318,12 +328,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Fi" = ( /obj/machinery/firealarm/directional/east, /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "Fn" = ( /obj/machinery/camera/autoname/directional/west, /obj/structure/bookcase/random/adult, @@ -341,7 +351,7 @@ dir = 4 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Gq" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/wood/fancy/black, @@ -353,7 +363,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Gv" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -366,7 +376,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "HV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -375,18 +385,21 @@ dir = 4 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "Ix" = ( /obj/structure/table/wood/fancy/blue, /obj/item/reagent_containers/cup/rag, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "Iy" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 1 }, /turf/open/floor/eighties, /area/station/commons/lounge) +"IQ" = ( +/turf/closed/wall, +/area/station/service/bar/backroom) "JP" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -413,7 +426,7 @@ name = "HoochMaster Deluxe" }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "LA" = ( /obj/machinery/jukebox/disco, /turf/open/floor/light/colour_cycle/dancefloor_b, @@ -426,7 +439,7 @@ /obj/structure/table/wood/fancy/blue, /obj/effect/spawner/random/entertainment/dice, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "MS" = ( /obj/machinery/firealarm/directional/south, /obj/structure/table/wood, @@ -459,7 +472,7 @@ }, /obj/machinery/disposal/bin, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Od" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -480,20 +493,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Pk" = ( /obj/machinery/airalarm/directional/west, /obj/machinery/holopad, /obj/structure/cable, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "Pv" = ( /obj/structure/closet/secure_closet/bar, /obj/item/storage/photo_album/bar, /obj/item/ammo_casing/shotgun/stunslug, /obj/item/ammo_casing/shotgun/stunslug, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "PB" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/reagentgrinder{ @@ -502,12 +515,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "PH" = ( /obj/structure/table/wood/fancy/blue, /obj/effect/spawner/random/entertainment/cigar, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "PK" = ( /obj/structure/sign/poster/random/directional/north, /obj/structure/cable, @@ -518,7 +531,7 @@ dir = 4 }, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "PU" = ( /obj/machinery/barsign/all_access/directional/north, /turf/open/floor/eighties, @@ -526,14 +539,14 @@ "QW" = ( /obj/structure/chair/sofa/left/maroon, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) "RZ" = ( /mob/living/basic/rabbit{ name = "Bun Bun"; desc = "Pun Puns bunny cousin?" }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "SC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -557,7 +570,7 @@ }, /obj/structure/table/wood/fancy, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "Th" = ( /obj/structure/table/wood/fancy/black, /obj/item/clothing/neck/tie/disco, @@ -568,9 +581,8 @@ /turf/open/floor/eighties, /area/station/commons/lounge) "Tp" = ( -/obj/machinery/airalarm/directional/east, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "TD" = ( /obj/machinery/requests_console/directional/east{ department = "Bar"; @@ -578,7 +590,7 @@ supplies_requestable = 1 }, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Ux" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/eighties, @@ -588,26 +600,20 @@ /turf/open/floor/eighties, /area/station/commons/lounge) "Ve" = ( +/obj/machinery/airalarm/directional/south, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Vv" = ( /obj/effect/spawner/xmastree, /turf/open/floor/eighties, /area/station/commons/lounge) -"WX" = ( -/obj/structure/table/wood, -/obj/item/food/pie/cream/nostun{ - desc = thisone...looks...different.... - }, -/turf/open/floor/light/colour_cycle, -/area/station/commons/lounge) "XA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/landmark/event_spawn, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "XK" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/table/wood, @@ -631,18 +637,18 @@ }, /obj/structure/cable, /turf/open/floor/wood, -/area/station/commons/lounge) +/area/station/service/bar/backroom) "Yh" = ( /obj/effect/landmark/start/bartender, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Yo" = ( /turf/open/floor/light/colour_cycle, /area/station/commons/lounge) "YX" = ( /obj/structure/table/wood/fancy/blue, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "YZ" = ( /obj/machinery/holopad, /turf/open/floor/light/colour_cycle/dancefloor_a, @@ -659,7 +665,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/eighties/red, -/area/station/commons/lounge) +/area/station/service/bar) "Zu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -669,7 +675,7 @@ "ZK" = ( /obj/structure/table/wood/fancy/blue, /turf/open/floor/eighties, -/area/station/commons/lounge) +/area/station/service/bar) (1,1,1) = {" EK @@ -729,7 +735,7 @@ EK "} (5,1,1) = {" fW -aG +Cf Yo Zl aG @@ -756,7 +762,7 @@ EK EK "} (7,1,1) = {" -WX +Yo Zl aG gG @@ -822,7 +828,7 @@ HV PP PP bV -EH +zP EK "} (12,1,1) = {" @@ -836,7 +842,7 @@ sQ PH Ix YX -EH +zP EK "} (13,1,1) = {" @@ -850,7 +856,7 @@ fy RZ Yh Ve -EH +zP EK "} (14,1,1) = {" @@ -863,22 +869,22 @@ tJ XA EM OG -Ve -EH +mQ +zP EK "} (15,1,1) = {" -EH -EH -EH +IQ +IQ +IQ gm -EH -EH +IQ +zP Br PB Zp -Ve -EH +mQ +zP EK "} (16,1,1) = {" @@ -892,34 +898,34 @@ FM Gq NC kO -EH +zP EK "} (17,1,1) = {" si -hI +Tp ke -hI +Tp Hg xU cH jr -Ve +mQ TD -EH +zP EK "} (18,1,1) = {" -EH +IQ Pv Fi Td Tp -EH +zP Az sP Ld -EH -EH +zP +zP EK "} diff --git a/monkestation/_maps/RandomBars/Icebox/green_bar_disco.dmm b/monkestation/_maps/RandomBars/Icebox/green_bar_disco.dmm index a09b1c92e97e..eabb73fcdd7b 100644 --- a/monkestation/_maps/RandomBars/Icebox/green_bar_disco.dmm +++ b/monkestation/_maps/RandomBars/Icebox/green_bar_disco.dmm @@ -107,6 +107,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/structure/cable, /turf/open/floor/carpet/green, /area/station/service/theater) "ic" = ( @@ -218,6 +219,8 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/carpet/green, /area/station/service/theater) "lG" = ( @@ -446,6 +449,7 @@ color = "#43cC1E"; dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/lounge) "ta" = ( @@ -482,6 +486,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/carpet/green, /area/station/commons/lounge) "tJ" = ( @@ -518,6 +523,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /turf/open/floor/carpet/green, /area/station/commons/lounge) "uk" = ( @@ -538,6 +544,7 @@ color = "#43cC1E"; dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/lounge) "uF" = ( @@ -781,6 +788,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/structure/sign/poster/random/directional/west, +/obj/structure/cable, /turf/open/floor/carpet/green, /area/station/commons/lounge) "DL" = ( @@ -876,6 +884,7 @@ }, /obj/machinery/door/firedoor, /obj/structure/sign/poster/random/directional/north, +/obj/structure/cable, /turf/open/floor/carpet/green, /area/station/service/theater) "In" = ( @@ -1090,6 +1099,7 @@ color = "#43cC1E"; dir = 1 }, +/obj/structure/cable, /turf/open/floor/iron, /area/station/commons/lounge) "RJ" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm index 77551cf99db7..c01343f1af25 100644 --- a/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm +++ b/monkestation/_maps/RandomBars/Icebox/icebox_bar_abductor.dmm @@ -622,6 +622,8 @@ /obj/effect/turf_decal/siding/dark_blue/end{ dir = 1 }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/circuit, /area/station/service/theater) "EH" = ( @@ -1047,6 +1049,7 @@ /obj/effect/turf_decal/siding/blue/end{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/mineral/fake_abductor, /area/station/service/theater) "VT" = ( diff --git a/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm b/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm index 213c0dd1a3e1..66fa3e795e75 100644 --- a/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm +++ b/monkestation/_maps/RandomBars/Icebox/icebox_bar_arcade.dmm @@ -62,7 +62,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/south, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ dir = 4 @@ -133,9 +132,9 @@ /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "gc" = ( -/obj/machinery/airalarm/directional/north, /obj/machinery/firealarm/directional/west, /obj/machinery/computer/arcade/amputation/bar, +/obj/machinery/airalarm/directional/north, /turf/open/floor/circuit/green, /area/station/service/theater) "gS" = ( @@ -210,6 +209,7 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/eighties, /area/station/service/theater) "kp" = ( @@ -305,6 +305,8 @@ pixel_y = 6 }, /obj/effect/spawner/random/food_or_drink/donkpockets, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/service/bar) "rM" = ( @@ -371,6 +373,7 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "vj" = ( @@ -492,6 +495,7 @@ /obj/structure/chair/plastic{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "zW" = ( @@ -530,6 +534,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/structure/cable, /turf/open/floor/wood/large, /area/station/commons/lounge) "Ca" = ( @@ -540,6 +545,8 @@ /turf/open/floor/eighties, /area/station/service/theater) "Ck" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/wood/large, /area/station/commons/lounge) "Co" = ( @@ -909,10 +916,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/neon/simple/red, /area/station/commons/lounge) -"PL" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/turf/template_noop, -/area/template_noop) "PN" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -930,6 +933,7 @@ dir = 4 }, /obj/effect/turf_decal/siding/dark, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "RT" = ( @@ -1083,6 +1087,7 @@ /obj/structure/chair/plastic{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/yellow, /area/station/commons/lounge) "ZP" = ( @@ -1136,7 +1141,7 @@ dn XN "} (4,1,1) = {" -PL +Ow Ow Ow eS diff --git a/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm b/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm index 4089a4392821..606410c397cf 100644 --- a/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm +++ b/monkestation/_maps/RandomBars/Tram/tram_bar_ocean.dmm @@ -635,6 +635,7 @@ /turf/open/floor/fake_seafloor/spawning, /area/station/commons/lounge) "Cr" = ( +/obj/structure/cable, /turf/open/floor/fake_seafloor/ironsand, /area/station/service/theater) "Cw" = ( @@ -763,6 +764,7 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/table/reinforced/rglass, /obj/effect/spawner/random/entertainment/musical_instrument, +/obj/structure/cable, /turf/open/floor/fake_seafloor/heavy, /area/station/service/theater) "Ir" = ( @@ -807,6 +809,7 @@ "KM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/fake_seafloor/ironsand, /area/station/service/theater) "KU" = ( @@ -935,7 +938,6 @@ /area/station/service/kitchen) "QI" = ( /obj/machinery/airalarm/directional/south, -/obj/structure/cable, /obj/structure/disposalpipe/trunk{ dir = 4 }, From d2e330fbd81f6c03694a44d67411f6d714e977a3 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:20:19 -0700 Subject: [PATCH 02/19] Icebox & Tram New cryo location, pathology improvements, pathology maints rooms here now marked as maints for radiation protection. New area required, hence the modular station.dm. --- .../map_files/IceBoxStation/IceBoxStation.dmm | 281 +++++++++--------- _maps/map_files/tramstation/tramstation.dmm | 169 +++++------ monkestation/code/area/areas/station.dm | 4 + tgstation.dme | 1 + 4 files changed, 227 insertions(+), 228 deletions(-) create mode 100644 monkestation/code/area/areas/station.dm diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 0132818d1107..1ada0c8cea92 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2780,13 +2780,13 @@ /obj/machinery/door/airlock/virology{ autoclose = 0; frequency = 1449; - id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock" + id_tag = "pathology_airlock_exterior"; + name = "Pathology Exterior Airlock" }, /obj/machinery/door_buttons/access_button{ - idDoor = "virology_airlock_exterior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + idDoor = "pathology_airlock_exterior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Button"; pixel_y = -24; req_access = list("pathology") }, @@ -2926,8 +2926,9 @@ /turf/open/floor/iron/freezer, /area/mine/laborcamp) "aZd" = ( +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "aZk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -3519,6 +3520,7 @@ /obj/machinery/duct, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "bhK" = ( @@ -4367,14 +4369,14 @@ /obj/machinery/door/airlock/virology{ autoclose = 0; frequency = 1449; - id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock" + id_tag = "pathology_airlock_interior"; + name = "Pathology Interior Airlock" }, /obj/structure/cable, /obj/machinery/door_buttons/access_button{ - idDoor = "virology_airlock_interior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + idDoor = "pathology_airlock_interior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Button"; pixel_x = -24; pixel_y = 5; req_access = list("pathology") @@ -6426,6 +6428,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"caa" = ( +/obj/structure/rack, +/obj/item/clothing/shoes/winterboots/ice_boots/eva, +/obj/item/clothing/shoes/winterboots/ice_boots/eva, +/obj/item/clothing/shoes/winterboots/ice_boots/eva, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/machinery/camera/emp_proof/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) "caC" = ( /obj/machinery/door/window/right/directional/south{ dir = 8; @@ -8492,7 +8505,7 @@ /obj/item/wrench, /obj/machinery/light/small/directional/south, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "cFZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -10975,7 +10988,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "dsT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -13284,6 +13297,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/commons/toilet) +"ehn" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/pathology) "ehp" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -20898,17 +20915,12 @@ /turf/open/floor/iron, /area/station/engineering/atmos/storage) "gGE" = ( -/obj/structure/rack, -/obj/item/clothing/suit/hooded/wintercoat{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/shoes/winterboots, /obj/machinery/firealarm/directional/south, /obj/item/radio/intercom/directional/west, -/turf/open/floor/iron/white, +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "gGF" = ( /obj/effect/spawner/random/trash/mess, @@ -21714,10 +21726,7 @@ }, /area/station/hallway/secondary/exit/departure_lounge) "gVx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/turf/open/floor/iron, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "gVC" = ( /obj/machinery/light/small/directional/south, @@ -23341,14 +23350,10 @@ /turf/open/floor/iron, /area/station/science/explab) "hzz" = ( -/obj/structure/table/glass, -/obj/item/clothing/gloves/latex, -/obj/item/healthanalyzer, -/obj/item/clothing/glasses/hud/health, -/obj/item/clothing/glasses/science, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, +/obj/machinery/disease2/centrifuge, /turf/open/floor/iron/white, /area/station/medical/virology) "hzB" = ( @@ -24440,7 +24445,7 @@ dir = 8 }, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "hSJ" = ( /obj/structure/chair/comfy{ dir = 8 @@ -24671,7 +24676,7 @@ /obj/machinery/space_heater, /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "hXk" = ( /obj/machinery/light/directional/west, /obj/structure/cable, @@ -25391,10 +25396,6 @@ dir = 4 }, /area/station/security/brig/entrance) -"iiR" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/medical/virology) "iji" = ( /obj/item/radio/intercom/directional/west, /obj/machinery/module_duplicator, @@ -26043,12 +26044,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"itf" = ( -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "iti" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/red, @@ -26140,6 +26135,15 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"iuQ" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + id_tag = "FitnessShower"; + name = "Cryogenic Storage" + }, +/obj/effect/landmark/navigate_destination/common/cryogenics, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "iuS" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/glass/reinforced, @@ -28209,12 +28213,8 @@ /turf/open/floor/iron/dark, /area/station/security/courtroom) "jbT" = ( -/obj/machinery/door/firedoor, /obj/structure/cable, -/obj/machinery/door/airlock/command/glass{ - name = "Emergency EVA Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/command/eva, +/obj/effect/spawner/structure/window/reinforced, /turf/open/floor/iron/textured, /area/station/hallway/secondary/exit/departure_lounge) "jbU" = ( @@ -28766,7 +28766,7 @@ /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "jmI" = ( /turf/closed/wall/r_wall, /area/station/security/prison/workout) @@ -29137,20 +29137,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/primary/central) -"jtG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/item/stack/sheet/iron/twenty, -/obj/structure/table, -/obj/item/stack/sheet/glass{ - amount = 20; - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "jtH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29811,10 +29797,10 @@ dir = 9 }, /obj/machinery/door_buttons/airlock_controller{ - idExterior = "virology_airlock_exterior"; - idInterior = "virology_airlock_interior"; - idSelf = "virology_airlock_control"; - name = "Virology Access Console"; + idExterior = "pathology_airlock_exterior"; + idInterior = "pathology_airlock_interior"; + idSelf = "pathology_airlock_control"; + name = "Pathology Access Console"; pixel_x = 8; pixel_y = 25; req_access = list("pathology") @@ -33147,9 +33133,13 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) "kGp" = ( -/obj/machinery/cryopod{ - dir = 8 - }, +/obj/structure/rack, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "kGx" = ( @@ -35141,6 +35131,9 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) +"lmN" = ( +/turf/closed/wall, +/area/station/maintenance/department/medical/pathology) "lmW" = ( /obj/structure/railing{ dir = 8 @@ -36147,12 +36140,6 @@ /obj/item/wrench, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"lDH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "lDM" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -36306,7 +36293,11 @@ }, /obj/structure/extinguisher_cabinet/directional/south, /obj/machinery/light/directional/south, -/obj/machinery/disease2/centrifuge, +/obj/structure/table/glass, +/obj/item/clothing/glasses/science, +/obj/item/clothing/glasses/hud/health, +/obj/item/healthanalyzer, +/obj/item/clothing/gloves/latex, /turf/open/floor/iron/white, /area/station/medical/virology) "lGp" = ( @@ -39033,7 +39024,10 @@ "mFP" = ( /obj/machinery/light/directional/east, /obj/structure/cable, -/turf/open/floor/iron, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "mFQ" = ( /obj/machinery/flasher/portable, @@ -42098,19 +42092,15 @@ /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) "nCa" = ( -/obj/structure/rack, -/obj/item/pickaxe, -/obj/item/pickaxe, -/obj/item/shovel, -/obj/item/flashlight, -/obj/item/flashlight, /obj/machinery/camera{ c_tag = "Departure Lounge Emergency EVA"; dir = 9 }, -/obj/item/radio/off, /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron/white, +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "nCb" = ( /obj/structure/rack, @@ -43076,6 +43066,14 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/smooth_large, /area/station/cargo/warehouse) +"nOO" = ( +/obj/structure/rack, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/radio, +/obj/item/radio, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) "nOQ" = ( /obj/machinery/suit_storage_unit/security, /obj/machinery/camera/directional/north{ @@ -45071,6 +45069,10 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/qm) +"ovm" = ( +/obj/structure/cable, +/turf/closed/wall/r_wall, +/area/station/hallway/secondary/exit/departure_lounge) "ovt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -46214,10 +46216,10 @@ /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) "oOD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/machinery/computer/cryopod/directional/north{ + dir = 2 }, -/turf/open/floor/iron, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "oOO" = ( /obj/effect/spawner/structure/window/reinforced, @@ -46544,6 +46546,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"oUb" = ( +/obj/structure/cable, +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "oUi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, @@ -49341,6 +49350,14 @@ /obj/item/device/antibody_scanner, /obj/item/device/antibody_scanner, /obj/item/device/antibody_scanner, +/obj/item/storage/box/vials{ + pixel_y = 10; + pixel_x = -10 + }, +/obj/item/storage/box/vials{ + pixel_y = 10; + pixel_x = -10 + }, /turf/open/floor/iron/white, /area/station/medical/virology) "pNB" = ( @@ -50686,10 +50703,10 @@ /area/mine/production) "qmU" = ( /obj/machinery/duct, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "qmV" = ( /obj/structure/sign/warning/gas_mask, /turf/closed/wall/r_wall, @@ -53670,10 +53687,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/dark, /area/station/engineering/main) -"rjr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/open/floor/plating, -/area/station/medical/virology) "rjs" = ( /obj/structure/disposalpipe/sorting/mail/flip{ dir = 2 @@ -54082,7 +54095,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/airalarm/directional/south, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "rqJ" = ( /obj/structure/chair{ dir = 8 @@ -56175,6 +56188,9 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"rZG" = ( +/turf/closed/wall/r_wall, +/area/station/maintenance/department/medical/pathology) "rZN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56494,6 +56510,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "sfz" = ( @@ -58503,11 +58521,10 @@ }, /area/station/security/prison) "sMT" = ( -/obj/machinery/door/airlock{ - id_tag = "FitnessShower"; - name = "Cryogenic Storage" +/obj/machinery/door/airlock/command/glass{ + name = "Emergency EVA Storage" }, -/obj/effect/landmark/navigate_destination/common/cryogenics, +/obj/effect/mapping_helpers/airlock/access/all/command/eva, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "sMY" = ( @@ -61525,12 +61542,13 @@ /obj/machinery/duct, /obj/structure/cable, /obj/machinery/door/airlock/maintenance{ - name = "Virology Service Room" + name = "Pathology Service Room" }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "tMl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt/dust, @@ -62690,10 +62708,6 @@ /area/station/medical/chemistry) "ugz" = ( /obj/machinery/light/directional/south, -/obj/machinery/computer/cryopod{ - pixel_y = -32; - dir = 1 - }, /turf/open/floor/iron/cafeteria, /area/station/commons/dorms/laundry) "ugG" = ( @@ -63912,6 +63926,7 @@ dir = 1 }, /obj/machinery/duct, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "uCg" = ( @@ -73938,6 +73953,7 @@ /area/station/engineering/atmos) "xKe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "xKj" = ( @@ -74316,10 +74332,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "xQT" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, +/obj/structure/cable, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "xRw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74614,19 +74630,11 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "xWu" = ( -/obj/structure/rack, -/obj/item/tank/internals/emergency_oxygen{ - pixel_x = 5; - pixel_y = -2 - }, -/obj/item/tank/internals/emergency_oxygen{ - pixel_y = 3 - }, -/obj/item/tank/internals/emergency_oxygen, /obj/structure/sign/warning/cold_temp/directional/west, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/turf/open/floor/iron/white, +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "xWA" = ( /obj/structure/table, @@ -75234,6 +75242,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /obj/structure/sign/warning/electric_shock/directional/north, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "ygv" = ( @@ -158150,9 +158159,9 @@ tKI tKI iwS iwS -itf -itf -itf +hvR +hvR +hvR iwS szG szG @@ -158664,8 +158673,8 @@ gwz tDG gri iwS -kGp -kGp +caa +nOO kGp iwS iDt @@ -178206,10 +178215,10 @@ gPj btU btU ako -xDb +rZG jms cFT -xDb +rZG hjM hjM hjM @@ -178464,7 +178473,7 @@ mgg hJC ako hWV -iiR +aZd aZd rqI xDb @@ -178720,8 +178729,8 @@ dYX wWJ gpT ako -rjr -xQT +ehn +ehn xQT qmU xDb @@ -178979,7 +178988,7 @@ tHe ako hSF dsA -jUB +lmN tMk xDb pGS @@ -255282,11 +255291,11 @@ vsI sEB sEB sEB -tpd +ovm oOD -lDH gVx -tpd +gVx +iuQ qWO pCI gVt @@ -255540,9 +255549,9 @@ tlH tlH sEB tpd -jtG +oUb mFP -myJ +oUb jbT wLS myJ diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 53acbb404fcf..a1816c678206 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -6459,9 +6459,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/hallway/primary/tram/right) -"aSb" = ( -/turf/closed/wall/r_wall, -/area/station/science/cytology) "aSe" = ( /obj/structure/closet/wardrobe/black, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -7181,7 +7178,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "bfa" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -10232,7 +10229,7 @@ /obj/structure/cable, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "cdq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/steam_vent, @@ -12477,19 +12474,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"cOR" = ( -/obj/effect/turf_decal/box/red/corners{ - dir = 4 - }, -/obj/effect/turf_decal/box/red/corners{ - dir = 8 - }, -/obj/effect/turf_decal/box/red/corners{ - dir = 1 - }, -/obj/effect/turf_decal/box/red/corners, -/turf/open/floor/engine, -/area/station/science/cytology) "cPu" = ( /obj/effect/spawner/random{ loot = list(/obj/effect/decal/cleanable/oil/slippery=10,/obj/effect/decal/cleanable/oil=90); @@ -13142,17 +13126,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"dap" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/computer/cryopod{ - pixel_y = -32; - dir = 1 - }, -/obj/effect/landmark/navigate_destination/common/cryogenics, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "dar" = ( /turf/open/floor/iron/dark/side{ dir = 8 @@ -15989,6 +15962,13 @@ /obj/structure/table/wood, /turf/open/floor/iron/dark, /area/station/service/chapel) +"dVq" = ( +/obj/machinery/light/directional/west, +/obj/machinery/computer/cryopod/directional/north{ + dir = 2 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "dVs" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage" @@ -17932,7 +17912,7 @@ "eAU" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/engine, -/area/station/science/cytology) +/area/station/science/xenobiology) "eAX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20624,6 +20604,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/greater) +"fvJ" = ( +/obj/effect/landmark/navigate_destination/common/cryogenics, +/obj/machinery/door/airlock{ + id_tag = "FitnessShower"; + name = "Cryogenic Storage" + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "fvK" = ( /obj/structure/cable/layer1, /obj/effect/decal/cleanable/dirt, @@ -26775,15 +26763,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron/cafeteria, /area/station/science/breakroom) -"hCx" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/cryopod{ - dir = 8 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "hCz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, @@ -30286,9 +30265,6 @@ /obj/machinery/light/directional/south, /obj/machinery/disposal/bin, /obj/machinery/airalarm/directional/south, -/obj/machinery/camera/directional/south{ - c_tag = "Departures - South Main" - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, @@ -31080,6 +31056,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/secondary/exit) "iVG" = ( @@ -31424,9 +31401,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/central/greater) -"jbL" = ( -/turf/open/floor/engine, -/area/station/science/cytology) "jcm" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -33556,10 +33530,6 @@ }, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) -"jKU" = ( -/obj/structure/sign/directions/cryo/directional/south, -/turf/closed/wall, -/area/station/security/checkpoint/arrivals) "jLf" = ( /turf/open/floor/iron/chapel, /area/station/service/chapel) @@ -38513,6 +38483,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/commons/dorms) +"lmC" = ( +/obj/machinery/light/directional/east, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "lmG" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -41345,6 +41319,9 @@ }, /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/camera/directional/south{ + c_tag = "Departures - South Main" + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "miQ" = ( @@ -45827,11 +45804,9 @@ /area/station/maintenance/department/crew_quarters/dorms) "nGZ" = ( /obj/effect/turf_decal/siding/thinplating/dark, -/obj/structure/chair{ - dir = 4 - }, /obj/machinery/bluespace_vendor/directional/south, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/vending/coffee, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "nHi" = ( @@ -50202,6 +50177,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"pjl" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "pjA" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -58133,6 +58114,9 @@ /obj/structure/flora/bush/flowers_br/style_random, /turf/open/floor/grass, /area/station/asteroid) +"rDG" = ( +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "rDI" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -64137,15 +64121,6 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"tyF" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/cryopod{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "tyJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing, @@ -67010,8 +66985,11 @@ /area/station/maintenance/starboard/central) "uuR" = ( /obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/vending/coffee, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/directions/cryo/directional/south{ + pixel_y = -43; + pixel_x = -32 + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "uuZ" = ( @@ -69830,6 +69808,13 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"vlV" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/freezer, +/area/station/hallway/secondary/exit/departure_lounge) "vme" = ( /obj/effect/turf_decal/bot, /obj/machinery/requests_console/directional/west{ @@ -75038,7 +75023,7 @@ name = "Plaguebearer" }, /turf/open/floor/plating, -/area/station/medical/virology) +/area/station/maintenance/department/medical/pathology) "wRr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/engineering/tank, @@ -162011,7 +161996,7 @@ uHT fSr fSr pjg -jKU +fSr fSr qOF qOF @@ -162785,7 +162770,7 @@ uSe kQX fSr rVp -hCx +rVp aJi aJi aJi @@ -163041,7 +163026,7 @@ gbl uSe kGJ fSr -dap +rVp qOF xmR xmR @@ -163299,7 +163284,7 @@ uSe agM fSr rVp -tyF +rVp aJi aJi aJi @@ -164067,7 +164052,7 @@ kll fSr fSr lwd -jKU +fSr fSr qOF qOF @@ -188512,8 +188497,8 @@ uJl qzw mHE efX -aSb -cOR +qVr +qvU eAU soq rsL @@ -188769,9 +188754,9 @@ lVi lVi lVi lVi -aSb -jbL -jbL +qVr +bfH +bfH soq rsL rsL @@ -195934,9 +195919,9 @@ qSm iSc gyn fmy -aaa -aac -aac +dVq +pjl +aaS aac aac aac @@ -196191,9 +196176,9 @@ qSm fgl iKC fmy -aac -aac -aac +rDG +pjl +aaS aac aac aac @@ -196447,10 +196432,10 @@ qSm qSm orX uuR -fmy -aac -aac -aac +fvJ +rDG +vlV +aaS aac aac aac @@ -196705,9 +196690,9 @@ qSm orX nGZ fmy -aac -aac -aac +rDG +pjl +aaS aac aac aac @@ -196962,9 +196947,9 @@ vwR orX rmz fmy -aaa -aac -aac +lmC +pjl +aaS aac aac aac @@ -197219,9 +197204,9 @@ nPd swr aXD fmy -aaa -aaa -aac +aaS +aaS +aaS aac aac jhd diff --git a/monkestation/code/area/areas/station.dm b/monkestation/code/area/areas/station.dm new file mode 100644 index 000000000000..684bd29fb018 --- /dev/null +++ b/monkestation/code/area/areas/station.dm @@ -0,0 +1,4 @@ +/area/station/maintenance/department/medical/pathology/ + name = "Pathology Maintenance" + icon_state = "virology" + sound_environment = SOUND_AREA_SMALL_ENCLOSED diff --git a/tgstation.dme b/tgstation.dme index 98559f5d4734..b59bee8bfe70 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5591,6 +5591,7 @@ #include "monkestation\code\__HELPERS\reagents.dm" #include "monkestation\code\__HELPERS\turfs.dm" #include "monkestation\code\_onclick\hud\alert.dm" +#include "monkestation\code\area\areas\station.dm" #include "monkestation\code\datums\action.dm" #include "monkestation\code\datums\antag_tokens.dm" #include "monkestation\code\datums\emotes.dm" From 78c70c531086e3ea1ff22cc5da22cb059f9cf916 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:21:07 -0700 Subject: [PATCH 03/19] Wikibooks Adjusted our wikibooks so they actually go to the appropriate pages on the wiki for those that currently have them. --- code/game/objects/items/manuals.dm | 48 ++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 2cd93dc64070..46ac21131b6d 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -279,12 +279,14 @@ book_data.set_content(wikiinfo, trusted = TRUE) */ +//MONKESTATION EDIT BEGIN - basically there isn't a single thing that's not touched below this line. Just going to make this abundantly obvious that we have a lot of changes, between names of some manuals being changed to reflect different jobs to all of the links to the wiki. There's basically zero excuse for me to not leave an edit comment on here. + /obj/item/book/manual/wiki/chemistry name = "Chemistry Textbook" icon_state ="chemistrybook" starting_author = "Nanotrasen" starting_title = "Chemistry Textbook" - page_link = "Guide_to_chemistry" + page_link = "en/jobs/medical/guide-to-chemistry" /obj/item/book/manual/wiki/engineering_construction name = "Station Repairs and Construction" @@ -313,11 +315,11 @@ return OXYLOSS /obj/item/book/manual/wiki/infections - name = "Infections - Making your own pandemic!" + name = "Pathology 101 - Curing Problems" icon_state = "bookInfections" starting_author = "Infections Encyclopedia" - starting_title = "Infections - Making your own pandemic!" - page_link = "Infections" + starting_title = "Pathology 101 - Curing Problems" + page_link = "en/jobs/medical/pathology" /obj/item/book/manual/wiki/telescience name = "Teleportation Science - Bluespace for dummies!" @@ -338,7 +340,7 @@ icon_state ="bookDetective" starting_author = "Nanotrasen" starting_title = "The Film Noir: Proper Procedures for Investigations" - page_link = "Detective" + page_link = "en/jobs/security/detective" /obj/item/book/manual/wiki/barman_recipes name = "Barman Recipes: Mixing Drinks and Changing Lives" @@ -352,14 +354,14 @@ icon_state = "borgbook" starting_author = "XISC" starting_title = "Robotics for Dummies" - page_link = "Guide_to_robotics" + page_link = "en/jobs/science/guide-to-robotics" /obj/item/book/manual/wiki/research_and_development name = "Research and Development 101" icon_state = "rdbook" starting_author = "Dr. L. Ight" starting_title = "Research and Development 101" - page_link = "Guide_to_Research_and_Development" + page_link = "en/jobs/science/guide-to-rnd" /obj/item/book/manual/wiki/cooking_to_serve_man name = "To Serve Man" @@ -374,42 +376,42 @@ icon_state = "book3" starting_author = "Engineering Encyclopedia" starting_title = "Subspace Telecommunications And You" - page_link = "Guide_to_Telecommunications" + page_link = "en/jobs/engineering/guide-to-telcom" /obj/item/book/manual/wiki/atmospherics name = "Lexica Atmosia" icon_state = "book5" starting_author = "the City-state of Atmosia" starting_title = "Lexica Atmosia" - page_link = "Guide_to_Atmospherics" + page_link = "en/jobs/engineering/guide-to-atmospherics" /obj/item/book/manual/wiki/medicine name = "Medical Space Compendium, Volume 638" icon_state = "book8" starting_author = "Medical Journal" starting_title = "Medical Space Compendium, Volume 638" - page_link = "Guide_to_medicine" + page_link = "en/jobs/medical/guide-to-medicine" /obj/item/book/manual/wiki/surgery name = "Brain Surgery for Dummies" icon_state = "book4" starting_author = "Dr. F. Fran" starting_title = "Brain Surgery for Dummies" - page_link = "Surgery" + page_link = "en/jobs/medical/guide-to-surgery" /obj/item/book/manual/wiki/grenades name = "DIY Chemical Grenades" icon_state = "book2" starting_author = "W. Powell" starting_title = "DIY Chemical Grenades" - page_link = "Grenade" + page_link = "en/jobs/medical/guide-to-grenades" /obj/item/book/manual/wiki/ordnance name = "Ordnance for Dummies or: How I Learned to Stop Worrying and Love the Maxcap" icon_state = "book6" starting_author = "Cuban Pete" starting_title = "Ordnance for Dummies or: How I Learned to Stop Worrying and Love the Maxcap" - page_link = "Guide_to_toxins" + page_link = "en/jobs/science/guide-to-ordnance" /obj/item/book/manual/wiki/ordnance/suicide_act(mob/living/user) var/mob/living/carbon/human/H = user @@ -438,14 +440,14 @@ icon_state ="plumbingbook" starting_author = "Nanotrasen" starting_title = "Chemical Factories Without Narcotics" - page_link = "Guide_to_plumbing" + page_link = "en/jobs/medical/guide-to-plumbing" /obj/item/book/manual/wiki/cytology name = "Unethically Grown Organics" icon_state ="cytologybook" starting_author = "Kryson" starting_title = "Unethically Grown Organics" - page_link = "Guide_to_cytology" + page_link = "en/jobs/science/guide-to-cytology" /obj/item/book/manual/wiki/tgc name = "Tactical Game Cards - Player's Handbook" @@ -453,3 +455,19 @@ starting_author = "Nanotrasen Edu-tainment Division" starting_title = "Tactical Game Cards - Player's Handbook" page_link = "Tactical_Game_Cards" + +/obj/item/book/manual/wiki/artsci // manual specific for Artifact Science! + name = "Artifact Science!" + icon_state = "book6" + starting_author = "Dr. Mobius" + starting_title = "Artifact Science!" + page_link = "en/jobs/science/guide-to-artsci" + +/obj/item/book/manual/wiki/banned //manual specific for... well, handing a funny book to people that might be on the verge of breaking rules but we can have a funny way of handling those situations. + name = "How to Avoid Getting Banned" + icon_state = "bookSpaceLaw" + starting_author = "God" + starting_title = "How to Avoid Getting Banned" + page_link = "en/guides/how-to-avoid-getting-banned" + +//MONKESTATION EDIT END From 74303939ad864b21a4c42618d2598b111d1a4f53 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:21:39 -0700 Subject: [PATCH 04/19] OP Item Removal Knocked down the champion wrestling belt to just the champion belt. No more free OP wrestling moves! --- _maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm index 01891e8ef3dd..da7fcaf3d575 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_mookvillage.dmm @@ -85,7 +85,7 @@ "aK" = ( /obj/structure/table/wood/shuttle_bar, /obj/item/hatchet/wooden, -/obj/item/storage/belt/champion/wrestling, +/obj/item/storage/belt/champion, /turf/open/floor/holofloor/wood, /area/lavaland/surface/outdoors) "aL" = ( From deb6038f20f18c70bcb97f6d8848cfae5279068d Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:22:14 -0700 Subject: [PATCH 05/19] Metastation: cryo pass Metastation's cryo is now next to departures. --- _maps/map_files/MetaStation/MetaStation.dmm | 205 +++++++++----------- 1 file changed, 95 insertions(+), 110 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3ff5e686574f..51e3236ced8e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4663,6 +4663,12 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) +"bEC" = ( +/obj/machinery/cryopod{ + dir = 8 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "bEL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, @@ -8062,7 +8068,6 @@ "daz" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atm, -/obj/structure/sign/directions/cryo/directional/west, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) "daC" = ( @@ -10043,6 +10048,13 @@ /obj/effect/turf_decal/siding/purple, /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) +"dOE" = ( +/obj/machinery/computer/cryopod{ + dir = 4; + pixel_x = -32 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "dOQ" = ( /obj/structure/closet/toolcloset, /obj/effect/turf_decal/delivery, @@ -13841,14 +13853,6 @@ }, /turf/open/floor/iron/white, /area/station/science/research) -"fjc" = ( -/obj/machinery/computer/cryopod{ - dir = 4; - pixel_x = -32 - }, -/obj/machinery/light/directional/west, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "fjd" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -17173,10 +17177,6 @@ /obj/effect/spawner/random/decoration/showcase, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"gwG" = ( -/obj/machinery/cryopod, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "gwK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24911,6 +24911,9 @@ /obj/machinery/status_display/ai/directional/north, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"jbq" = ( +/turf/closed/wall/r_wall, +/area/station/hallway/primary/aft) "jbF" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb, @@ -25369,10 +25372,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/greater) "jjs" = ( -/obj/effect/spawner/random/engineering/tank, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "jjC" = ( /obj/structure/flora/bush/lavendergrass/style_random, /obj/item/food/grown/banana, @@ -30155,6 +30159,10 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/sign/directions/evac/directional/south{ + pixel_y = 0; + pixel_x = 32 + }, /turf/open/floor/iron/white/corner, /area/station/hallway/primary/aft) "kSE" = ( @@ -31500,11 +31508,12 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "lqh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 +/obj/machinery/cryopod{ + dir = 8 }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "lql" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/directional/south, @@ -32543,10 +32552,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/fore) -"lLO" = ( -/obj/structure/sign/directions/cryo/directional/north, -/turf/closed/wall, -/area/station/commons/toilet/restrooms) "lLR" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 8 @@ -35701,12 +35706,6 @@ /obj/structure/filingcabinet, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"mQe" = ( -/obj/machinery/cryopod{ - dir = 1 - }, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "mQr" = ( /turf/open/floor/iron/dark/side{ dir = 1 @@ -36253,9 +36252,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"mZb" = ( -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "mZy" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39717,6 +39713,10 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/atmos) +"okX" = ( +/obj/effect/spawner/random/engineering/tank, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "ola" = ( /turf/closed/wall, /area/station/science/robotics/mechbay) @@ -40592,7 +40592,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/sign/directions/cryo/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) "oAj" = ( @@ -42464,8 +42463,8 @@ /area/station/commons/fitness/recreation) "pjX" = ( /obj/machinery/light/small/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "pke" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -47970,10 +47969,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "rhU" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random/structure/crate, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "rhV" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/sign/poster/random/directional/south, @@ -49127,10 +49124,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"rDB" = ( -/obj/effect/mapping_helpers/burnt_floor, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "rDE" = ( /obj/item/target, /obj/item/target, @@ -49253,6 +49246,11 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/iron, /area/station/security/holding_cell) +"rFX" = ( +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "rGb" = ( /obj/machinery/washing_machine, /obj/effect/turf_decal/tile/blue{ @@ -49815,6 +49813,11 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rNZ" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/structure/sign/directions/cryo/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "rOz" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -50970,6 +50973,14 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"sgd" = ( +/obj/machinery/door/airlock{ + id_tag = "FitnessShower"; + name = "Cryogenic Storage" + }, +/obj/effect/landmark/navigate_destination/common/cryogenics, +/turf/open/floor/iron/freezer, +/area/station/hallway/primary/aft) "sgk" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -53998,12 +54009,6 @@ }, /turf/open/floor/iron, /area/station/security/brig) -"tjE" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random/structure/closet_maintenance, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "tjG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, @@ -55642,16 +55647,8 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "tNM" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Storage Room" - }, -/obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/access/any/science/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/turf/open/floor/plating, +/turf/closed/wall, /area/station/maintenance/aft/lesser) "tNQ" = ( /obj/structure/kitchenspike, @@ -60345,14 +60342,6 @@ /obj/item/clothing/mask/cigarette/pipe, /turf/open/floor/plating, /area/station/maintenance/port) -"vwp" = ( -/obj/machinery/door/airlock{ - id_tag = "FitnessShower"; - name = "Cryogenic Storage" - }, -/obj/effect/landmark/navigate_destination/common/cryogenics, -/turf/open/floor/iron/freezer, -/area/station/commons/fitness/recreation) "vwP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61950,10 +61939,6 @@ "vZm" = ( /turf/closed/wall, /area/station/security/lockers) -"vZB" = ( -/obj/structure/sign/directions/evac, -/turf/closed/wall, -/area/station/maintenance/aft/lesser) "vZE" = ( /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, @@ -95878,7 +95863,7 @@ chb gmt gmt oCw -gmt +rNZ gmt dXQ kSD @@ -96135,11 +96120,11 @@ oIg oIg oIg oIg -svS -dKC -dKC -vZB -dKC +jbq +sgd +kOR +kOR +kOR dKC tXU dKC @@ -96392,10 +96377,10 @@ neA vKW jNX jxW -dKC +kOR rhU pjX -mGI +dOE jjs dKC xLu @@ -96649,10 +96634,10 @@ oir wal mXt jxW -dKC -tjE -rDB -nFa +kOR +bEC +bEC +bEC lqh dKC dvR @@ -97424,8 +97409,8 @@ svS oHO mGI oEx -nFa -nFa +rFX +gma gvI dKC iUm @@ -101942,11 +101927,11 @@ aaa aaa aaa aaa -szp -szp -szp -szp -szp +lMJ +aaa +aaa +aaa +ilh cur cur nDF @@ -102199,11 +102184,11 @@ aaa aaa aaa aaa -szp -gwG -fjc -mQe -szp +lMJ +aaa +aaa +aaa +ilh cur jCj ihX @@ -102456,11 +102441,11 @@ aWl lMJ lMJ lMJ -szp -gwG -mZb -mQe -szp +lMJ +aaa +aaa +aaa +ilh gKc cur vTf @@ -102713,11 +102698,11 @@ rrt aaa aaa aaa -nvn -gwG -mZb -mQe -szp +lMJ +aaa +aaa +aaa +ilh aDR ilh ilh @@ -102972,7 +102957,7 @@ aaa aaa szp szp -vwp +szp szp szp ilh @@ -102997,7 +102982,7 @@ fbg dIO dIO dIO -lLO +dIO tTT vLA qsK @@ -103327,7 +103312,7 @@ eEl pzN oWk nYU -fPD +cqv oWk dvJ qiw @@ -103841,7 +103826,7 @@ sMV uqG oWk luE -fPD +okX whn oWk pIF From 455c5c1fe0bdab4a0ec0cd8d4c1f9d30edfc9ae3 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:23:14 -0700 Subject: [PATCH 06/19] Delta Station: cryo pass Delta's cryo is now next to departures. --- .../map_files/Deltastation/DeltaStation2.dmm | 191 ++++++++++-------- 1 file changed, 107 insertions(+), 84 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 923f68d288dc..97a869cac042 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1745,10 +1745,9 @@ /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/captain/private) "asH" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "asO" = ( /obj/machinery/porta_turret/ai, @@ -11944,9 +11943,6 @@ /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/captain/private) "cNz" = ( -/obj/structure/sign/directions/cryo/directional/east{ - pixel_y = 10 - }, /obj/structure/sign/directions/dorms{ dir = 4; pixel_x = 32; @@ -12834,10 +12830,10 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/engineering/atmospherics_portable, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/machinery/computer/cryopod/directional/north{ + dir = 2 + }, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "cZp" = ( /obj/effect/turf_decal/tile/neutral, @@ -15219,10 +15215,10 @@ }, /area/station/service/chapel) "dFi" = ( -/obj/machinery/cryopod{ +/obj/structure/chair/comfy{ dir = 1 }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "dFm" = ( /obj/effect/landmark/start/hangover/closet, @@ -15422,11 +15418,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/obj/machinery/computer/cryopod{ - dir = 8; - pixel_x = 32 - }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "dIk" = ( /obj/structure/disposalpipe/segment{ @@ -17545,10 +17537,7 @@ /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/sign/warning/yes_smoking/circle/directional/south, /obj/machinery/light/small/directional/south, -/obj/machinery/cryopod{ - dir = 1 - }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "ejX" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -18436,10 +18425,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/bot, -/obj/structure/closet/emcloset, -/turf/open/floor/iron, +/obj/machinery/cryopod, +/obj/machinery/light/directional/west, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "euz" = ( /obj/structure/disposalpipe/segment{ @@ -19759,10 +19747,7 @@ "eME" = ( /obj/machinery/newscaster/directional/south, /obj/machinery/light/small/directional/south, -/obj/machinery/cryopod{ - dir = 1 - }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "eMG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20232,8 +20217,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/iron, +/turf/closed/wall, /area/station/maintenance/department/medical/morgue) "eSd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23949,6 +23933,7 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) "fMZ" = ( @@ -24164,6 +24149,9 @@ c_tag = "Departures Lounge - Fore Port"; name = "departures camera" }, +/obj/structure/sign/directions/cryo/directional/west{ + pixel_y = -12 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -27756,6 +27744,7 @@ /obj/structure/bodycontainer/morgue{ dir = 1 }, +/obj/machinery/status_display/ai/directional/south, /turf/open/floor/iron/dark/textured_half{ dir = 1 }, @@ -30562,8 +30551,8 @@ "hsa" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/item/radio/intercom/directional/north, -/obj/machinery/cryopod, -/turf/open/floor/iron/freezer, +/obj/structure/chair/comfy/carp, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "hsg" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -30660,6 +30649,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/solars/port/aft) +"htC" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "htF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -34541,7 +34534,6 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 8 }, -/obj/machinery/status_display/ai/directional/south, /obj/structure/bodycontainer/morgue{ dir = 1 }, @@ -34962,6 +34954,15 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"iwU" = ( +/obj/structure/bodycontainer/morgue{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "iwW" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -38496,12 +38497,6 @@ /obj/item/pen, /turf/open/floor/iron/checker, /area/station/hallway/secondary/service) -"jpr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/navigate_destination/chapel, -/turf/open/floor/iron/grimy, -/area/station/service/chapel) "jpA" = ( /turf/open/floor/iron/grimy, /area/station/security/detectives_office/private_investigators_office) @@ -39420,9 +39415,8 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/effect/spawner/random/engineering/atmospherics_portable, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, +/obj/machinery/cryopod, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "jAY" = ( /obj/machinery/computer/station_alert{ @@ -41670,7 +41664,6 @@ /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 4 }, -/obj/machinery/status_display/evac/directional/south, /obj/structure/bodycontainer/morgue{ dir = 1 }, @@ -41848,6 +41841,25 @@ /obj/structure/sign/warning/secure_area/directional/east, /turf/open/floor/iron/white, /area/station/science/research) +"kdt" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/space/basic, +/area/station/maintenance/department/medical/morgue) "kdC" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster/directional/east, @@ -43713,7 +43725,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "kBT" = ( /obj/machinery/duct, @@ -46344,7 +46356,7 @@ /area/station/hallway/primary/starboard) "ljj" = ( /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "ljm" = ( /obj/machinery/door/airlock/external{ @@ -54515,7 +54527,7 @@ "njy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, +/turf/closed/wall, /area/station/maintenance/department/medical/morgue) "njz" = ( /obj/structure/sign/warning/vacuum/external, @@ -60057,6 +60069,7 @@ dir = 4 }, /obj/effect/spawner/random/trash/mess, +/obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/iron, /area/station/maintenance/department/medical/morgue) "oDX" = ( @@ -64016,8 +64029,14 @@ /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "pEx" = ( -/obj/machinery/cryopod, -/turf/open/floor/iron/freezer, +/obj/structure/table/wood/fancy/red, +/obj/item/storage/fancy/cigarettes/cigpack_robust, +/obj/item/storage/fancy/cigarettes/cigpack_robust, +/obj/item/storage/fancy/cigarettes/cigars, +/obj/item/storage/fancy/cigarettes/cigars, +/obj/item/lighter, +/obj/item/lighter, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "pEz" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -66560,22 +66579,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "qhy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/mapping_helpers/airlock/access/any/medical/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, /obj/structure/cable, -/turf/open/floor/iron, +/obj/machinery/door/airlock, +/obj/effect/landmark/navigate_destination/common/cryogenics, +/turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "qhA" = ( /obj/structure/cable, @@ -72269,6 +72276,16 @@ /obj/effect/spawner/random/structure/girder, /turf/open/floor/plating, /area/station/maintenance/fore) +"rDd" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Departures Lounge - Fore Port"; + name = "departures camera" + }, +/turf/open/floor/iron/freezer, +/area/station/maintenance/department/medical/morgue) "rDj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -72454,7 +72471,7 @@ /area/station/engineering/atmos/project) "rGd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron, /area/station/commons/fitness/recreation) "rGf" = ( /obj/machinery/power/solar_control{ @@ -79050,6 +79067,13 @@ /obj/item/stock_parts/cell/high, /turf/open/floor/iron, /area/station/science/robotics/lab) +"tmO" = ( +/obj/machinery/cryopod{ + dir = 1 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/freezer, +/area/station/maintenance/department/medical/morgue) "tnm" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/recharge_station, @@ -79442,6 +79466,9 @@ /obj/item/integrated_circuit/loaded/hello_world, /turf/open/floor/iron/dark, /area/station/science/circuits) +"trZ" = ( +/turf/open/floor/iron/freezer, +/area/station/maintenance/department/medical/morgue) "tsa" = ( /obj/machinery/atmospherics/components/binary/pump/layer2{ dir = 8; @@ -79762,9 +79789,6 @@ "tuB" = ( /obj/effect/spawner/random/structure/table_or_rack, /obj/effect/spawner/random/trash/janitor_supplies, -/obj/structure/sign/directions/cryo/directional/south{ - pixel_y = -40 - }, /turf/open/floor/plating, /area/station/maintenance/department/security) "tuH" = ( @@ -79884,7 +79908,7 @@ "twC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/iron/freezer, /area/station/maintenance/department/medical/morgue) "twE" = ( /obj/machinery/door/firedoor, @@ -92334,7 +92358,8 @@ pixel_x = 32; pixel_y = -8 }, -/obj/structure/sign/directions/cryo/directional/east{ +/obj/structure/sign/directions/cryo/directional/south{ + pixel_x = 32; pixel_y = 10 }, /turf/open/floor/iron, @@ -93627,6 +93652,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/medical/break_room) +"wJL" = ( +/obj/structure/chair/comfy/lime, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "wJQ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/cup/glass/flask/gold, @@ -98179,12 +98208,6 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) -"xTq" = ( -/obj/structure/sign/directions/cryo/directional/east{ - pixel_y = -8 - }, -/turf/closed/wall, -/area/station/maintenance/starboard/aft) "xTr" = ( /turf/closed/wall, /area/station/science/robotics/lab) @@ -139695,7 +139718,7 @@ gHF bhw wfk lcB -tJV +htC bhw dTE tJV @@ -139951,7 +139974,7 @@ wUD dyk bhw eSa -lcB +kdt njy tHV tHV @@ -140205,11 +140228,11 @@ uwZ aiF gTZ wUD -gHF +iwU bhw euu -tJV -xBc +trZ +rDd tHV wxl ujQ @@ -140723,7 +140746,7 @@ ykN bhw jAM ljj -tJV +tmO tHV hdR nZC @@ -145859,7 +145882,7 @@ oGK uur mHE gYo -jpr +rMa rMa rMa xED @@ -152508,7 +152531,7 @@ qfH yaI ouy bfe -xTq +nXH qPE jBm wpH @@ -155593,7 +155616,7 @@ fIQ fIQ aad mfC -pEx +wJL dHX eME uKw From 71ce213d01684beac1ff6593894a4c57333aa54e Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:24:10 -0700 Subject: [PATCH 07/19] Centcom: tweaks Small tweaks to an office. --- _maps/map_files/generic/CentCom.dmm | 64 ++++++++++++++++++----------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 882ca1d36ba1..bc7867f6b83d 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2320,6 +2320,21 @@ /area/centcom/central_command_areas/hall) "gH" = ( /obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, +/obj/item/stack/cannonball, /turf/open/misc/grass, /area/centcom/central_command_areas/admin) "gJ" = ( @@ -7227,6 +7242,18 @@ }, /turf/open/floor/mineral/titanium/yellow, /area/centcom/syndicate_mothership/control) +"vo" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 7; + json_key = "cargo"; + name = "CentCom"; + shuttle_id = "cargo_away"; + width = 20 + }, +/turf/open/space/basic, +/area/space) "vp" = ( /obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, @@ -8381,18 +8408,6 @@ }, /turf/open/floor/wood/large, /area/centcom/central_command_areas/kitchen) -"yV" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 7; - json_key = "cargo"; - name = "CentCom"; - shuttle_id = "cargo_away"; - width = 20 - }, -/turf/open/space, -/area/space) "yW" = ( /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, @@ -9183,7 +9198,6 @@ layer = 4.1 }, /obj/structure/railing{ - dir = 6; layer = 3.1 }, /obj/effect/turf_decal/siding/dark{ @@ -10116,6 +10130,12 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/syndicate_mothership/control) +"DT" = ( +/obj/structure/fermenting_barrel/gunpowder, +/obj/item/reagent_containers/cup/bucket/wooden, +/obj/item/flashlight/flare/torch, +/turf/open/misc/grass, +/area/centcom/central_command_areas/admin) "DU" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12532,7 +12552,6 @@ /area/centcom/syndicate_mothership/control) "KX" = ( /obj/structure/railing{ - dir = 6; layer = 3.1 }, /obj/effect/turf_decal/siding/dark/corner{ @@ -12965,7 +12984,6 @@ /area/centcom/central_command_areas/admin) "Md" = ( /obj/structure/railing{ - dir = 6; layer = 3.1 }, /obj/effect/turf_decal/siding/dark{ @@ -13305,10 +13323,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) -"Na" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/indestructible/event/plating, -/area/centcom/central_command_areas/admin_hangout) "Nb" = ( /turf/open/floor/iron/dark, /area/centcom/central_command_areas/medical) @@ -45987,11 +46001,11 @@ aa aa aa aa -yV -aa +ad aa aa aa +vo aa aa aa @@ -47048,7 +47062,7 @@ On hA gH nO -uk +DT hp On uo @@ -59137,9 +59151,9 @@ aa aa iA iA -Na -Na -Na +Xw +Xw +Xw iA iA wc From 589d70b168fc3258ec454e0a9ee0e3a1d39f8add Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:38:14 -0700 Subject: [PATCH 08/19] All Stations: Artsci Wikibook! Added the new wikibook to all ARTSCI. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ++++ _maps/map_files/IceBoxStation/IceBoxStation.dmm | 4 ++++ _maps/map_files/MetaStation/MetaStation.dmm | 4 ++++ _maps/map_files/tramstation/tramstation.dmm | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 97a869cac042..534a8684c79f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -75081,6 +75081,10 @@ "snw" = ( /obj/structure/table, /obj/item/analysis_bin, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/science/explab) "snE" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 1ada0c8cea92..869a0ea5fd53 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -64352,6 +64352,10 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/item/analysis_bin, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/science/explab) "uJX" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 51e3236ced8e..961f9a6d6e05 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -56582,6 +56582,10 @@ "ufy" = ( /obj/structure/table, /obj/item/analysis_bin, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/science/explab) "ufX" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a1816c678206..b0d824e73a0c 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -25790,6 +25790,10 @@ /obj/machinery/airalarm/directional/north, /obj/structure/table, /obj/item/analysis_bin, +/obj/item/book/manual/wiki/artsci{ + pixel_y = 5; + pixel_x = 8 + }, /turf/open/floor/iron/dark, /area/station/science/explab) "hlh" = ( From 0d5cb073af39cc2c9b18023f20444ac8ca28b0af Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sat, 16 Dec 2023 12:48:38 -0700 Subject: [PATCH 09/19] fuck fuck fuck i hate strong not showing power over air pipes --- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 869a0ea5fd53..1e77eff74c6e 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3520,7 +3520,6 @@ /obj/machinery/duct, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "bhK" = ( @@ -61546,7 +61545,6 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /obj/effect/mapping_helpers/airlock/access/all/medical/virology, -/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/medical/pathology) "tMl" = ( @@ -75246,7 +75244,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply, /obj/structure/sign/warning/electric_shock/directional/north, -/obj/structure/cable, /turf/open/floor/iron/white, /area/station/medical/virology) "ygv" = ( From 9a86f177b126d8faad9ec14470e1caa017447bbd Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 17 Dec 2023 00:28:54 -0700 Subject: [PATCH 10/19] delta fix --- _maps/map_files/Deltastation/DeltaStation2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 534a8684c79f..8d0ce8c3ff63 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -41858,7 +41858,7 @@ /obj/effect/mapping_helpers/airlock/unres{ dir = 8 }, -/turf/open/space/basic, +/turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) "kdC" = ( /obj/structure/table/reinforced, From 52ba61707ac5897f38681c5deff794c1b51fca9b Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 17 Dec 2023 15:14:57 -0700 Subject: [PATCH 11/19] Prisoner Cryopods Added some cryopods for prisoners to drop out of the round. --- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 ++++ .../map_files/IceBoxStation/IceBoxStation.dmm | 3 +++ _maps/map_files/MetaStation/MetaStation.dmm | 4 ++++ _maps/map_files/tramstation/tramstation.dmm | 18 ++++++++++++++++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 8d0ce8c3ff63..78ac368216f5 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -90569,6 +90569,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, +/obj/machinery/cryopod{ + dir = 8; + max_integrity = 10000 + }, /turf/open/floor/iron, /area/station/security/prison) "wbb" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 1e77eff74c6e..33910ef47554 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -7451,6 +7451,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/cryopod{ + max_integrity = 10000 + }, /turf/open/floor/iron/dark/textured, /area/station/security/execution/transfer) "cpA" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 961f9a6d6e05..01664a197eaf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -40831,6 +40831,10 @@ dir = 10 }, /obj/machinery/light/directional/south, +/obj/machinery/cryopod{ + dir = 4; + max_integrity = 10000 + }, /turf/open/floor/iron/white, /area/station/security/prison) "oEx" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b0d824e73a0c..fc78d38554ea 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -54377,6 +54377,16 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/lesser) +"qwA" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 5 + }, +/obj/machinery/cryopod{ + dir = 8; + max_integrity = 10000 + }, +/turf/open/floor/iron, +/area/station/security/prison) "qwH" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/wood, @@ -67275,6 +67285,10 @@ "uyJ" = ( /turf/open/floor/iron, /area/station/security/prison/workout) +"uyS" = ( +/obj/machinery/cryopod/prison, +/turf/closed/wall/r_wall, +/area/station/security/prison/shower) "uyX" = ( /obj/item/assembly/signaler, /obj/structure/cable, @@ -97961,7 +97975,7 @@ wFT rZF kDo gvI -wFT +qwA rmm rBz fdr @@ -100024,7 +100038,7 @@ lPU thG vRO vRO -vRO +uyS vRO vRO vRO From 984849076249db1f6642f25ade79167383a9be36 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 17 Dec 2023 18:16:57 -0700 Subject: [PATCH 12/19] centcom C U B E --- _maps/map_files/generic/CentCom.dmm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index bc7867f6b83d..4180df4b30a2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -531,6 +531,12 @@ dir = 4 }, /area/centcom/syndicate_mothership/control) +"bz" = ( +/obj/structure/railing/wood, +/obj/effect/turf_decal/trimline/green/line, +/obj/machinery/composters, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/botany) "bA" = ( /obj/structure/table/reinforced, /obj/item/storage/medkit/regular{ @@ -56281,7 +56287,7 @@ dS dS rd LK -RX +bz WJ WC tv From ba6cdb68cab6d8c951d9ba4533a03b3e97ba61b1 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:03:43 -0700 Subject: [PATCH 13/19] All station: cryo doors now glass --- _maps/map_files/Deltastation/DeltaStation2.dmm | 4 +++- _maps/map_files/IceBoxStation/IceBoxStation.dmm | 3 +-- _maps/map_files/MetaStation/MetaStation.dmm | 14 +++++++++++--- _maps/map_files/tramstation/tramstation.dmm | 3 +-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 78ac368216f5..83fd33460ae2 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -66580,8 +66580,10 @@ /area/station/ai_monitored/aisat/exterior) "qhy" = ( /obj/structure/cable, -/obj/machinery/door/airlock, /obj/effect/landmark/navigate_destination/common/cryogenics, +/obj/machinery/door/airlock/glass{ + name = "Cryogenic Storage" + }, /turf/open/floor/iron/freezer, /area/station/hallway/secondary/exit/departure_lounge) "qhA" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 33910ef47554..7a6e245724ff 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -26139,8 +26139,7 @@ /area/station/service/hydroponics) "iuQ" = ( /obj/structure/cable, -/obj/machinery/door/airlock{ - id_tag = "FitnessShower"; +/obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" }, /obj/effect/landmark/navigate_destination/common/cryogenics, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 01664a197eaf..b6d5d72f7d9b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13166,6 +13166,15 @@ }, /turf/open/floor/wood, /area/station/service/theater) +"eWI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/door/airlock/glass{ + name = "Cryogenic Storage" + }, +/turf/open/floor/plating, +/area/station/maintenance/aft/lesser) "eWO" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -50978,8 +50987,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "sgd" = ( -/obj/machinery/door/airlock{ - id_tag = "FitnessShower"; +/obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" }, /obj/effect/landmark/navigate_destination/common/cryogenics, @@ -97158,7 +97166,7 @@ klu vjk qOs kZk -kZk +eWI kZk kZk kZk diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index fc78d38554ea..0aadad68c6d1 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -20606,8 +20606,7 @@ /area/station/maintenance/central/greater) "fvJ" = ( /obj/effect/landmark/navigate_destination/common/cryogenics, -/obj/machinery/door/airlock{ - id_tag = "FitnessShower"; +/obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" }, /turf/open/floor/iron/freezer, From e57b11c14c430a6f31245c6500539c7507e35587 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:43:53 -0700 Subject: [PATCH 14/19] prisonpod fix all stations --- _maps/map_files/Deltastation/DeltaStation2.dmm | 5 +++++ _maps/map_files/IceBoxStation/IceBoxStation.dmm | 10 +++++++++- _maps/map_files/MetaStation/MetaStation.dmm | 5 +++++ _maps/map_files/tramstation/tramstation.dmm | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 83fd33460ae2..afdbe3922751 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -57581,6 +57581,11 @@ /area/station/medical/virology) "nWw" = ( /mob/living/basic/mouse/gray, +/obj/machinery/computer/cryopod/directional/west{ + pixel_x = -23; + dir = 4; + max_integrity = 10000 + }, /turf/open/floor/iron, /area/station/security/prison) "nWI" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 7a6e245724ff..0d401c89dccb 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -65177,6 +65177,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"uZd" = ( +/obj/machinery/computer/cryopod/directional/west{ + pixel_x = -23; + dir = 4; + max_integrity = 10000 + }, +/turf/open/floor/iron/dark/textured, +/area/station/security/execution/transfer) "uZn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -169163,7 +169171,7 @@ hUz bjp bjp bBn -ryu +uZd kZt ryu dha diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b6d5d72f7d9b..2dfbf0bc557f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -21732,6 +21732,11 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/cryopod/directional/south{ + dir = 1; + pixel_y = -22; + max_integrity = 10000 + }, /turf/open/floor/iron, /area/station/security/prison) "iep" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 0aadad68c6d1..2db63429f39f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -23702,6 +23702,11 @@ c_tag = "Security - Prison Main South-West"; network = list("ss13","Security","prison") }, +/obj/machinery/computer/cryopod/directional/west{ + dir = 4; + pixel_x = -22; + max_integrity = 10000 + }, /turf/open/floor/iron, /area/station/security/prison) "gAY" = ( From 52237406498c76bd7fde9c964c6d753c906fea36 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 18 Dec 2023 12:33:35 -0700 Subject: [PATCH 15/19] no comment --- _maps/map_files/MetaStation/MetaStation.dmm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 2dfbf0bc557f..145f41297d28 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13166,15 +13166,6 @@ }, /turf/open/floor/wood, /area/station/service/theater) -"eWI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/door/airlock/glass{ - name = "Cryogenic Storage" - }, -/turf/open/floor/plating, -/area/station/maintenance/aft/lesser) "eWO" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 1 @@ -97171,7 +97162,7 @@ klu vjk qOs kZk -eWI +kZk kZk kZk kZk From de3a8a6590b478945911bf2fc0bca50dc136d014 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:20:04 -0700 Subject: [PATCH 16/19] missing catwalk and cables more missing stuff fixed. --- _maps/map_files/tramstation/tramstation.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 2db63429f39f..8a9262bc43b1 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -54348,6 +54348,8 @@ /area/station/hallway/primary/tram/center) "qwl" = ( /obj/structure/sign/warning/electric_shock/directional/south, +/obj/structure/lattice/catwalk, +/obj/structure/cable, /turf/open/openspace, /area/station/maintenance/department/medical) "qwq" = ( From 87c04acfc35eb95361523b268fe94de15ba47878 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:41:51 -0700 Subject: [PATCH 17/19] all stations viro to patho Completed conversion of all names from Virology to Pathology. Or at least it should be at this point. --- .../map_files/Deltastation/DeltaStation2.dmm | 24 +++++++++---------- _maps/map_files/MetaStation/MetaStation.dmm | 10 ++++---- _maps/map_files/tramstation/tramstation.dmm | 10 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index afdbe3922751..9089cb557806 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -19502,7 +19502,7 @@ "eJm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - name = "Virology Access" + name = "Pathology Rooms" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33647,7 +33647,7 @@ "ifi" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - name = "Virology Containment Cell" + name = "Pathology Containment Cell" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -54628,7 +54628,7 @@ "nlm" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology{ - name = "Virology Break Room" + name = "Break Room" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59941,13 +59941,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock" + name = "Pathology Exterior Airlock" }, /obj/machinery/door_buttons/access_button{ dir = 1; idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_x = -24; pixel_y = -2; req_access = list("pathology") @@ -62790,12 +62790,12 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock" + name = "Pathology Interior Airlock" }, /obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_y = 22; req_access = list("pathology") }, @@ -68242,7 +68242,7 @@ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Console"; + name = "Pathology Access Console"; pixel_x = 24; pixel_y = -24; req_access = list("pathology") @@ -70626,7 +70626,7 @@ "riB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology{ - name = "Virology Access" + name = "Pathology Access" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -72754,7 +72754,7 @@ "rJQ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - name = "Virology Containment Cell" + name = "Pathology Containment Cell" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -77739,7 +77739,7 @@ "sTV" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology/glass{ - name = "Virology Lab" + name = "Pathology Lab" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -92893,7 +92893,7 @@ "wzO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/virology{ - name = "Virology Access" + name = "Pathology Access" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 145f41297d28..67740ddb830a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5445,12 +5445,12 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock" + name = "Pathology Interior Airlock" }, /obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_x = 8; pixel_y = -24; req_access = list("pathology") @@ -21240,13 +21240,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock" + name = "Pathology Exterior Airlock" }, /obj/machinery/door_buttons/access_button{ dir = 1; idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_y = -24; req_access = list("pathology") }, @@ -23086,7 +23086,7 @@ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Console"; + name = "Pathology Access Console"; pixel_x = 24; pixel_y = -24; req_access = list("pathology") diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8a9262bc43b1..7e5217bd8f61 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -20410,13 +20410,13 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_interior"; - name = "Virology Interior Airlock" + name = "Pathology Interior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door_buttons/access_button{ idDoor = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_y = 24; req_access = list("pathology") }, @@ -23815,7 +23815,7 @@ idExterior = "virology_airlock_exterior"; idInterior = "virology_airlock_interior"; idSelf = "virology_airlock_control"; - name = "Virology Access Console"; + name = "Pathology Access Console"; pixel_x = -24; pixel_y = 24; req_access = list("pathology") @@ -32669,14 +32669,14 @@ autoclose = 0; frequency = 1449; id_tag = "virology_airlock_exterior"; - name = "Virology Exterior Airlock" + name = "Pathology Exterior Airlock" }, /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door_buttons/access_button{ dir = 1; idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; - name = "Virology Access Button"; + name = "Pathology Access Button"; pixel_y = -24; req_access = list("pathology") }, From a34775364df398afd5badbbf7f4963eec8bce29a Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Wed, 20 Dec 2023 08:55:07 -0700 Subject: [PATCH 18/19] typos object default name typos to fix. --- .../code/modules/ghost_players/job_helpers/injured_spawner.dm | 4 ++-- .../code/modules/ghost_players/job_helpers/organ_printer.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm index 41e938a6f523..fbe35d545751 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/injured_spawner.dm @@ -1,6 +1,6 @@ /obj/structure/injured_spawner - name = "injured personell transporter" - desc = "Sends over injured personell from other Centcomm facilities for you to treat." + name = "injured personel transporter" + desc = "Sends over injured personel from other Centcomm facilities for you to treat." resistance_flags = INDESTRUCTIBLE anchored = TRUE diff --git a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm index 53eeed7843e9..4fa2b21fc917 100644 --- a/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm +++ b/monkestation/code/modules/ghost_players/job_helpers/organ_printer.dm @@ -1,5 +1,5 @@ /obj/structure/organ_creator - name = "all in one organic medial fabricator" + name = "all in one organic medical fabricator" desc = "Capable of making all organs and bodyparts needed for practitioners to fix up bodies." From 8a37291caef1342c5bee79c579f48c5e7c5a2348 Mon Sep 17 00:00:00 2001 From: DexeeXI <120314509+DexeeXI@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:25:14 -0700 Subject: [PATCH 19/19] final fix for year --- _maps/map_files/tramstation/tramstation.dmm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 7e5217bd8f61..1b3b2f224278 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -55559,7 +55559,9 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/central) "qPF" = ( -/obj/machinery/mecha_part_fabricator/maint, +/obj/machinery/mecha_part_fabricator/maint{ + dir = 1 + }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/maintenance/starboard/central)