cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11696 from Markolie/shuttlechairs

Browse Source 
Add shuttle chairs (and fix newlines on all maps)
This commit is contained in:
variableundefined
2019-08-11 16:32:14 +08:00
committed by GitHub
parent 442ec9cc2b 2ae1fc7ac2
commit 9eff8a8663
46 changed files with 1677 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/Delta/delta.dmm
+205 -200
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+163 -158
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/MetaStation/z2.dmm
+25 -32
View File
@@ -1771,13 +1771,6 @@
/obj/structure/grille,
/turf/simulated/shuttle/plating,
/area/centcom/evac)
"eP" = (
/obj/structure/chair{
dir = 4;
name = "Prosecution"
},
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"eQ" = (
/obj/structure/closet/secure_closet/cargotech,
/turf/unsimulated/floor{
@@ -5049,27 +5042,27 @@
},
/area/tdome/tdomeobserve)
"nK" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/small{
tag = "icon-bulb1 (EAST)";
icon_state = "bulb1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"nL" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light/small{
tag = "icon-bulb1 (WEST)";
icon_state = "bulb1";
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -6113,7 +6106,7 @@
/turf/space,
/area/shuttle/escape_pod5/centcom)
"xF" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -6121,7 +6114,7 @@
},
/area/centcom/evac)
"xG" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -6129,7 +6122,7 @@
},
/area/centcom/evac)
"xW" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -6139,13 +6132,13 @@
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"yd" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"yf" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"yg" = (
@@ -6160,12 +6153,6 @@
icon_state = "floor4"
},
/area/shuttle/escape)
"yl" = (
/obj/structure/chair/sofa/corner,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/escape)
"ym" = (
/obj/structure/chair/office/dark,
/turf/unsimulated/floor{
@@ -6265,25 +6252,25 @@
/turf/unsimulated/ai_visible,
/area/ai_multicam_room)
"EE" = (
/obj/structure/chair{
/obj/machinery/light/small,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/small,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"Fz" = (
/obj/structure/chair,
/obj/machinery/light/small{
dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"FV" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -6291,13 +6278,19 @@
},
/area/shuttle/assault_pod)
"FW" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"Gw" = (
/obj/structure/chair/sofa/left,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/escape)
"HX" = (
/turf/unsimulated/ai_visible,
/area/ai_multicam_room)
@@ -27558,7 +27551,7 @@ fe
fd
fG
eh
eP
xW
fd
fT
fC
@@ -47108,7 +47101,7 @@ ab
ab
ab
fi
yk
Gw
jE
jE
jE
@@ -47365,7 +47358,7 @@ ab
ab
ab
fi
yl
jE
jE
jE
jE
_maps/map_files/MetaStation/z4.dmm
+13 -13
View File
@@ -4864,8 +4864,8 @@
/area/derelict/se_solar)
"nv" = (
/obj/structure/cable,
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nw" = (
/obj/structure/grille,
@@ -4900,8 +4900,8 @@
icon_state = "0-2";
d2 = 2
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nB" = (
/obj/structure/cable{
@@ -4921,8 +4921,8 @@
icon_state = "1-2";
pixel_y = 0
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nD" = (
/obj/structure/cable{
@@ -4956,8 +4956,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nG" = (
/obj/structure/cable{
@@ -4970,8 +4970,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nH" = (
/obj/structure/cable{
@@ -4979,8 +4979,8 @@
d2 = 8;
icon_state = "4-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nI" = (
/obj/structure/cable{
@@ -4999,8 +4999,8 @@
icon_state = "1-2";
pixel_y = 0
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nJ" = (
/obj/structure/cable{
@@ -5013,8 +5013,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nK" = (
/obj/structure/cable{
@@ -5032,13 +5032,13 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"nL" = (
/obj/item/stack/cable_coil/cut,
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
"nM" = (
/turf/simulated/floor/plating/airless{
@@ -5120,8 +5120,8 @@
/turf/simulated/wall/r_wall,
/area/derelict/se_solar)
"oa" = (
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"ob" = (
/obj/machinery/door/airlock/external{
@@ -5156,8 +5156,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"og" = (
/obj/structure/closet/emcloset,
@@ -5185,8 +5185,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/solar/derelict_aft)
"ok" = (
/obj/effect/landmark/damageturf,
_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+1 -1
View File
@@ -162,7 +162,7 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/powered)
"I" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/mineral/titanium/blue,
_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+8 -12
View File
@@ -25,16 +25,16 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"i" = (
/obj/structure/chair,
/obj/structure/window/reinforced{
tag = "icon-rwindow (WEST)";
icon_state = "rwindow";
dir = 8
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"j" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"k" = (
@@ -54,9 +54,7 @@
/turf/simulated/floor/plating/airless,
/area/ruin/unpowered)
"n" = (
/obj/structure/chair{
tag = "icon-chair (WEST)";
icon_state = "chair";
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plating/airless,
@@ -71,26 +69,24 @@
/area/ruin/unpowered)
"q" = (
/obj/item/shard,
/obj/structure/chair{
tag = "icon-chair (WEST)";
icon_state = "chair";
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"r" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/window/reinforced{
tag = "icon-rwindow (WEST)";
icon_state = "rwindow";
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/unpowered)
"s" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/plating/airless,
_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+2 -2
View File
@@ -155,7 +155,7 @@
},
/area/ruin/powered)
"v" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -205,7 +205,7 @@
},
/area/ruin/powered)
"B" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
tag = "icon-floor5";
icon_state = "floor5"
_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+1 -3
View File
@@ -56,9 +56,7 @@
/turf/simulated/shuttle/floor,
/area/ruin/powered)
"m" = (
/obj/structure/chair/office/dark{
tag = "icon-officechair_dark (NORTH)";
icon_state = "officechair_dark";
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+12 -12
View File
@@ -781,8 +781,8 @@
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/deltacorridor)
"ck" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"cl" = (
/obj/structure/transit_tube/station/reverse,
@@ -1819,8 +1819,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"eL" = (
/obj/machinery/light{
@@ -3002,8 +3002,8 @@
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"hg" = (
/obj/effect/decal/cleanable/dirt,
@@ -3130,8 +3130,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"ht" = (
/obj/structure/cable{
@@ -3310,8 +3310,8 @@
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"hK" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -3722,8 +3722,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"iC" = (
/obj/structure/cable{
@@ -3831,8 +3831,8 @@
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating,
/area/template_noop)
"iP" = (
/obj/structure/cable/yellow{
@@ -3840,8 +3840,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plating,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating,
/area/template_noop)
"iQ" = (
/obj/machinery/light/small,
@@ -4135,8 +4135,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"jx" = (
/obj/effect/decal/cleanable/cobweb,
@@ -4488,8 +4488,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/template_noop)
"km" = (
/obj/structure/cable{
@@ -4584,8 +4584,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating,
/area/template_noop)
"kw" = (
/obj/machinery/atmospherics/unary/vent_pump{
@@ -4816,8 +4816,8 @@
/turf/simulated/floor/plating,
/area/ruin/space/ancientstation/deltacorridor)
"kZ" = (
/turf/simulated/floor/plating,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating,
/area/template_noop)
"la" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+1 -1
View File
@@ -64,7 +64,7 @@
},
/area/ruin/powered)
"ao" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+2 -2
View File
@@ -55,7 +55,7 @@
},
/area/ruin/unpowered)
"aj" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/wood,
@@ -314,7 +314,7 @@
},
/area/ruin/unpowered)
"bb" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
_maps/map_files/RandomZLevels/academy.dmm
+12 -4
View File
@@ -36,7 +36,7 @@
/turf/simulated/floor/carpet,
/area/awaymission/academy/headmaster)
"ai" = (
/obj/structure/chair/office/light{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/carpet,
@@ -152,7 +152,9 @@
/turf/simulated/floor/carpet,
/area/awaymission/academy/headmaster)
"ax" = (
/obj/structure/chair/stool,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/carpet,
/area/awaymission/academy/headmaster)
"ay" = (
@@ -4558,6 +4560,12 @@
},
/turf/simulated/floor/plating,
/area/awaymission/academy/academygate)
"vq" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/carpet,
/area/awaymission/academy/headmaster)
(1,1,1) = {"
aa
@@ -13944,9 +13952,9 @@ ab
aj
ao
au
ax
vq
ah
ax
vq
ah
ah
ah
_maps/map_files/RandomZLevels/beach.dmm
+5 -5
View File
@@ -1265,7 +1265,7 @@
icon_state = "tube1";
dir = 8
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -1275,7 +1275,7 @@
dir = 4;
icon_state = "tube1"
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -1323,7 +1323,7 @@
},
/area/awaymission/beach)
"dZ" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -1336,7 +1336,7 @@
},
/area/awaymission/beach)
"eb" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -1371,7 +1371,7 @@
/turf/simulated/shuttle/floor,
/area/awaymission/beach)
"ei" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+1 -1
View File
@@ -1934,7 +1934,7 @@
/turf/simulated/floor/plating,
/area/awaymission/BMPship/Aft)
"eV" = (
/obj/structure/chair/office{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel{
_maps/map_files/RandomZLevels/centcomAway.dmm
+28 -23
View File
@@ -1059,8 +1059,8 @@
pixel_x = 0;
tag = ""
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/awaymission/centcomAway/maint)
"cO" = (
/obj/structure/cable{
@@ -1082,8 +1082,8 @@
pixel_x = 0;
tag = ""
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/awaymission/centcomAway/maint)
"cP" = (
/obj/structure/table/reinforced,
@@ -1105,7 +1105,7 @@
},
/area/awaymission/centcomAway/hangar)
"cS" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -1166,7 +1166,7 @@
},
/area/awaymission/centcomAway/cafe)
"da" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -1215,7 +1215,7 @@
},
/area/awaymission/centcomAway/hangar)
"dg" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -1310,13 +1310,13 @@
},
/area/awaymission/centcomAway/hangar)
"dr" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light{
icon_state = "tube1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
"ds" = (
@@ -1551,8 +1551,8 @@
pixel_x = 0;
tag = ""
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/awaymission/centcomAway/maint)
"dV" = (
/obj/structure/closet/crate,
@@ -1646,8 +1646,8 @@
pixel_y = 0;
tag = ""
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/awaymission/centcomAway/maint)
"ei" = (
/obj/structure/table,
@@ -1694,8 +1694,8 @@
"eo" = (
/obj/structure/cable,
/obj/machinery/power/tracker,
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/awaymission/centcomAway/maint)
"ep" = (
/obj/structure/table,
@@ -1972,7 +1972,7 @@
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
"fc" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
"fd" = (
@@ -2368,13 +2368,6 @@
dir = 5
},
/area/awaymission/centcomAway/general)
"gb" = (
/obj/structure/chair{
dir = 4;
name = "Prosecution"
},
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
"gc" = (
/turf/simulated/floor/plasteel{
dir = 9;
@@ -2967,6 +2960,9 @@
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
"hF" = (
@@ -4076,7 +4072,7 @@
/turf/simulated/floor/plating,
/area/awaymission/centcomAway/hangar)
"kb" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/russian/ranged{
@@ -6814,6 +6810,15 @@
icon_state = "dark"
},
/area/awaymission/centcomAway/thunderdome)
"Di" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/awaymission/centcomAway/hangar)
(1,1,1) = {"
aa
@@ -11426,7 +11431,7 @@ gX
gX
gX
bP
dg
Di
bP
oc
aW
@@ -12205,7 +12210,7 @@ jz
gX
gX
bP
dg
Di
bP
gX
gX
@@ -12324,7 +12329,7 @@ bY
cq
ei
bO
gb
dg
cq
hH
fA
_maps/map_files/RandomZLevels/moonoutpost19.dmm
+13 -13
View File
@@ -8413,12 +8413,12 @@
name = "MO19 Arrivals"
})
"mb" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/small{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/awaycontent/a1{
has_gravity = 1;
@@ -8431,7 +8431,7 @@
name = "MO19 Arrivals"
})
"md" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -8592,12 +8592,12 @@
name = "MO19 Arrivals"
})
"mr" = (
/obj/structure/chair{
dir = 1
},
/obj/machinery/light/small{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
@@ -8623,12 +8623,12 @@
name = "MO19 Arrivals"
})
"mu" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/landmark{
name = "awaystart"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/awaycontent/a1{
has_gravity = 1;
@@ -8965,10 +8965,10 @@
name = "MO19 Arrivals"
})
"mX" = (
/obj/structure/chair,
/obj/machinery/light/small{
dir = 4
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
@@ -9070,10 +9070,10 @@
name = "MO19 Arrivals"
})
"nh" = (
/obj/structure/chair{
/obj/machinery/light/small,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/machinery/light/small,
/turf/simulated/shuttle/floor,
/area/awaycontent/a1{
has_gravity = 1;
_maps/map_files/RandomZLevels/spacebattle.dmm
+11 -11
View File
@@ -219,7 +219,7 @@
},
/area/awaymission/spacebattle/syndicate2)
"aH" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
@@ -361,7 +361,7 @@
},
/area/awaymission/spacebattle/syndicate1)
"ba" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -369,7 +369,7 @@
},
/area/awaymission/spacebattle/syndicate2)
"bb" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -475,7 +475,7 @@
},
/area/awaymission/spacebattle/syndicate3)
"bq" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
@@ -534,7 +534,7 @@
},
/area/awaymission/spacebattle/syndicate1)
"by" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/mob/living/simple_animal/hostile/syndicate,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
@@ -648,7 +648,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/spacebattle/cruiser)
"bN" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -656,7 +656,7 @@
},
/area/awaymission/spacebattle/cruiser)
"bO" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -1640,7 +1640,7 @@
},
/area/awaymission/spacebattle/syndicate4)
"eQ" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
@@ -2421,7 +2421,7 @@
},
/area/awaymission/spacebattle/syndicate7)
"hM" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/mob/living/simple_animal/hostile/syndicate,
@@ -2729,7 +2729,7 @@
},
/area/awaymission/spacebattle/syndicate5)
"iI" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
@@ -2815,7 +2815,7 @@
},
/area/awaymission/spacebattle/syndicate6)
"iW" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/mob/living/simple_animal/hostile/syndicate,
_maps/map_files/RandomZLevels/spacehotel.dmm
+10 -10
View File
@@ -4652,16 +4652,16 @@
/turf/simulated/shuttle/floor,
/area/awaymission)
"kQ" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/awaymission)
"kR" = (
/obj/structure/chair{
/obj/item/paper/hotel_scrap_4,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/item/paper/hotel_scrap_4,
/turf/simulated/shuttle/floor,
/area/awaymission)
"kS" = (
@@ -4709,11 +4709,11 @@
/turf/simulated/shuttle/plating,
/area/space/nearstation)
"la" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/awaymission)
"lb" = (
@@ -4741,17 +4741,17 @@
},
/area/awaymission)
"lf" = (
/obj/structure/chair{
/obj/effect/decal/remains/human,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/decal/remains/human,
/turf/simulated/shuttle/floor,
/area/awaymission)
"lg" = (
/obj/structure/chair{
/obj/effect/decal/cleanable/blood/old,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/effect/decal/cleanable/blood/old,
/turf/simulated/shuttle/floor,
/area/awaymission)
"lh" = (
_maps/map_files/RandomZLevels/stationCollision.dmm
+6 -6
View File
@@ -1941,7 +1941,7 @@
},
/area/awaymission/research)
"ff" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -1952,7 +1952,7 @@
},
/area/awaymission/syndishuttle)
"fg" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -2381,7 +2381,7 @@
},
/area/awaymission/arrivalblock)
"gc" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -4196,7 +4196,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/southblock)
"kO" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -4204,13 +4204,13 @@
},
/area/awaymission/arrivalblock)
"kP" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/awaymission/arrivalblock)
"kQ" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
_maps/map_files/RandomZLevels/wildwest.dmm
+1 -1
View File
@@ -2612,7 +2612,7 @@
},
/area/awaymission/wwrefine)
"ho" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle{
tag = "icon-floor2";
icon_state = "floor2"
_maps/map_files/cyberiad/cyberiad.dmm
+706 -725
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/cyberiad/z2.dmm
+25 -26
View File
@@ -3643,14 +3643,14 @@
},
/area/syndicate_mothership)
"jt" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/small{
tag = "icon-bulb1 (EAST)";
icon_state = "bulb1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -3664,14 +3664,14 @@
/turf/simulated/floor/plating/airless,
/area/syndicate_mothership)
"jw" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light/small{
tag = "icon-bulb1 (WEST)";
icon_state = "bulb1";
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -7380,9 +7380,8 @@
},
/area/centcom/evac)
"sn" = (
/obj/structure/chair{
dir = 4;
name = "Defense"
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/centcom/evac)
@@ -12454,26 +12453,32 @@
},
/turf/unsimulated/floor/vox,
/area/vox_station)
"KA" = (
/obj/structure/chair/sofa/left,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/escape)
"KR" = (
/obj/structure/chair{
/obj/machinery/light/small,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/small,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"KW" = (
/obj/structure/chair,
/obj/machinery/light/small{
dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/assault_pod)
"KX" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -12481,7 +12486,7 @@
},
/area/shuttle/assault_pod)
"KY" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -12582,12 +12587,6 @@
icon_state = "floor4"
},
/area/shuttle/escape)
"QJ" = (
/obj/structure/chair/sofa/corner,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/escape)
"Rf" = (
/obj/structure/chair{
dir = 1
@@ -12740,7 +12739,7 @@
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"Wk" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -12748,7 +12747,7 @@
},
/area/centcom/evac)
"Wl" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -12756,13 +12755,13 @@
},
/area/centcom/evac)
"WI" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"WU" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/centcom/evac)
"Xj" = (
@@ -41460,7 +41459,7 @@ sq
aN
aN
nV
QI
KA
og
og
og
@@ -41717,7 +41716,7 @@ sq
aN
aN
nV
QJ
og
og
og
og
_maps/map_files/cyberiad/z3.dmm
+1 -2
View File
@@ -764,8 +764,7 @@
/area/shuttle/freegolem)
"bS" = (
/obj/machinery/light,
/obj/structure/chair/comfy/purp{
icon_state = "comfychair";
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/mineral/titanium/purple,
_maps/map_files/cyberiad/z4.dmm
+96 -272
View File
@@ -845,37 +845,17 @@
/turf/simulated/floor/plating/airless,
/area/constructionsite/hallway/center)
"cl" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"cm" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"cn" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"co" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cp" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"cq" = (
/obj/structure/inflatable/door,
/turf/simulated/floor/plasteel/airless,
/area/constructionsite/hallway/center)
"cr" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"cs" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"ct" = (
/obj/machinery/power/solar,
/obj/structure/cable{
@@ -892,8 +872,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"cv" = (
/obj/machinery/power/tracker,
@@ -916,8 +896,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"cx" = (
/obj/machinery/power/solar,
@@ -955,8 +935,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"cB" = (
/obj/structure/cable{
@@ -974,8 +954,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"cC" = (
/turf/simulated/wall/r_wall,
@@ -1045,55 +1025,6 @@
icon_state = "bcircuit"
},
/area/constructionsite/ai)
"cL" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cM" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cN" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cO" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cP" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cQ" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"cR" = (
/obj/machinery/light_switch{
pixel_y = -28
@@ -1107,10 +1038,6 @@
icon_state = "dark"
},
/area/engiestation)
"cT" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"cU" = (
/obj/structure/lattice,
/turf/space,
@@ -1270,10 +1197,6 @@
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/constructionsite/ai)
"do" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dp" = (
/obj/structure/cable{
d1 = 2;
@@ -1285,8 +1208,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"dq" = (
/obj/structure/cable{
@@ -1305,28 +1228,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dr" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"ds" = (
/obj/effect/spawner/window/reinforced,
@@ -1437,28 +1340,8 @@
icon_state = "4-8";
pixel_x = 0
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dz" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dA" = (
/obj/structure/cable{
@@ -1471,12 +1354,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dB" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dC" = (
/obj/machinery/recharge_station,
@@ -1629,8 +1508,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/engiestation/solars)
"dT" = (
/obj/structure/cable{
@@ -1644,23 +1523,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dU" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/structure/cable{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"dV" = (
/obj/structure/cable{
@@ -1716,32 +1580,8 @@
icon_state = "4-8";
pixel_x = 0
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"eb" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"ec" = (
/obj/structure/cable{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"ed" = (
/obj/item/stack/sheet/metal{
@@ -1880,10 +1720,6 @@
icon_state = "dark"
},
/area/engiestation)
"em" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/engiestation/solars)
"en" = (
/obj/machinery/vending/tool,
/turf/simulated/floor/plasteel{
@@ -1919,10 +1755,6 @@
},
/turf/simulated/floor/plating/airless,
/area/constructionsite/ai)
"es" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"et" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "0";
@@ -2228,10 +2060,6 @@
icon_state = "carpet"
},
/area/engiestation)
"fi" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"fj" = (
/obj/machinery/vending/cola,
/turf/simulated/floor/plasteel{
@@ -2530,13 +2358,13 @@
},
/area/engiestation)
"fQ" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/space)
"fR" = (
/obj/item/lighter/zippo,
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"fS" = (
/obj/machinery/shower{
@@ -2629,10 +2457,6 @@
icon_state = "delivery"
},
/area/engiestation)
"gc" = (
/turf/simulated/floor/plating/airless,
/obj/structure/lattice/catwalk,
/area/space/nearstation)
"gd" = (
/obj/structure/lattice,
/obj/structure/disposaloutlet{
@@ -14393,14 +14217,14 @@ aa
aa
ab
cl
cr
cr
cr
cr
cr
cr
cr
cr
cl
cl
cl
cl
cl
cl
cl
cl
fQ
bC
aa
@@ -14649,7 +14473,7 @@ aa
aa
ab
cl
es
cl
ab
ab
ab
@@ -14658,7 +14482,7 @@ ab
ab
aa
aa
cm
cl
ab
aa
aa
@@ -14896,16 +14720,16 @@ aa
aa
ab
cl
cr
cr
cr
cr
cP
cs
do
cs
do
cM
cl
cl
cl
cl
cn
cn
cn
cn
cn
cn
cC
cF
cF
@@ -14915,7 +14739,7 @@ cF
cC
aa
aa
cm
cl
ab
aa
aa
@@ -15152,12 +14976,12 @@ aa
aa
aa
ab
cm
cl
ab
ab
aa
ab
co
cn
dd
dp
dK
@@ -15409,12 +15233,12 @@ aa
aa
aa
aa
cm
cl
ab
ab
ab
ab
co
cn
dd
dq
dK
@@ -15666,12 +15490,12 @@ aa
aa
aa
aa
cm
cl
aa
ab
ab
ab
co
cn
dd
dq
dK
@@ -15923,16 +15747,16 @@ aa
aa
aa
aa
cm
cl
ab
ab
ab
cL
cM
cn
cn
dd
dr
dq
dK
dU
dT
dK
da
eB
@@ -16181,10 +16005,10 @@ aa
aa
ab
cn
cs
cs
cs
cM
cn
cn
cn
cn
cW
cX
ds
@@ -16437,7 +16261,7 @@ aa
aa
aa
ab
co
cn
ct
ct
ct
@@ -16698,7 +16522,7 @@ cn
cu
cA
cA
cN
cA
cY
df
du
@@ -16951,7 +16775,7 @@ aa
aa
aa
ab
co
cn
cv
ct
ct
@@ -17212,7 +17036,7 @@ cn
cw
cB
cB
cO
cB
cY
df
dw
@@ -17465,7 +17289,7 @@ aa
aa
aa
ab
co
cn
cx
cx
cx
@@ -17723,10 +17547,10 @@ aa
aa
ab
cn
cs
cs
cs
cP
cn
cn
cn
cn
cW
cX
ds
@@ -17979,12 +17803,12 @@ aa
aa
aa
aa
cm
cl
aa
aa
ab
cQ
cP
cn
cn
dd
dy
dK
@@ -18236,16 +18060,16 @@ aa
aa
aa
aa
cm
cl
aa
ab
ab
ab
co
cn
dd
dz
dy
dK
eb
ea
dK
da
eI
@@ -18493,16 +18317,16 @@ aa
aa
aa
aa
cm
cl
ab
ab
ab
ab
co
cn
dd
dz
dy
dK
eb
ea
dK
da
dj
@@ -18750,16 +18574,16 @@ aa
aa
aa
aa
cm
cl
ab
ab
aa
ab
co
cn
dd
dA
dK
ec
cu
dK
da
dj
@@ -19007,17 +18831,17 @@ aa
aa
aa
aa
cm
cl
aa
aa
aa
aa
cQ
cs
dB
cs
dB
em
cn
cn
cn
cn
cn
cn
da
eI
da
@@ -19264,7 +19088,7 @@ aa
aa
aa
aa
cm
cl
aa
cC
cF
@@ -19285,7 +19109,7 @@ cF
cF
cF
cC
gc
cl
aa
aa
aa
@@ -19521,7 +19345,7 @@ aa
aa
aa
aa
cm
cl
aa
cC
cG
@@ -19542,7 +19366,7 @@ ab
ab
aa
aa
cm
cl
aa
aa
aa
@@ -19778,7 +19602,7 @@ aa
aa
aa
aa
cm
cl
aa
cC
cH
@@ -19799,7 +19623,7 @@ aa
ab
ab
aa
cm
cl
aa
aa
aa
@@ -20035,7 +19859,7 @@ aa
aa
aa
aa
cm
cl
aa
cC
cI
@@ -20056,7 +19880,7 @@ aa
aa
ab
ab
cm
cl
ab
aa
aa
@@ -20292,7 +20116,7 @@ aa
aa
aa
ab
cm
cl
aa
cC
cF
@@ -20307,13 +20131,13 @@ dE
dj
dE
cC
fi
cr
cr
cr
cr
cr
es
cl
cl
cl
cl
cl
cl
cl
bC
aa
aa
@@ -20549,11 +20373,11 @@ aa
aa
aa
ab
cp
cr
cr
cr
cT
cl
cl
cl
cl
cl
dc
cC
dD
_maps/map_files/cyberiad/z6.dmm
+36 -38
View File
@@ -15,8 +15,8 @@
},
/area/djstation/solars)
"ad" = (
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/space/nearstation)
"ae" = (
/obj/structure/lattice,
@@ -76,8 +76,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation/solars)
"ao" = (
/obj/structure/grille{
@@ -93,8 +93,8 @@
d2 = 2;
icon_state = "1-2"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation/solars)
"aq" = (
/obj/structure/cable{
@@ -125,8 +125,8 @@
d2 = 2;
icon_state = "1-2"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation)
"at" = (
/obj/structure/lattice,
@@ -312,8 +312,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation)
"aR" = (
/obj/structure/cable{
@@ -331,8 +331,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation/solars)
"aS" = (
/obj/structure/cable{
@@ -340,8 +340,8 @@
d2 = 8;
icon_state = "4-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation/solars)
"aT" = (
/obj/structure/cable{
@@ -359,8 +359,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation/solars)
"aU" = (
/obj/item/storage/toolbox/mechanical{
@@ -386,8 +386,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/djstation)
"aW" = (
/turf/simulated/floor/plasteel{
@@ -4602,8 +4602,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"jL" = (
/obj/structure/table/wood,
@@ -6021,7 +6021,7 @@
/area/space/nearstation)
"nh" = (
/obj/item/shard,
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel/airless,
@@ -6263,7 +6263,7 @@
/obj/item/shard{
icon_state = "medium"
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plating/asteroid/airless,
@@ -6693,8 +6693,8 @@
d2 = 2;
icon_state = "1-2"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"oT" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -7118,14 +7118,14 @@
},
/area/derelict/arrival)
"pV" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -7569,7 +7569,7 @@
},
/area/derelict/arrival)
"qT" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -7577,7 +7577,7 @@
},
/area/derelict/arrival)
"qU" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -7751,8 +7751,8 @@
d2 = 8;
icon_state = "4-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"rn" = (
/obj/structure/cable{
@@ -7765,8 +7765,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"ro" = (
/obj/structure/window/reinforced,
@@ -7817,9 +7817,7 @@
dir = 1
},
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/plasteel/airless{
icon_state = "floorscorched2"
},
/turf/simulated/shuttle/plating,
/area/derelict/arrival)
"rt" = (
/obj/structure/window/reinforced,
@@ -7993,8 +7991,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"rG" = (
/obj/structure/closet/crate/secure/loot,
@@ -8029,8 +8027,8 @@
/turf/space,
/area/derelict/crew_quarters)
"rJ" = (
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"rK" = (
/obj/machinery/power/tracker,
@@ -8272,8 +8270,8 @@
d2 = 4;
icon_state = "2-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"si" = (
/obj/structure/cable{
@@ -8333,12 +8331,12 @@
},
/area/derelict/crew_quarters)
"sl" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light/small{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -9006,8 +9004,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"tF" = (
/obj/structure/sign/greencross,
@@ -9040,8 +9038,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"tI" = (
/obj/structure/cable{
@@ -9563,8 +9561,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"uJ" = (
/turf/space,
@@ -9895,8 +9893,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"vn" = (
/obj/item/shard{
@@ -10462,8 +10460,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"wm" = (
/obj/structure/cable{
@@ -10476,8 +10474,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"wn" = (
/obj/structure/closet/jcloset,
@@ -10502,8 +10500,8 @@
d2 = 8;
icon_state = "2-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"wp" = (
/obj/structure/cable{
@@ -10521,8 +10519,8 @@
d2 = 4;
icon_state = "1-4"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"wq" = (
/obj/structure/cable{
@@ -10540,8 +10538,8 @@
d2 = 8;
icon_state = "1-8"
},
/turf/space,
/obj/structure/lattice/catwalk,
/turf/space,
/area/derelict/solar_control)
"wr" = (
/obj/docking_port/stationary{
_maps/map_files/shuttles/admin_admin.dmm
+12 -6
View File
@@ -408,6 +408,9 @@
/obj/structure/chair/comfy/black{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -416,6 +419,9 @@
/obj/structure/chair/comfy/black{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -550,14 +556,14 @@
},
/area/shuttle/administration)
"bl" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
icon_state = "tube1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -603,7 +609,7 @@
},
/area/shuttle/administration)
"br" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -643,7 +649,7 @@
color = "#FF0000";
dir = 8
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -651,7 +657,7 @@
},
/area/shuttle/administration)
"bw" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
_maps/map_files/shuttles/admin_hospital.dmm
+20 -2
View File
@@ -237,6 +237,9 @@
icon_state = "chair";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -256,6 +259,9 @@
name = "NHV Asclepius Lobby";
network = list("NHV Asclepius")
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -319,7 +325,7 @@
},
/area/shuttle/administration)
"aG" = (
/obj/structure/chair/office/light{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -412,6 +418,9 @@
/obj/structure/chair{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -420,6 +429,9 @@
/obj/structure/chair{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -483,7 +495,7 @@
},
/area/shuttle/administration)
"aY" = (
/obj/structure/chair/office/light,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -664,6 +676,9 @@
req_access = list(101);
req_access_txt = "0"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -890,6 +905,9 @@
dir = 8
},
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
_maps/map_files/shuttles/emergency_bar.dmm
+14 -3
View File
@@ -43,7 +43,7 @@
/turf/simulated/floor/carpet,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/carpet,
@@ -75,7 +75,7 @@
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/carpet,
@@ -91,7 +91,7 @@
/turf/simulated/floor/carpet,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/carpet,
@@ -123,6 +123,9 @@
/obj/structure/chair{
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"ax" = (
@@ -135,6 +138,7 @@
dir = 1
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"ay" = (
@@ -194,6 +198,9 @@
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aF" = (
@@ -224,10 +231,14 @@
/obj/structure/chair{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aL" = (
_maps/map_files/shuttles/emergency_clown.dmm
+11 -19
View File
@@ -43,7 +43,7 @@
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/plasteel{
@@ -58,14 +58,6 @@
/obj/machinery/computer/station_alert,
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"al" = (
/obj/structure/chair{
dir = 1
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
/area/shuttle/escape)
"am" = (
/obj/item/toy/snappop/phoenix,
/turf/simulated/floor/plasteel{
@@ -80,12 +72,12 @@
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"ap" = (
@@ -95,12 +87,12 @@
},
/area/shuttle/escape)
"aq" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"ar" = (
@@ -114,7 +106,7 @@
/turf/simulated/floor/noslip,
/area/shuttle/escape)
"at" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel{
@@ -129,7 +121,7 @@
},
/area/shuttle/escape)
"av" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -675,7 +667,7 @@ bt
ab
ae
ah
al
ai
am
au
ax
@@ -727,7 +719,7 @@ aa
ad
ag
aj
al
ai
ap
au
ax
_maps/map_files/shuttles/emergency_cramped.dmm
+2 -2
View File
@@ -46,7 +46,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"j" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/plating,
@@ -114,7 +114,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"s" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plating,
_maps/map_files/shuttles/emergency_cyb.dmm
+29 -35
View File
@@ -43,7 +43,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -56,12 +56,6 @@
/obj/machinery/computer/station_alert,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"al" = (
/obj/structure/chair{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"am" = (
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
@@ -73,21 +67,21 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ap" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aq" = (
@@ -101,7 +95,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"as" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -111,7 +105,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"au" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -142,7 +136,7 @@
},
/area/shuttle/escape)
"az" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
@@ -156,7 +150,7 @@
icon_state = "tube1";
dir = 1
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aB" = (
@@ -171,7 +165,7 @@
},
/area/shuttle/escape)
"aC" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -179,7 +173,7 @@
},
/area/shuttle/escape)
"aD" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -205,12 +199,12 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aH" = (
@@ -236,12 +230,12 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -256,13 +250,13 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aN" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aO" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aP" = (
@@ -296,9 +290,6 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aS" = (
/obj/structure/chair{
dir = 4
},
/obj/item/radio/intercom{
dir = 8;
name = "station intercom (General)";
@@ -309,14 +300,14 @@
icon_state = "tube1";
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"aT" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
@@ -325,6 +316,9 @@
icon_state = "tube1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -710,7 +704,7 @@ bw
ab
ae
ah
al
ai
am
am
av
@@ -762,7 +756,7 @@ aa
ad
ag
aj
al
ai
am
at
av
_maps/map_files/shuttles/emergency_dept.dmm
+58 -88
View File
@@ -62,7 +62,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"al" = (
/obj/structure/chair/comfy/blue{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -93,36 +93,6 @@
"aq" = (
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ar" = (
/obj/structure/chair/comfy/beige{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"as" = (
/obj/structure/chair/comfy/brown{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"at" = (
/obj/structure/chair/comfy/red{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"au" = (
/obj/structure/chair/comfy/teal{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/purp{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aw" = (
/turf/simulated/shuttle/wall{
icon_state = "swall13";
@@ -143,7 +113,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"az" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aA" = (
@@ -155,7 +125,7 @@
icon_state = "tube1";
dir = 1
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aB" = (
@@ -172,7 +142,7 @@
},
/area/shuttle/escape)
"aD" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel{
@@ -227,7 +197,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria";
dir = 2
@@ -276,13 +246,13 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aR" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/plasteel{
@@ -327,53 +297,53 @@
},
/area/shuttle/escape)
"aW" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aX" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"aY" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"aZ" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"ba" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor5"
},
/area/shuttle/escape)
"bb" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor4,
@@ -405,9 +375,6 @@
},
/area/shuttle/escape)
"bf" = (
/obj/structure/chair{
dir = 4
},
/obj/item/radio/intercom{
dir = 8;
name = "station intercom (General)";
@@ -421,6 +388,9 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"bg" = (
@@ -431,35 +401,35 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bh" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bi" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bj" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"bk" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"bl" = (
@@ -473,10 +443,10 @@
},
/area/shuttle/escape)
"bm" = (
/obj/structure/chair{
/obj/structure/window/reinforced,
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
@@ -490,41 +460,38 @@
},
/area/shuttle/escape)
"bo" = (
/obj/structure/chair{
/obj/structure/window/reinforced,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor2"
},
/area/shuttle/escape)
"bp" = (
/obj/structure/window/reinforced,
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bq" = (
/obj/structure/window/reinforced,
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"br" = (
/obj/structure/chair{
/obj/structure/window/reinforced,
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor5"
},
/area/shuttle/escape)
"bs" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
@@ -536,15 +503,18 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"bt" = (
/obj/structure/chair{
/obj/structure/window/reinforced,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/obj/structure/window/reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor5"
},
@@ -593,23 +563,23 @@
},
/area/shuttle/escape)
"bz" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"bA" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor5"
},
@@ -665,7 +635,7 @@
},
/area/shuttle/escape)
"bF" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -678,7 +648,7 @@
},
/area/shuttle/escape)
"bH" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -849,7 +819,7 @@ bT
aa
ae
ai
ar
al
aq
ae
az
@@ -875,7 +845,7 @@ bT
aa
ae
aj
as
al
aq
ae
az
@@ -901,7 +871,7 @@ bS
ab
af
ak
at
al
aq
ax
aB
@@ -979,7 +949,7 @@ bU
aa
ae
an
au
al
aq
ae
aE
@@ -1005,7 +975,7 @@ bP
aa
ae
ao
av
al
aq
ae
aC
_maps/map_files/shuttles/emergency_meta.dmm
+26 -26
View File
@@ -138,29 +138,29 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"av" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"aw" = (
/obj/structure/chair,
/obj/machinery/light{
dir = 1;
on = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"ax" = (
/obj/structure/chair,
/obj/item/radio/intercom{
dir = 4;
name = "Station Intercom (General)";
pixel_x = 0;
pixel_y = 27
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -239,7 +239,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aD" = (
/obj/structure/chair/office/dark{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -295,11 +295,11 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aK" = (
/obj/structure/chair/office/dark,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aL" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
@@ -307,10 +307,10 @@
},
/area/shuttle/escape)
"aM" = (
/obj/structure/chair{
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -377,7 +377,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aQ" = (
/obj/structure/chair/office/dark{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -420,10 +420,10 @@
},
/area/shuttle/escape)
"aW" = (
/obj/structure/chair,
/obj/machinery/light{
dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -482,9 +482,6 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"bd" = (
/obj/structure/chair{
dir = 1
},
/obj/item/radio/intercom{
broadcasting = 0;
listening = 1;
@@ -492,6 +489,9 @@
pixel_y = -28
},
/obj/machinery/light,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -581,7 +581,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"bo" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/plating{
@@ -607,7 +607,7 @@
},
/area/shuttle/escape)
"bs" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -615,7 +615,7 @@
},
/area/shuttle/escape)
"bt" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -693,12 +693,12 @@
},
/area/shuttle/escape)
"bE" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 31
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
@@ -762,12 +762,12 @@
},
/area/shuttle/escape)
"bI" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/plating{
icon_state = "floorgrime"
},
@@ -779,18 +779,18 @@
},
/area/shuttle/escape)
"bK" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor4"
},
/area/shuttle/escape)
"bL" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
_maps/map_files/shuttles/emergency_mil.dmm
+18 -59
View File
@@ -115,25 +115,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"au" = (
/obj/structure/chair/comfy/brown{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"av" = (
/obj/structure/chair/comfy/teal{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aw" = (
/obj/structure/chair/comfy/red{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ax" = (
/obj/structure/chair/comfy/blue{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -142,18 +124,6 @@
/obj/machinery/computer/robotics,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"az" = (
/obj/structure/chair/comfy/beige{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aA" = (
/obj/structure/chair/comfy/purp{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aB" = (
/turf/simulated/shuttle/wall{
tag = "icon-swall7";
@@ -181,7 +151,7 @@
},
/area/shuttle/escape)
"aF" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aG" = (
@@ -193,7 +163,7 @@
icon_state = "tube1";
dir = 1
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"aH" = (
@@ -335,7 +305,7 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aX" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor4,
@@ -469,32 +439,32 @@
icon_state = "tube1";
dir = 8
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bk" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bl" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bm" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
icon_state = "tube1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bn" = (
@@ -503,22 +473,11 @@
icon_state = "tube1";
dir = 8
},
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bo" = (
/obj/machinery/light/spot{
tag = "icon-tube1 (EAST)";
icon_state = "tube1";
dir = 4
},
/obj/structure/chair{
dir = 8
},
/turf/simulated/floor/plating,
/area/shuttle/escape)
"bp" = (
/obj/machinery/door/airlock/shuttle{
aiControlDisabled = 1;
@@ -629,7 +588,7 @@ aa
ab
af
as
az
au
af
aF
aN
@@ -732,7 +691,7 @@ aj
ac
af
al
av
au
at
aC
aH
@@ -784,7 +743,7 @@ bz
ac
af
an
aw
au
at
aC
aH
@@ -810,7 +769,7 @@ by
ab
af
ao
ax
au
at
af
aJ
@@ -889,7 +848,7 @@ aa
ab
af
ay
aA
au
af
aM
aT
@@ -901,12 +860,12 @@ bm
bk
bk
bk
bo
bm
bi
aI
br
bk
bo
bm
aC
bw
"}
_maps/map_files/shuttles/emergency_narnar.dmm
+27 -33
View File
@@ -22,7 +22,7 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"af" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/engine/cult,
@@ -35,12 +35,6 @@
/obj/machinery/computer/station_alert,
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair{
dir = 1
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"aj" = (
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
@@ -52,21 +46,21 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"al" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"am" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"an" = (
@@ -74,7 +68,7 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"ao" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/engine/cult,
@@ -84,7 +78,7 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"aq" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/engine/cult,
@@ -94,14 +88,14 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"as" = (
/obj/structure/chair{
dir = 4
},
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"at" = (
@@ -113,23 +107,23 @@
icon_state = "tube1";
dir = 1
},
/obj/structure/chair,
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"au" = (
/obj/structure/chair{
dir = 8
},
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"av" = (
@@ -148,9 +142,6 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"ax" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
@@ -159,6 +150,9 @@
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"ay" = (
@@ -176,20 +170,17 @@
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"aB" = (
/obj/structure/chair{
dir = 1
},
/obj/effect/decal/remains/human{
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair{
dir = 8
},
/obj/item/radio/intercom{
dir = 4;
name = "station intercom (General)";
@@ -200,6 +191,9 @@
icon_state = "remains";
name = "Human remains"
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/engine/cult,
/area/shuttle/escape)
"aD" = (
@@ -559,7 +553,7 @@ bj
ab
ab
ae
ai
af
aj
aj
ab
@@ -611,7 +605,7 @@ aa
ab
ab
ag
ai
af
aj
ap
ab
_maps/map_files/shuttles/emergency_old.dmm
+27 -33
View File
@@ -43,7 +43,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ai" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -72,12 +72,6 @@
/obj/machinery/computer/station_alert,
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"am" = (
/obj/structure/chair{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"an" = (
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
@@ -89,21 +83,21 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ap" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aq" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"ar" = (
@@ -117,7 +111,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"at" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
@@ -127,7 +121,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"av" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -158,7 +152,7 @@
},
/area/shuttle/escape)
"aA" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
@@ -177,7 +171,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"aC" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
@@ -192,12 +186,12 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aE" = (
/obj/structure/chair{
dir = 4
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -28
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -210,12 +204,12 @@
/turf/simulated/floor/plating,
/area/shuttle/escape)
"aG" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -266,9 +260,6 @@
},
/area/shuttle/escape)
"aL" = (
/obj/structure/chair{
dir = 4
},
/obj/item/radio/intercom{
dir = 8;
name = "station intercom (General)";
@@ -279,14 +270,14 @@
icon_state = "tube1";
dir = 8
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
/area/shuttle/escape)
"aM" = (
/obj/structure/chair{
dir = 8
},
/obj/structure/closet/walllocker/emerglocker{
pixel_x = 28
},
@@ -295,6 +286,9 @@
icon_state = "tube1";
dir = 4
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor{
icon_state = "floor3"
},
@@ -393,7 +387,7 @@
},
/area/shuttle/escape)
"aZ" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor4,
/area/shuttle/escape)
"ba" = (
@@ -455,7 +449,7 @@
},
/area/shuttle/escape)
"bh" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor4,
@@ -633,7 +627,7 @@ bo
ab
ae
ah
am
ai
an
an
aw
@@ -685,7 +679,7 @@ aa
ad
ag
aj
am
ai
an
au
aw
_maps/map_files/shuttles/ferry_base.dmm
+8 -8
View File
@@ -45,14 +45,14 @@
},
/area/shuttle/transport)
"h" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light/spot{
tag = "icon-tube1 (NORTH)";
icon_state = "tube1";
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"i" = (
@@ -60,16 +60,16 @@
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"j" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"k" = (
/obj/structure/chair,
/obj/machinery/light/spot{
tag = "icon-tube1 (NORTH)";
icon_state = "tube1";
dir = 1
},
/obj/structure/chair/comfy/shuttle,
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"l" = (
@@ -126,16 +126,16 @@
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"s" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"t" = (
/obj/structure/chair{
/obj/machinery/light/spot,
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/machinery/light/spot,
/turf/simulated/shuttle/floor,
/area/shuttle/transport)
"u" = (
_maps/map_files/shuttles/ferry_meat.dmm
+5 -5
View File
@@ -47,14 +47,14 @@
},
/area/shuttle/transport)
"h" = (
/obj/structure/chair{
dir = 4
},
/obj/machinery/light/spot{
tag = "icon-tube1 (NORTH)";
icon_state = "tube1";
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -103,7 +103,7 @@
},
/area/shuttle/transport)
"n" = (
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -114,7 +114,7 @@
icon_state = "tube1";
dir = 1
},
/obj/structure/chair,
/obj/structure/chair/comfy/shuttle,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
_maps/map_files/templates/medium_shuttle1.dmm
+1 -1
View File
@@ -332,7 +332,7 @@
name = "Shuttle"
})
"L" = (
/obj/structure/chair/comfy/black{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel{
_maps/map_files/templates/medium_shuttle2.dmm
+1 -3
View File
@@ -222,9 +222,7 @@
name = "Shuttle"
})
"B" = (
/obj/structure/chair/comfy{
tag = "icon-comfychair (EAST)";
icon_state = "comfychair";
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/floor/plasteel{
_maps/map_files/templates/medium_shuttle3.dmm
+1 -3
View File
@@ -187,9 +187,7 @@
name = "Shuttle"
})
"x" = (
/obj/structure/chair/comfy{
tag = "icon-comfychair (WEST)";
icon_state = "comfychair";
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/floor/plasteel{
_maps/map_files/templates/small_shuttle_1.dmm
+3 -3
View File
@@ -59,7 +59,7 @@
},
/area/ruin/powered)
"m" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/simulated/shuttle/floor,
@@ -88,7 +88,7 @@
/turf/simulated/shuttle/floor,
/area/ruin/powered)
"r" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/simulated/shuttle/floor,
@@ -108,7 +108,7 @@
},
/area/ruin/powered)
"u" = (
/obj/structure/chair{
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/simulated/shuttle/floor,
code/game/objects/items/stacks/sheets/sheet_types.dm
+1
View File
@@ -16,6 +16,7 @@
var/global/list/datum/stack_recipe/metal_recipes = list(
new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = 1, on_floor = 1),
new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = 1, on_floor = 1),
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+23 -12
View File
@@ -151,35 +151,38 @@
name = "comfy chair"
desc = "It looks comfy."
icon_state = "comfychair"
color = rgb(255,255,255)
color = rgb(255, 255, 255)
burn_state = FLAMMABLE
burntime = 30
buildstackamount = 2
item_chair = null
var/image/armrest = null
/obj/structure/chair/comfy/New()
armrest = image("icons/obj/chairs.dmi", "comfychair_armrest")
/obj/structure/chair/comfy/Initialize(mapload)
armrest = GetArmrest()
armrest.layer = ABOVE_MOB_LAYER
return ..()
/obj/structure/chair/comfy/proc/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
/obj/structure/chair/comfy/Destroy()
QDEL_NULL(armrest)
return ..()
/obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
..()
if(buckled_mob)
overlays += armrest
else
overlays -= armrest
. = ..()
update_armrest()
/obj/structure/chair/comfy/post_unbuckle_mob(mob/living/M)
..()
if(buckled_mob)
overlays -= armrest
. = ..()
update_armrest()
/obj/structure/chair/comfy/proc/update_armrest()
if(has_buckled_mobs())
add_overlay(armrest)
else
overlays += armrest
cut_overlay(armrest)
/obj/structure/chair/comfy/brown
color = rgb(141,70,0)
@@ -214,6 +217,14 @@
item_chair = null
buildstackamount = 5
/obj/structure/chair/comfy/shuttle
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
/obj/structure/chair/office/Bump(atom/A)
..()
if(!buckled_mob)
code/modules/awaymissions/mission_code/stationCollision.dm
+6 -6
View File
@@ -19,22 +19,22 @@
* Areas
*/
//Gateroom gets its own APC specifically for the gate
/area/awaymission/gateroom
/area/awaymission/gateroom
//Library, medbay, storage room
/area/awaymission/southblock
/area/awaymission/southblock
//Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas)
/area/awaymission/arrivalblock
/area/awaymission/arrivalblock
//Crew quarters, cafeteria, chapel
/area/awaymission/midblock
/area/awaymission/midblock
//engineering, bridge (not really north but it doesnt really need its own APC)
/area/awaymission/northblock
/area/awaymission/northblock
//That massive research room
/area/awaymission/research
/area/awaymission/research
//Syndicate shuttle
/area/awaymission/syndishuttle
icons/obj/chairs.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 39 KiB