Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] tramstation virology is no longer depowered by a singular guaranteed rat roundstart #617

Merged
merged 1 commit into from
Nov 14, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 90 additions & 90 deletions _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4231,6 +4231,17 @@
/obj/effect/landmark/start/hangover,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"aCM" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"aCR" = (
/obj/effect/turf_decal/tile/blue/half/contrasted,
/obj/effect/turf_decal/tile/neutral{
Expand Down Expand Up @@ -6463,12 +6474,6 @@
},
/turf/open/floor/iron/checker,
/area/station/commons/lounge)
"beZ" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/medical/virology)
"bfa" = (
/obj/effect/turf_decal/trimline/red/filled/line,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
Expand Down Expand Up @@ -9226,15 +9231,6 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"cdi" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Custodial Closet"
},
/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/medical/virology)
"cdr" = (
/obj/effect/turf_decal/trimline/red/filled/line{
dir = 6
Expand Down Expand Up @@ -9760,17 +9756,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
"cnF" = (
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/closet/firecloset,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"cnV" = (
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
Expand Down Expand Up @@ -11035,17 +11020,6 @@
},
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"cJA" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"cJM" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/door/firedoor,
Expand Down Expand Up @@ -13082,6 +13056,17 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/prison)
"duO" = (
/obj/structure/disposalpipe/junction/flip{
dir = 1
},
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
},
/obj/effect/turf_decal/tile/neutral/fourcorners,
/obj/structure/closet/firecloset,
/turf/open/floor/iron/dark,
/area/station/hallway/secondary/exit)
"dvc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -13690,6 +13675,15 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron/white,
/area/station/science/xenobiology)
"dGz" = (
/obj/machinery/door/airlock/maintenance_hatch{
name = "Custodial Closet"
},
/obj/effect/mapping_helpers/airlock/access/all/medical/virology,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
/area/station/medical/virology)
"dGJ" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
Expand Down Expand Up @@ -14676,6 +14670,10 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/service/hydroponics)
"dXH" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/cargo/sorting)
"dXM" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 5
Expand Down Expand Up @@ -20671,13 +20669,6 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/security/brig)
"gob" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"gov" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
Expand All @@ -20690,6 +20681,13 @@
/obj/machinery/light/cold/directional/east,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"goC" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"goK" = (
/obj/machinery/holopad,
/obj/effect/turf_decal/bot/left,
Expand Down Expand Up @@ -21460,10 +21458,6 @@
},
/turf/open/floor/engine,
/area/station/science/auxlab/firing_range)
"gEq" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/cargo/sorting)
"gEs" = (
/obj/machinery/power/terminal{
dir = 1
Expand Down Expand Up @@ -25086,13 +25080,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/office)
"hYq" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"hYK" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/smart/simple/purple/visible,
Expand Down Expand Up @@ -25508,6 +25495,13 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/iron/dark,
/area/station/service/chapel/monastery)
"ifI" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 1
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/hallway/secondary/exit)
"ifN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -30026,6 +30020,18 @@
/obj/structure/cable,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/eva)
"jKb" = (
/obj/machinery/conveyor{
dir = 1;
id = "cargoupperbelt"
},
/obj/structure/plasticflaps,
/obj/structure/disposaloutlet{
dir = 1
},
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"jKg" = (
/obj/effect/turf_decal/trimline/neutral/filled/line,
/obj/machinery/light/directional/south,
Expand Down Expand Up @@ -36495,6 +36501,13 @@
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
/area/station/cargo/lobby)
"lSQ" = (
/obj/structure/disposalpipe/sorting/wrap/flip{
dir = 1
},
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"lTc" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/trimline/blue/filled/line{
Expand Down Expand Up @@ -39737,6 +39750,12 @@
},
/turf/open/floor/iron/dark,
/area/station/medical/break_room)
"neq" = (
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/catwalk_floor,
/area/station/medical/virology)
"net" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/trimline/blue/filled/line{
Expand Down Expand Up @@ -48280,13 +48299,6 @@
/obj/effect/baseturf_helper/space,
/turf/closed/wall/r_wall,
/area/station/engineering/supermatter)
"qip" = (
/obj/structure/disposalpipe/sorting/wrap/flip{
dir = 1
},
/obj/structure/falsewall,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"qiq" = (
/obj/effect/turf_decal/tile/blue/half/contrasted{
dir = 8
Expand Down Expand Up @@ -54096,12 +54108,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/construction/mining/aux_base)
"smD" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"smF" = (
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 8
Expand Down Expand Up @@ -62274,6 +62280,12 @@
},
/turf/open/space/openspace,
/area/station/solars/port)
"uXN" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"uYa" = (
/obj/machinery/skill_station,
/turf/open/floor/iron/grimy,
Expand Down Expand Up @@ -65855,18 +65867,6 @@
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron,
/area/station/security/checkpoint/supply)
"wkO" = (
/obj/machinery/conveyor{
dir = 1;
id = "cargoupperbelt"
},
/obj/structure/plasticflaps,
/obj/structure/disposaloutlet{
dir = 1
},
/obj/structure/disposalpipe/trunk,
/turf/open/floor/plating,
/area/station/cargo/sorting)
"wkQ" = (
/obj/machinery/door/airlock/hatch{
id_tag = "vacant_space";
Expand Down Expand Up @@ -171469,7 +171469,7 @@ wTl
wLl
lQT
ugt
beZ
neq
ugt
uHn
gWV
Expand Down Expand Up @@ -171726,7 +171726,7 @@ ugt
fsN
ugt
ugt
cdi
dGz
ugt
qjF
rkd
Expand Down Expand Up @@ -185052,7 +185052,7 @@ pRM
pRM
pRM
oWq
cJA
aCM
vPB
uCO
fZS
Expand Down Expand Up @@ -185305,12 +185305,12 @@ pRM
skX
fpU
fpU
wkO
gEq
smD
qip
cnF
gob
jKb
dXH
uXN
lSQ
duO
goC
wxb
fZS
bMb
Expand Down Expand Up @@ -185567,7 +185567,7 @@ uno
uno
uno
lCy
hYq
ifI
uCO
aDK
bMb
Expand Down
Loading