Skip to content

Commit

Permalink
Merge branch 'Test_PT_monitor' of https://github.com/VentelR/Paradise…
Browse files Browse the repository at this point in the history
…-SS220-localdummy into Test_PT_monitor
  • Loading branch information
VentelR committed Apr 14, 2024
2 parents e047f2c + 35146c2 commit e430274
Showing 1 changed file with 55 additions and 27 deletions.
82 changes: 55 additions & 27 deletions _maps/map_files220/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -44827,7 +44827,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"dvY" = (
/obj/effect/decal/cleanable/fungus,
Expand Down Expand Up @@ -49891,7 +49891,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"fpO" = (
/obj/effect/landmark/spawner/nukedisc_respawn,
Expand Down Expand Up @@ -50824,7 +50824,7 @@
/area/station/command/office/ntrep)
"fET" = (
/obj/machinery/light/small/directional/west,
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"fFz" = (
/obj/structure/cable{
Expand Down Expand Up @@ -51132,7 +51132,11 @@
/obj/machinery/atmospherics/unary/vent_pump/siphon/on{
dir = 4
},
/turf/simulated/floor/bluegrid,
/turf/simulated/floor/bluegrid{
nitrogen = 100;
oxygen = 0;
temperature = 80
},
/area/station/science/xenobiology)
"fMc" = (
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -61833,7 +61837,7 @@
dir = 1;
network = list("Research","SS13")
},
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"jIM" = (
/obj/machinery/door/airlock/public/glass{
Expand Down Expand Up @@ -62152,10 +62156,10 @@
},
/area/station/maintenance/apmaint)
"jPb" = (
/obj/machinery/atmospherics/unary/thermomachine/freezer/on/coldroom{
/obj/machinery/ai_status_display/east,
/obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{
dir = 1
},
/obj/machinery/ai_status_display/east,
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"jPi" = (
Expand Down Expand Up @@ -63122,10 +63126,10 @@
"kiq" = (
/obj/machinery/light_switch/south,
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/portable/canister/air,
/obj/machinery/atmospherics/unary/portables_connector{
dir = 1
},
/obj/machinery/atmospherics/portable/canister/air,
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"kiu" = (
Expand Down Expand Up @@ -72808,7 +72812,7 @@
/area/station/engineering/supermatter_room)
"nIF" = (
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"nIM" = (
/obj/structure/cable{
Expand Down Expand Up @@ -81519,7 +81523,11 @@
"qKZ" = (
/obj/effect/landmark/spawner/rev,
/obj/machinery/atmospherics/pipe/manifold/hidden,
/turf/simulated/floor/bluegrid,
/turf/simulated/floor/bluegrid{
nitrogen = 100;
oxygen = 0;
temperature = 80
},
/area/station/science/xenobiology)
"qLc" = (
/obj/item/kirbyplants,
Expand Down Expand Up @@ -86366,6 +86374,19 @@
/obj/effect/spawner/lootdrop/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"sCY" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
"sDk" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
Expand Down Expand Up @@ -89599,7 +89620,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/engine,
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"tMP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
Expand Down Expand Up @@ -89840,7 +89861,11 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/bluegrid,
/turf/simulated/floor/bluegrid{
nitrogen = 100;
oxygen = 0;
temperature = 80
},
/area/station/science/xenobiology)
"tQJ" = (
/obj/structure/cable{
Expand Down Expand Up @@ -95046,12 +95071,7 @@
/turf/simulated/floor/carpet/black,
/area/station/maintenance/fsmaint)
"vIW" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"vJc" = (
/obj/structure/closet/secure_closet/mime,
Expand Down Expand Up @@ -97656,7 +97676,7 @@
/obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio{
dir = 1
},
/turf/simulated/floor/plasteel,
/turf/simulated/floor/engine,
/area/station/science/xenobiology)
"wIv" = (
/obj/structure/table,
Expand Down Expand Up @@ -98226,6 +98246,14 @@
/obj/effect/spawner/random_spawners/fungus_probably,
/turf/simulated/wall,
/area/station/maintenance/fpmaint2)
"wTO" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
},
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
/area/station/science/xenobiology)
"wUT" = (
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
Expand Down Expand Up @@ -148039,12 +148067,12 @@ cZy
nqa
rjK
cEH
vIW
wTO
kiq
cBR
cJK
vIW
fET
cJK
vIW
ecZ
kMc
uAg
Expand Down Expand Up @@ -148296,12 +148324,12 @@ bER
oLS
fYu
jXI
cNh
sCY
oDE
eBF
fpG
fMb
cJK
vIW
oJr
cQC
fyM
Expand Down Expand Up @@ -148815,7 +148843,7 @@ hOz
eBF
dvM
tQn
cJK
vIW
oJr
sFy
fyM
Expand Down Expand Up @@ -149070,9 +149098,9 @@ oto
tPD
jPb
cBR
cJK
vIW
nIF
cJK
vIW
ecZ
bUx
ayQ
Expand Down

0 comments on commit e430274

Please sign in to comment.