Merge pull request #70 from Aurorastation/map_fix_collection_07

Map fix collection 07
This commit is contained in:
Alberyk
2022-03-08 11:51:55 -03:00
committed by GitHub
9 changed files with 858 additions and 275 deletions
+1
View File
@@ -0,0 +1 @@
#define DEFAULT_MAP "sccv_horizon"
+2 -2
View File
@@ -190,9 +190,9 @@
alpha = 255
switch(dir)
if(SOUTH || NORTH)
if(SOUTH, NORTH)
initialize_directions = SOUTH|NORTH
if(EAST || WEST)
if(EAST, WEST)
initialize_directions = EAST|WEST
if(NORTHEAST)
initialize_directions = NORTH|EAST
@@ -8,8 +8,8 @@
/datum/evacuation_controller/starship
name = "escape pod controller"
transfer_prep_additional_delay = 5 MINUTES
autotransfer_prep_additional_delay = 5 MINUTES
transfer_prep_additional_delay = 0 MINUTES
autotransfer_prep_additional_delay = 0 MINUTES
emergency_prep_additional_delay = 0 MINUTES
evacuation_options = list(
@@ -72,6 +72,8 @@
var/boot_time = 35
var/next_on
var/blockage
var/exhaust_offset = 1 // for engines that are longer
var/exhaust_width = 1 //for engines that are wider
/obj/machinery/atmospherics/unary/engine/scc_ship_engine
name = "ship thruster"
@@ -79,6 +81,7 @@
icon_state = "engine_0"
opacity = FALSE
pixel_x = -64
exhaust_offset = 3
/obj/machinery/atmospherics/unary/engine/scc_ship_engine/check_blockage()
return 0
@@ -158,7 +161,9 @@
/obj/machinery/atmospherics/unary/engine/proc/check_blockage()
blockage = FALSE
var/exhaust_dir = reverse_direction(dir)
var/turf/A = get_step(src, exhaust_dir)
var/turf/A = get_turf(src)
for(var/i in 1 to exhaust_offset)
A = get_step(A, exhaust_dir)
var/turf/B = A
while(isturf(A) && !(isspace(A) || isopenspace(A)))
if((B.c_airblock(A)) & AIR_BLOCKED)
@@ -185,7 +190,9 @@
network.update = 1
var/exhaust_dir = reverse_direction(dir)
var/turf/T = get_step(src,exhaust_dir)
var/turf/T = get_turf(src)
for(var/i in 1 to exhaust_offset)
T = get_step(T, exhaust_dir)
if(T)
T.assume_air(removed)
new/obj/effect/engine_exhaust(T, exhaust_dir, air_contents.check_combustability() && air_contents.temperature >= PHORON_MINIMUM_BURN_TEMPERATURE)
-5
View File
@@ -141,8 +141,3 @@
/obj/machinery/power/breakerbox/activated
icon_state = "bbox_on"
// Enabled on server startup. Used in substations to keep them in bypass mode.
/obj/machinery/power/breakerbox/activated/Initialize()
. = ..()
set_state(1)
@@ -15,9 +15,11 @@
,/area/supply/dock
,/area/turbolift
,/area/mine
,/area/horizonexterior
)
ut_apc_exempt_areas = list(/area/construction
,/area/medical/genetics
,/area/horizonexterior
)
ut_atmos_exempt_areas = list(/area/maintenance
,/area/storage
@@ -33,4 +35,22 @@
,/area/bridge/selfdestruct
,/area/medical/cryo
,/area/medical/patient_c
,/area/turret_protected/ai
,/area/engineering/engine_monitoring/tesla
,/area/engineering/smes
,/area/horizonexterior
,/area/tcommsat/mainlvl_tcomms__relay
,/area/tcommsat/mainlvl_tcomms__relay/second
,/area/medical/surgery
,/area/rnd/isolation_a
,/area/rnd/isolation_b
,/area/rnd/isolation_c
)
/datum/unit_test/zas_area_test
name = "ZAS: Operations Bay"
area_path = /area/operations/storage
/datum/unit_test/zas_area_test/arrival_maint
name = "ZAS: Arrival Maintenance"
area_path = /area/maintenance/arrivals
+168 -87
View File
@@ -1611,6 +1611,9 @@
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 10
},
/obj/structure/cable/green{
icon_state = "1-8"
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"bwN" = (
@@ -1622,6 +1625,19 @@
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"bxo" = (
/obj/structure/lattice/catwalk/indoor,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"bxJ" = (
/obj/machinery/atmospherics/unary/engine/scc_ship_engine,
/turf/simulated/floor/reinforced{
@@ -2106,7 +2122,7 @@
dir = 9;
id = "QMLoad";
layer = 2.9;
reversed = 1
reversed = null
},
/turf/simulated/floor/plating,
/area/operations/loading)
@@ -2716,9 +2732,13 @@
/obj/effect/floor_decal/corner_wide/purple{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
"cAq" = (
@@ -3714,6 +3734,15 @@
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
"dxv" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/hangar/control)
"dzg" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/binary/pump/high_power{
@@ -4327,17 +4356,13 @@
/obj/effect/floor_decal/corner_wide/purple{
dir = 9
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/camera/network/research{
c_tag = "Research - Xenoarcheology 3";
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
"edO" = (
@@ -4376,6 +4401,19 @@
},
/turf/simulated/floor/tiled,
/area/hangar/operations)
"eev" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/plating,
/area/hangar/control)
"eeD" = (
/obj/machinery/vending/wallmed1{
pixel_x = -1;
@@ -4472,10 +4510,10 @@
/obj/machinery/power/smes/buildable{
RCon_tag = "Substation - Engineering Lower Deck"
},
/obj/structure/cable/green,
/obj/structure/cable{
icon_state = "0-2"
},
/obj/structure/cable/green,
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering/lower)
"ekm" = (
@@ -4749,15 +4787,15 @@
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/intrepid)
"exw" = (
@@ -5921,7 +5959,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible/red,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"fpp" = (
@@ -6085,8 +6122,16 @@
/turf/simulated/floor/tiled/dark,
/area/engineering/atmos/propulsion/starboard)
"fwA" = (
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_y = 24
},
/obj/structure/cable/green{
icon_state = "4-8"
icon_state = "0-4"
},
/obj/structure/cable/green{
icon_state = "0-8"
},
/turf/simulated/floor/plating,
/area/maintenance/substation/engineering/lower)
@@ -6538,7 +6583,6 @@
/obj/structure/tank_wall/carbon_dioxide{
icon_state = "co2-3"
},
/obj/machinery/atmospherics/pipe/simple/visible/black,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"fRj" = (
@@ -7437,6 +7481,12 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/maintenance/wing/port/deck1)
"gBo" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"gBw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -8636,11 +8686,23 @@
/turf/simulated/floor/plating,
/area/maintenance/research_port)
"hIx" = (
/obj/structure/lattice,
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/visible/black,
/turf/space/dynamic,
/area/template_noop)
/obj/effect/floor_decal/corner_wide/purple{
dir = 8
},
/obj/effect/floor_decal/corner_wide/purple{
dir = 6
},
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/white,
/area/rnd/xenoarch_atrium)
"hII" = (
/obj/effect/floor_decal/corner/brown/full{
dir = 1
@@ -8833,6 +8895,18 @@
},
/turf/simulated/floor/tiled/dark,
/area/hangar/control)
"hTd" = (
/obj/machinery/power/apc/super{
dir = 4;
name = "east bump";
pixel_x = 24
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"hTk" = (
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/maintenance/wing/port/deck1)
@@ -9220,7 +9294,7 @@
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -9546,6 +9620,15 @@
},
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
"iCI" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/hangar/control)
"iCX" = (
/obj/machinery/atmospherics/pipe/simple/visible/black{
dir = 5
@@ -10440,7 +10523,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible/red,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"jvF" = (
@@ -11741,9 +11823,16 @@
/turf/simulated/floor/wood,
/area/shuttle/intrepid)
"kEk" = (
/obj/machinery/atmospherics/valve,
/turf/space/dynamic,
/area/template_noop)
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/ramp/bottom{
dir = 4
},
/area/rnd/xenoarch_atrium)
"kEt" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -14644,6 +14733,9 @@
c_tag = "Engineering - Atmospherics Tanks 3";
dir = 4
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"nkm" = (
@@ -15524,9 +15616,6 @@
/turf/simulated/floor/plating,
/area/rnd/xenoarch_atrium)
"oam" = (
/obj/structure/lattice,
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/space/dynamic,
/area/template_noop)
"oap" = (
@@ -17514,6 +17603,12 @@
/area/rnd/xenoarch_atrium)
"qbu" = (
/obj/machinery/hologram/holopad,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_atrium)
"qbC" = (
@@ -20374,18 +20469,14 @@
/turf/simulated/floor/carpet/rubber,
/area/rnd/xenoarch_atrium)
"sFA" = (
/obj/structure/cable/green{
icon_state = "4-8"
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled,
/area/hangar/operations)
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_atrium)
"sHa" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -20694,12 +20785,6 @@
"sTw" = (
/turf/simulated/floor/plating,
/area/maintenance/wing/port/deck1)
"sTX" = (
/obj/structure/lattice,
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/visible/red,
/turf/space/dynamic,
/area/template_noop)
"sUS" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
@@ -21373,15 +21458,15 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/intrepid)
"tEc" = (
@@ -22047,9 +22132,6 @@
/obj/structure/cable/green{
icon_state = "0-2"
},
/obj/structure/cable/green{
icon_state = "0-2"
},
/obj/effect/floor_decal/corner_wide/purple/full{
dir = 1
},
@@ -22678,7 +22760,6 @@
dir = 1
},
/obj/structure/tank_wall/carbon_dioxide,
/obj/machinery/atmospherics/pipe/simple/visible/black,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"uKW" = (
@@ -23189,6 +23270,9 @@
c_tag = "Engineering - Atmospherics Tanks 5";
dir = 8
},
/obj/structure/cable/green{
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/engineering/atmos/air)
"vjl" = (
@@ -23894,22 +23978,15 @@
/turf/simulated/floor/tiled/dark,
/area/shuttle/mining)
"vSF" = (
/obj/effect/floor_decal/corner_wide/purple{
dir = 8
},
/obj/effect/floor_decal/corner_wide/purple{
dir = 6
},
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/white,
/turf/simulated/floor/tiled/ramp/bottom{
dir = 8
},
/area/rnd/xenoarch_atrium)
"vSS" = (
/obj/machinery/light{
@@ -24363,7 +24440,6 @@
/obj/structure/tank_wall/phoron{
icon_state = "ph3"
},
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"wnQ" = (
@@ -24926,6 +25002,12 @@
/area/template_noop)
"wUz" = (
/obj/item/device/radio/beacon,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/rnd/xenoarch_atrium)
"wUM" = (
@@ -25569,15 +25651,15 @@
/obj/effect/floor_decal/corner/blue{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/shuttle/intrepid)
"xpX" = (
@@ -26007,7 +26089,6 @@
dir = 1
},
/obj/structure/tank_wall/phoron,
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/simulated/floor/airless,
/area/engineering/atmos)
"xJE" = (
@@ -43333,7 +43414,7 @@ qvl
qvl
lyo
oOk
sFA
vTJ
kVu
nWF
nWF
@@ -45910,8 +45991,8 @@ eSV
eSV
eSV
eSV
sTX
kEk
sPo
oam
jvE
lPP
xHW
@@ -46314,8 +46395,8 @@ eSV
eSV
eSV
eSV
sTX
kEk
sPo
oam
foN
htn
nnh
@@ -47122,8 +47203,8 @@ eSV
eSV
eSV
eSV
sPo
oam
kEk
xJv
ebN
sEE
@@ -47526,8 +47607,8 @@ eSV
eSV
eSV
eSV
sPo
oam
kEk
wnz
bGf
enn
@@ -48334,8 +48415,8 @@ eSV
eSV
eSV
eSV
hIx
kEk
sPo
oam
uKu
vuB
jpI
@@ -48738,8 +48819,8 @@ eSV
eSV
eSV
eSV
hIx
kEk
sPo
oam
fQZ
wdX
onN
@@ -49597,7 +49678,7 @@ lKY
cBF
aWP
vai
ttK
dxv
ttK
hTa
vJe
@@ -49799,7 +49880,7 @@ tYN
qgi
gnn
pYu
tKi
eev
tKi
tKi
fZX
@@ -49961,7 +50042,7 @@ bZU
oWe
twQ
fnL
lIE
bxo
bvb
lIE
coo
@@ -50001,7 +50082,7 @@ xgP
weO
aWP
rEl
aUg
iCI
aUg
wSd
vcp
@@ -50163,7 +50244,7 @@ mDH
nrY
itD
uVL
lUr
gBo
aom
lUr
bZp
@@ -51379,7 +51460,7 @@ lUr
lUr
qJg
lUr
lUr
hTd
viX
bvN
uEJ
@@ -53419,8 +53500,8 @@ cWo
tlU
tlU
pau
vSF
pau
hIx
tlU
tlU
tLq
@@ -53622,7 +53703,7 @@ qbk
lBH
qYo
wAk
wAk
kEk
wVW
uPk
nwQ
@@ -53824,7 +53905,7 @@ uyc
kFL
jrJ
jrJ
jrJ
sFA
jrJ
hSX
mwu
@@ -54430,7 +54511,7 @@ hGT
jrJ
jrJ
jrJ
jrJ
sFA
jrJ
jrJ
hfA
@@ -54632,7 +54713,7 @@ lrC
hVe
ufi
wtV
wtV
vSF
jGW
nkm
sad
File diff suppressed because it is too large Load Diff
+172 -28
View File
@@ -775,6 +775,7 @@
"bH" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"bI" = (
@@ -1395,6 +1396,22 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge/selfdestruct)
"de" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/junction{
dir = 8;
icon_state = "pipe-j2"
},
/turf/simulated/floor/tiled,
/area/hallway/primary/starboard)
"df" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -2844,10 +2861,20 @@
"gx" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
density = 0;
dir = 4;
icon_state = "pdoor0";
id = "bridge blast";
name = "Bridge Blast Doors";
opacity = 0
},
/turf/simulated/floor,
/area/crew_quarters/captain)
"gy" = (
/obj/machinery/atmospherics/unary/freezer{
dir = 8;
icon_state = "freezer_1";
set_temperature = 73;
use_power = 1
@@ -3321,6 +3348,25 @@
},
/turf/simulated/floor/tiled/dark,
/area/hallway/primary/starboard)
"hC" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/paleblue{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
pixel_x = -24
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/structure/cable/green,
/turf/simulated/floor/tiled,
/area/hallway/primary/port)
"hE" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -3407,6 +3453,18 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"hQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"hR" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -3455,7 +3513,7 @@
"hV" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 4
dir = 9
},
/turf/simulated/floor,
/area/tcommsat/entrance)
@@ -3522,9 +3580,6 @@
name = "Security - Investigations Office"
})
"ib" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -3534,6 +3589,7 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"ic" = (
@@ -5303,6 +5359,14 @@
/obj/effect/floor_decal/spline/plain{
dir = 5
},
/obj/machinery/requests_console{
department = "Bridge";
pixel_y = 32
},
/obj/item/device/radio/intercom/department{
dir = 8;
pixel_x = 24
},
/turf/simulated/floor/carpet/rubber,
/area/bridge)
"mw" = (
@@ -6902,6 +6966,25 @@
},
/turf/simulated/floor/tiled/dark,
/area/bridge)
"qb" = (
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/cable{
icon_state = "1-8"
},
/turf/simulated/floor,
/area/maintenance/bridge)
"qc" = (
/obj/effect/floor_decal/corner_wide/green{
dir = 10
@@ -7092,6 +7175,7 @@
"qy" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"qB" = (
@@ -7633,6 +7717,7 @@
/obj/effect/landmark{
name = "JoinLateCryo"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"rL" = (
@@ -9587,6 +9672,19 @@
/obj/structure/closet/secure_closet/xo,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
"wU" = (
/obj/structure/railing/mapped,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/low{
dir = 8;
name = "west bump";
pixel_x = -24
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/simulated/floor,
/area/maintenance/bridge)
"wV" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet,
@@ -9903,6 +10001,10 @@
name = "Station Intercom (General)";
pixel_y = -24
},
/obj/machinery/disposal/small/north,
/obj/structure/disposalpipe/trunk{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"xL" = (
@@ -10134,6 +10236,15 @@
},
/turf/simulated/floor/carpet,
/area/crew_quarters/lounge)
"yq" = (
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"yr" = (
/obj/machinery/firealarm/west,
/turf/simulated/floor/wood,
@@ -13114,6 +13225,10 @@
},
/turf/simulated/floor/tiled,
/area/hallway/primary/port)
"Gq" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/carpet/rubber,
/area/bridge)
"Gr" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 9
@@ -14258,6 +14373,16 @@
},
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"IV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1;
external_pressure_bound = 102;
external_pressure_bound_default = 102;
icon_state = "map_vent_in";
pump_direction = 0
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"IW" = (
/obj/machinery/requests_console{
department = "Engineering";
@@ -14543,11 +14668,10 @@
/turf/simulated/floor/tiled/dark,
/area/hallway/primary/starboard)
"JC" = (
/obj/structure/table/rack,
/obj/random/arcade,
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/structure/closet/emcloset,
/turf/simulated/floor/tiled/dark,
/area/maintenance/aux_atmospherics/deck_3)
"JD" = (
@@ -15100,6 +15224,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"KW" = (
@@ -15559,6 +15684,16 @@
},
/turf/simulated/open,
/area/hallway/primary/starboard)
"LW" = (
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/corner/paleblue{
dir = 10
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
/area/hallway/primary/starboard)
"LY" = (
/obj/structure/railing/mapped{
dir = 1
@@ -15840,6 +15975,7 @@
/obj/effect/landmark{
name = "JoinLate"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"MJ" = (
@@ -17044,6 +17180,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
},
/obj/item/storage/bag/inflatable,
/turf/simulated/floor,
/area/maintenance/aux_atmospherics/deck_3)
"Pw" = (
@@ -17648,7 +17785,6 @@
"QI" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
/obj/machinery/door/firedoor,
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/maintenance/aux_atmospherics/deck_3)
"QJ" = (
@@ -17905,6 +18041,11 @@
},
/turf/simulated/floor/tiled/dark,
/area/crew_quarters/locker)
"Ru" = (
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/white,
/area/crew_quarters/sleep/cryo)
"Rv" = (
/obj/structure/cable/green{
icon_state = "2-4"
@@ -18469,6 +18610,7 @@
/obj/machinery/door/firedoor/multi_tile{
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/crew_quarters/sleep/cryo)
"SX" = (
@@ -19166,6 +19308,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/random/soap,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/toilet)
"UJ" = (
@@ -19369,10 +19512,10 @@
/area/security/vacantoffice2)
"Vl" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/light/small/emergency,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
"Vm" = (
@@ -19710,6 +19853,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/random/soap,
/turf/simulated/floor/tiled/freezer,
/area/crew_quarters/toilet)
"We" = (
@@ -36945,8 +37089,8 @@ CX
km
Um
nZ
DW
Ny
hQ
IV
Ny
Ny
Ec
@@ -37151,7 +37295,7 @@ DW
yz
yz
yz
Ec
yq
Da
eX
jM
@@ -39581,10 +39725,10 @@ Ye
Ye
Ye
co
Lg
iY
de
LW
SW
sT
Ru
qy
bH
KU
@@ -40004,8 +40148,8 @@ dg
mY
SK
cq
pl
yV
wU
qb
VC
VC
VC
@@ -41644,7 +41788,7 @@ SH
Fn
US
Xe
Oo
Gq
AQ
Hg
FQ
@@ -43802,7 +43946,7 @@ at
at
at
em
Fq
EG
DQ
DQ
DQ
@@ -44004,7 +44148,7 @@ at
at
at
aK
Fq
EG
DQ
EZ
oG
@@ -44206,7 +44350,7 @@ at
at
at
aK
Fq
EG
DQ
Nf
Bs
@@ -44408,7 +44552,7 @@ at
at
at
aK
Fq
EG
DQ
Nd
Xr
@@ -44423,7 +44567,7 @@ Fr
Ss
Sj
ck
Sj
hC
fi
hg
Sj
@@ -44610,7 +44754,7 @@ at
at
at
em
Fq
EG
DQ
Rb
CR
@@ -44812,7 +44956,7 @@ at
at
at
em
Fq
EG
DQ
Fx
CR
@@ -45216,7 +45360,7 @@ at
at
at
em
Fq
EG
DQ
CJ
CR
@@ -45418,7 +45562,7 @@ at
at
at
em
Fq
EG
DQ
DQ
DQ