shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into clockcultrework_v2

Browse Source
This commit is contained in:
Dan-Neposh
2021-01-14 19:51:15 -05:00
parent 6a7ec73889 93507cfb0a
commit 04d5721c4d
1152 changed files with 31093 additions and 24256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/crashedship.dmm
+1 -1
View File
@@ -2372,7 +2372,7 @@
},
/area/awaymission/BMPship/Midship)
"hh" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"hi" = (
_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+156 -119
View File
@@ -153,10 +153,6 @@
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"cX" = (
/obj/structure/closet/secure_closet/miner,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"dk" = (
/obj/structure/table,
/obj/item/stack/packageWrap,
@@ -398,6 +394,13 @@
},
/turf/open/floor/plating,
/area/mine/laborcamp/security)
"he" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"hf" = (
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
@@ -417,16 +420,6 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"hH" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"hP" = (
/obj/structure/lattice/catwalk,
/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
@@ -503,6 +496,14 @@
},
/turf/open/floor/plasteel,
/area/mine/production)
"ja" = (
/obj/item/bikehorn{
color = "#000";
desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks.";
name = "charred bike horn"
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"jf" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
@@ -769,11 +770,6 @@
/obj/effect/turf_decal/tile/red,
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"nH" = (
/obj/machinery/light,
/obj/structure/closet/wardrobe/miner,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"nI" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -841,6 +837,12 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/mine/production)
"nS" = (
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"nX" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -1275,8 +1277,12 @@
/turf/open/floor/plasteel,
/area/mine/production)
"uG" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/box,
/obj/structure/table,
/obj/item/clothing/glasses/meson,
/obj/item/storage/bag/ore,
/obj/item/pickaxe,
/obj/item/mining_scanner,
/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"uI" = (
@@ -1439,6 +1445,15 @@
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"wQ" = (
/obj/structure/table,
/obj/item/tank/internals/emergency_oxygen{
pixel_x = 5;
pixel_y = 3
},
/obj/item/tank/internals/emergency_oxygen,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"wV" = (
/turf/closed/mineral/random/volcanic,
/area/lavaland/surface/outdoors/explored)
@@ -1536,6 +1551,18 @@
},
/turf/open/floor/plasteel/freezer,
/area/mine/living_quarters)
"yZ" = (
/obj/docking_port/stationary{
area_type = /area/lavaland/surface/outdoors;
dir = 8;
dwidth = 3;
height = 7;
id = "lavaland_common_away";
name = "Lavaland Mining Public Wing";
width = 7
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"zh" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
@@ -1644,6 +1671,13 @@
},
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/mine/production)
"AC" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"AH" = (
/obj/machinery/cryopod{
dir = 4
@@ -1719,6 +1753,12 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/mine/living_quarters)
"By" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"BD" = (
/obj/machinery/door/airlock/maintenance{
name = "Mining Station Maintenance";
@@ -1843,6 +1883,7 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Dr" = (
/obj/structure/chair,
/obj/structure/extinguisher_cabinet{
pixel_x = -5;
pixel_y = 30
@@ -1850,9 +1891,6 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Dv" = (
@@ -2695,17 +2733,12 @@
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Pp" = (
/obj/machinery/camera{
c_tag = "Public Shuttle Lobby";
network = list("mine")
},
/obj/effect/turf_decal/tile/brown{
dir = 1
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
/obj/structure/table,
/obj/item/gps/mining{
pixel_x = 3;
pixel_y = 5
},
/obj/item/gps/mining,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Pq" = (
@@ -2750,6 +2783,10 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel/white,
/area/mine/laborcamp)
"Qd" = (
/obj/structure/displaycase,
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Qi" = (
/obj/structure/table,
/obj/machinery/reagentgrinder,
@@ -2825,9 +2862,13 @@
/turf/open/floor/plasteel,
/area/mine/laborcamp)
"Ru" = (
/obj/structure/chair,
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"Rv" = (
@@ -3019,13 +3060,13 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/structure/cable{
icon_state = "1-2"
},
/mob/living/simple_animal/bot/secbot/beepsky{
desc = "Powered by the tears and sweat of laborers.";
name = "Prison Ofitser"
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/mine/laborcamp/security)
"Un" = (
@@ -3241,10 +3282,6 @@
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"XX" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/closed/wall,
/area/mine/living_quarters)
"Ya" = (
/turf/closed/wall/r_wall,
/area/mine/laborcamp)
@@ -4211,9 +4248,9 @@ VT
VT
VT
VT
VT
VT
VT
Lm
Lm
Lm
VT
VT
VT
@@ -4266,12 +4303,12 @@ VT
VT
VT
VT
VT
VT
VT
VT
VT
VT
Lm
Lm
Lm
Lm
Lm
Lm
VT
VT
VT
@@ -4322,15 +4359,15 @@ VT
VT
VT
VT
VT
VT
VT
VT
VT
VT
VT
VT
VT
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
VT
VT
VT
@@ -4379,16 +4416,16 @@ VT
VT
VT
VT
VT
VT
VT
VT
Lm
Lm
VT
VT
Lm
VT
Lm
Lm
Lm
Lm
Lm
Lm
Lm
VT
VT
VT
@@ -4435,17 +4472,17 @@ wz
wz
VT
VT
VT
VT
Lm
VT
VT
VT
Lm
VT
VT
VT
VT
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
VT
VT
@@ -4492,18 +4529,18 @@ wz
wz
Lm
VT
VT
VT
Lm
Lm
Lm
Lm
Lm
VT
VT
VT
VT
VT
Lm
Lm
Lm
Lm
Lm
Lm
Lm
VT
VT
VT
@@ -4549,7 +4586,6 @@ VT
wz
Lm
VT
VT
Lm
Lm
Lm
@@ -4558,8 +4594,9 @@ Lm
Lm
Lm
Lm
VT
VT
Lm
Lm
Lm
VT
VT
VT
@@ -4615,7 +4652,7 @@ Lm
Lm
Lm
Lm
VT
Lm
VT
VT
VT
@@ -4662,11 +4699,11 @@ VT
VT
VT
VT
VT
Lm
Lm
VT
VT
Lm
Lm
Lm
Lm
Lm
Lm
@@ -4722,10 +4759,10 @@ wz
Lm
Lm
Lm
VT
Lm
Lm
Lm
yZ
Lm
Lm
Lm
@@ -4772,18 +4809,18 @@ Gt
Dv
my
VT
ja
VT
VT
VT
wz
wz
Lm
Lm
Lm
VT
Lm
Lm
Lm
Lm
KV
he
KV
Lm
Lm
Lm
@@ -4833,14 +4870,14 @@ VT
VT
Lm
Lm
wz
wz
Lm
Lm
Lm
Lm
Lm
Lm
Lm
Lm
KV
Ag
KV
Lm
Lm
VT
@@ -4893,11 +4930,11 @@ Lm
VN
VN
VN
XX
VN
VN
VN
KV
VN
KV
AC
KV
VT
VT
VT
@@ -4949,12 +4986,12 @@ pu
bn
VN
zy
Ag
Ag
Ag
By
nS
By
Ag
qZ
VN
KV
VT
VT
VT
@@ -5010,8 +5047,8 @@ Ag
Ag
Ag
Ag
cX
VN
Ag
KV
VT
VT
VT
@@ -5067,8 +5104,8 @@ Ag
uG
uG
Ag
cX
VN
eS
KV
VT
VT
VT
@@ -5124,8 +5161,8 @@ KO
uG
uG
Ag
cX
VN
Ag
KV
VT
VT
VT
@@ -5181,7 +5218,7 @@ RP
Ag
Ag
Ag
nH
oy
VN
VT
VT
@@ -5235,10 +5272,10 @@ oy
VN
Pp
sx
eS
Ag
Ag
hH
Pp
wQ
Qd
Qd
VN
wz
Lm
_maps/RandomZLevels/away_mission/Academy.dmm
+1 -1
View File
@@ -2710,7 +2710,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
_maps/RandomZLevels/away_mission/SnowCabin.dmm
+1 -1
View File
@@ -312,7 +312,7 @@
/obj/structure/janitorialcart,
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/cabin)
_maps/cogstation.dm
+1 -1
View File
@@ -1 +1 @@
#define FORCE_MAP "_maps/cogstation.json"
#define FORCE_MAP "_maps/cogstation.json"
_maps/kilostation.dm
+1 -1
View File
@@ -1 +1 @@
#define FORCE_MAP "_maps/kilostation.json"
#define FORCE_MAP "_maps/kilostation.json"
_maps/map_files/BoxStation/BoxStation.dmm
+2833 -1949
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/CogStation/CogStation.dmm
+8185 -9420
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/CogStation/job_changes.dm
+1 -1
View File
@@ -26,4 +26,4 @@
..()
MAP_JOB_CHECK
access += ACCESS_MAINT_TUNNELS
minimal_access += ACCESS_MAINT_TUNNELS
minimal_access += ACCESS_MAINT_TUNNELS
_maps/map_files/Deltastation/DeltaStation2.dmm
+235 -116
View File
@@ -660,6 +660,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"abr" = (
@@ -1308,6 +1309,45 @@
/obj/item/toy/poolnoodle/blue,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/pool)
"acy" = (
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "cargounload"
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acA" = (
/obj/machinery/conveyor{
dir = 9;
id = "cargounload"
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"acB" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/light/floor,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"acF" = (
/obj/docking_port/stationary{
dir = 2;
@@ -1484,9 +1524,6 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/obj/machinery/camera{
c_tag = "Arrivals Dock - Fore";
dir = 8;
@@ -1495,6 +1532,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"acX" = (
@@ -3495,9 +3535,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ajL" = (
@@ -3783,6 +3821,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"akn" = (
@@ -12917,18 +12958,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aAH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor_switch/oneway{
dir = 8;
id = "cargounload"
},
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aAI" = (
/obj/structure/cable/white,
/obj/structure/cable/white{
@@ -13615,14 +13644,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aBZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aCa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/brown,
@@ -14263,23 +14284,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aDf" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/machinery/door/airlock/external{
name = "Supply Dock Airlock";
req_access_txt = "31"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aDg" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
@@ -32961,6 +32965,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/bot,
/obj/item/stack/ore/silver{
amount = 2
},
/obj/item/stack/ore/iron,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"biu" = (
@@ -49387,7 +49395,7 @@
},
/obj/machinery/door/airlock/security/glass{
name = "Security E.V.A. Storage";
req_access_txt = "3"
req_access_txt = "1"
},
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -66630,6 +66638,13 @@
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
/area/library)
"chT" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"chV" = (
/obj/machinery/newscaster{
pixel_x = -32
@@ -79370,6 +79385,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -81561,12 +81577,12 @@
/turf/open/floor/plasteel,
/area/engine/storage)
"cHt" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/status_display/ai{
pixel_y = -32
},
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/storage)
"cHu" = (
@@ -110331,8 +110347,8 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop Out";
dir = 4
dir = 4;
name = "Space Loop Out"
},
/turf/open/floor/plasteel,
/area/science/mixing)
@@ -125416,6 +125432,12 @@
},
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"fer" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"fhE" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical{
@@ -125528,6 +125550,12 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"gfJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"gmj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
@@ -125630,14 +125658,6 @@
},
/turf/open/floor/plasteel,
/area/maintenance/department/electrical)
"hdH" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/conveyor{
dir = 9;
id = "cargoload"
},
/turf/open/floor/plating,
/area/quartermaster/storage)
"hic" = (
/obj/structure/table/reinforced,
/obj/item/integrated_electronics/analyzer,
@@ -125689,6 +125709,14 @@
/obj/effect/landmark/start/cyborg,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior)
"hzR" = (
/obj/effect/turf_decal/delivery,
/obj/structure/table,
/obj/item/gps/mining{
gpstag = "MINE_PUB"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"hAf" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -125847,6 +125875,21 @@
},
/turf/open/floor/plating,
/area/engine/atmos)
"iCO" = (
/obj/effect/turf_decal/delivery,
/obj/structure/chair{
dir = 8
},
/obj/machinery/camera{
c_tag = "Arrivals Dock - Public Mining";
dir = 8;
name = "arrivals camera"
},
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"iIl" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -125943,6 +125986,13 @@
},
/turf/open/floor/plasteel,
/area/maintenance/solars/port/aft)
"iUI" = (
/obj/effect/turf_decal/delivery,
/obj/structure/chair{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"jdx" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -126193,6 +126243,10 @@
},
/turf/open/space,
/area/engine/atmos)
"kmz" = (
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"kqo" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -126624,6 +126678,18 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
"mVW" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/door/airlock/external{
name = "External Docking Port"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"mWZ" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -126635,6 +126701,17 @@
},
/turf/open/floor/engine,
/area/science/mixing)
"naC" = (
/obj/docking_port/stationary{
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"nbi" = (
/obj/effect/decal/cleanable/dirt,
/turf/closed/wall/r_wall,
@@ -126962,6 +127039,14 @@
/obj/effect/landmark/start/paramedic,
/turf/open/floor/plasteel/white,
/area/medical/storage)
"pIl" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"pQm" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/white{
@@ -127061,6 +127146,13 @@
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"qEF" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"qUn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/neutral{
@@ -127633,6 +127725,15 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/science/circuit)
"wlT" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"wmL" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -127654,6 +127755,15 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"wpx" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"wum" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 4
@@ -127738,6 +127848,15 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"xaL" = (
/obj/effect/turf_decal/delivery,
/obj/structure/table,
/obj/machinery/light{
dir = 8
},
/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"xcU" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
@@ -159602,13 +159721,13 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aad
aad
aaO
aaO
abf
aaO
aaO
aad
aad
aad
@@ -159859,13 +159978,13 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
qgU
aad
aaa
aaO
qEF
xaL
hzR
aaO
aad
aaa
aaa
@@ -160116,13 +160235,13 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
aaO
aaO
aaO
abe
abC
gfJ
aaO
abf
aaO
aaO
@@ -160372,18 +160491,18 @@ hZh
hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
aaO
abe
naC
mVW
kmz
mVW
acb
fer
aiT
abZ
abp
abC
abC
abZ
abC
abC
abC
acV
@@ -160630,19 +160749,19 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
aaO
aaO
aaO
vcs
wpx
pIl
wlT
abq
abD
abD
abZ
abD
abD
chT
chT
chT
chT
chT
acW
adr
adr
@@ -160887,12 +161006,12 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aad
aaa
aaO
agk
iCO
iUI
aaO
abf
aaO
@@ -161144,14 +161263,14 @@ hZh
hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
qgU
aad
aad
aaO
aaO
abf
aaO
aaO
aad
aaa
aaa
aad
@@ -161402,12 +161521,12 @@ hZh
hZh
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aad
aad
aad
aad
aad
aad
aad
aad
aad
@@ -171733,7 +171852,7 @@ azy
aAG
aDb
aAG
aAG
acB
azy
azy
aAG
@@ -173015,7 +173134,7 @@ axk
ayB
azE
azE
aBZ
acz
azE
azE
azE
@@ -173271,9 +173390,9 @@ aoF
axl
ayC
azF
aAH
aCa
aCa
acy
aEf
aEf
aEf
aEf
aCa
@@ -173529,8 +173648,8 @@ axm
ayD
ayD
ayD
hdH
azD
acA
aEe
aaq
azD
kam
@@ -173787,7 +173906,7 @@ ayE
azG
aAI
aCb
aDf
aFk
avW
aFk
aGD
_maps/map_files/KiloStation/KiloStation.dmm
+33 -30
View File
@@ -14492,7 +14492,6 @@
/turf/open/floor/plating,
/area/maintenance/starboard)
"aym" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -14503,6 +14502,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"ayn" = (
@@ -48007,8 +48007,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/closet/wardrobe/mixed,
/obj/machinery/light/small,
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"bzo" = (
@@ -48767,7 +48768,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bAA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -48777,11 +48777,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/obj/machinery/firealarm{
dir = 8;
pixel_x = 26
@@ -49398,6 +49393,7 @@
dir = 1;
name = "recreation camera"
},
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bBy" = (
@@ -54797,11 +54793,6 @@
/area/hallway/secondary/exit/departure_lounge)
"bKn" = (
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -54810,6 +54801,11 @@
/obj/machinery/airalarm{
pixel_y = 22
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bKo" = (
@@ -55425,6 +55421,12 @@
pixel_x = 28;
pixel_y = 22
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bLd" = (
@@ -60844,6 +60846,11 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/structure/table,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTD" = (
@@ -61021,6 +61028,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTO" = (
@@ -61259,19 +61272,8 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/obj/effect/turf_decal/loading_area{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"bUi" = (
@@ -71325,15 +71327,16 @@
icon_gib = "magicarp_gib";
icon_living = "magicarp";
icon_state = "magicarp";
maxHealth = 200;
max_co2 = 5;
max_tox = 2;
maxHealth = 200;
melee_damage_lower = 15;
melee_damage_upper = 20;
min_oxy = 5;
name = "Lia";
real_name = "Lia";
response_help = "pets";
response_help_continuous = "pets";
response_help_simple = "pet";
turns_per_move = 10
},
/turf/open/floor/plasteel/dark,
@@ -85507,8 +85510,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop Out";
dir = 8
dir = 8;
name = "Space Loop Out"
},
/turf/open/floor/plating{
icon_state = "panelscorched"
_maps/map_files/LambdaStation/dorms.dmm
+3 -2
View File
@@ -10679,7 +10679,7 @@
light_color = "#e8eaff"
},
/obj/machinery/vending/wardrobe/jani_wardrobe{
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/clothing/suit/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
},
/turf/open/floor/plating,
/area/janitor)
@@ -13637,7 +13637,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"IX" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -13764,6 +13764,7 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"Jp" = (
_maps/map_files/LambdaStation/lambda.dmm
+105 -53
View File
@@ -19827,6 +19827,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/item/stack/ore/silver{
amount = 2
},
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aJC" = (
@@ -20222,6 +20225,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/item/stack/ore/iron,
/turf/open/floor/plasteel,
/area/quartermaster/miningoffice)
"aKq" = (
@@ -53981,8 +53985,8 @@
pixel_y = -26
},
/obj/structure/cable,
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/storage_shared)
"cvh" = (
@@ -63034,6 +63038,19 @@
/obj/item/assembly/flash/handheld,
/turf/open/floor/plating,
/area/storage/tech)
"cYI" = (
/obj/docking_port/stationary{
dir = 2;
dwidth = 3;
height = 5;
icon_state = "pinonfar";
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"dcB" = (
/obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4
@@ -63774,6 +63791,14 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"etv" = (
/obj/machinery/door/airlock/external/glass,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"euD" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms Server Room"
@@ -67057,12 +67082,12 @@
/area/engine/atmos)
"kgv" = (
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plasteel/stairs/old,
/area/maintenance/department/medical)
@@ -68221,6 +68246,20 @@
/obj/machinery/power/grounding_rod,
/turf/open/floor/plating/airless,
/area/engine/engineering)
"mnL" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/computer/shuttle/mining/common{
dir = 8
},
/obj/machinery/camera{
c_tag = "Arrivals Dock Public Mining";
dir = 1;
name = "arrivals camera"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"mqh" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -69098,16 +69137,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/toilet/auxiliary)
"ohk" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/structure/chair{
dir = 4
},
/obj/machinery/light,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ojZ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -69418,6 +69447,11 @@
},
/turf/open/floor/plating,
/area/maintenance/port)
"oTI" = (
/obj/machinery/door/airlock/external/glass,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"oUp" = (
/obj/structure/closet/crate,
/obj/item/stack/sheet/metal/fifty,
@@ -69460,6 +69494,16 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/toilet/auxiliary)
"oVP" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/table,
/obj/item/gps/mining{
gpstag = "MINE_PUB"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"oXg" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -69905,6 +69949,14 @@
},
/turf/open/floor/plasteel,
/area/engine/break_room)
"pPG" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/structure/table,
/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"pRv" = (
/obj/machinery/air_sensor{
id_tag = "tox_sensor"
@@ -71189,12 +71241,12 @@
"tcW" = (
/obj/structure/stairs/west,
/obj/structure/railing{
icon_state = "railing";
dir = 4
dir = 4;
icon_state = "railing"
},
/obj/structure/railing{
icon_state = "railing";
dir = 8
dir = 8;
icon_state = "railing"
},
/turf/open/floor/plating,
/area/maintenance/department/medical)
@@ -103741,10 +103793,10 @@ nNI
ngo
bQW
nNI
aav
aav
aab
aab
nNI
xMt
xMt
nNI
aab
aab
aab
@@ -103996,15 +104048,15 @@ gLI
ifC
jEO
uYv
ohk
uYv
uYv
jEO
jEO
cIu
nNI
xMt
xMt
nNI
aab
aav
aab
aab
aab
aab
aab
aab
aab
aab
@@ -104253,16 +104305,16 @@ rEw
iiC
jMW
rEw
rEw
rEw
rEw
rEw
cwD
xMt
aab
aav
aab
aab
aab
aab
aab
aab
oTI
cxe
cVf
etv
cYI
aab
aab
aab
@@ -104510,15 +104562,15 @@ cvp
iqD
jto
jto
cvI
jto
jto
pPG
oVP
mnL
nNI
xMt
aab
aav
aab
aab
aab
aab
aab
xMt
nNI
aab
aab
aab
@@ -104769,10 +104821,10 @@ xMt
cWd
nNI
nNI
aab
aav
aab
aab
nNI
xMt
xMt
nNI
aab
aab
aab
@@ -105027,7 +105079,7 @@ cJk
nNI
aab
aab
aav
aab
aab
aab
aab
_maps/map_files/MetaStation/MetaStation.dmm
+1060 -851
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/OmegaStation/OmegaStation.dmm
+5 -8
View File
@@ -15268,6 +15268,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"axG" = (
@@ -19618,9 +19621,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
@@ -19635,6 +19635,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEM" = (
@@ -24502,10 +24503,6 @@
/obj/effect/turf_decal/loading_area{
dir = 1
},
/obj/effect/turf_decal/stripes/corner,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
@@ -25146,13 +25143,13 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"aNg" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/sign/warning/nosmoking{
pixel_y = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/engineering)
"aNh" = (
_maps/map_files/PubbyStation/PubbyStation.dmm
+156 -88
View File
@@ -511,10 +511,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abi" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abj" = (
@@ -807,6 +807,11 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/fitness/pool)
"abU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/landmark/xmastree,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
"abV" = (
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel/white,
@@ -824,6 +829,13 @@
"abY" = (
/turf/open/floor/plasteel/white,
/area/ai_monitored/turret_protected/ai)
"abZ" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/landmark/xmastree,
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
"acc" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -24591,7 +24603,7 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beS" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beU" = (
@@ -32021,23 +32033,6 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
"bwq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Monastery Transit"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bwr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
name = "Monastery Transit"
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bws" = (
/obj/structure/closet,
/obj/item/stack/cable_coil/random,
@@ -32812,9 +32807,6 @@
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bxY" = (
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/hallway/secondary/entry)
"bxZ" = (
@@ -33559,6 +33551,9 @@
network = list("monastery");
pixel_x = 28
},
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/hallway/secondary/entry)
"bzC" = (
@@ -46854,7 +46849,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank,
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cdL" = (
@@ -47506,12 +47501,6 @@
},
/turf/open/floor/plasteel/dark,
/area/chapel/main/monastery)
"cgj" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sparsegrass,
/turf/open/floor/grass,
/area/hydroponics/garden/monastery)
"cgk" = (
/obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/sparsegrass,
@@ -53109,6 +53098,16 @@
/obj/structure/barricade/wooden,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"deJ" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/table,
/obj/item/gps/mining{
gpstag = "MINE_PUB"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"dgg" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -54469,8 +54468,8 @@
/area/maintenance/department/security/brig)
"gjv" = (
/obj/machinery/atmospherics/components/binary/pump/on{
name = "Space Loop In";
dir = 1
dir = 1;
name = "Space Loop In"
},
/turf/open/floor/plating,
/area/maintenance/department/science)
@@ -56534,12 +56533,6 @@
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"kIc" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plasteel/white{
heat_capacity = 1e+006
},
/area/hallway/secondary/entry)
"kIo" = (
/obj/structure/table,
/obj/item/paper_bin{
@@ -58350,6 +58343,18 @@
},
/turf/open/floor/plating,
/area/quartermaster/miningdock)
"oQm" = (
/obj/docking_port/stationary{
dir = 8;
dwidth = 3;
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
roundstart_template = /datum/map_template/shuttle/mining_common/meta;
width = 7
},
/turf/open/space/basic,
/area/space)
"oRX" = (
/obj/structure/closet,
/turf/open/floor/plating,
@@ -58645,6 +58650,15 @@
},
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/exit/departure_lounge)
"pqP" = (
/obj/machinery/door/airlock/external{
name = "Port Docking Bay 2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"prQ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -58707,9 +58721,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/medical/chemistry)
"pyw" = (
/turf/open/space/basic,
/area/hallway/secondary/entry)
"pzF" = (
/mob/living/simple_animal/opossum,
/turf/open/floor/wood,
@@ -58751,6 +58762,15 @@
},
/turf/open/floor/plasteel/dark,
/area/science/explab)
"pEH" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/chair/comfy{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"pEL" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -59118,6 +59138,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"qAx" = (
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"qAM" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/cigbutt,
@@ -59281,6 +59308,15 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"qRm" = (
/obj/machinery/door/airlock/external{
name = "Port Docking Bay 2"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/turf/open/floor/plating,
/area/hallway/secondary/entry)
"qTV" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -59997,6 +60033,14 @@
},
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"sIK" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/table,
/obj/item/flashlight,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"sJp" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
/obj/effect/turf_decal/stripes/line,
@@ -60896,6 +60940,10 @@
/obj/effect/turf_decal/plaque,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"uNA" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"uQR" = (
/obj/item/ammo_casing/shotgun/beanbag,
/turf/open/floor/plating,
@@ -61178,6 +61226,14 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"vzp" = (
/obj/effect/turf_decal/tile/brown,
/obj/item/stack/ore/iron,
/obj/item/stack/ore/silver{
amount = 2
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"vzz" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -61493,6 +61549,18 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
"wjQ" = (
/obj/machinery/computer/shuttle/mining/common{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"wkZ" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
@@ -79749,7 +79817,7 @@ cuE
cgK
cgJ
cgH
cgj
abZ
cvj
bWV
cfn
@@ -80466,7 +80534,7 @@ aaa
aaa
aaa
aaa
pyw
aaa
bsl
btL
aZx
@@ -80723,7 +80791,7 @@ aaa
aaa
aaa
aaa
pyw
aaa
aZx
bcX
aZx
@@ -81759,7 +81827,7 @@ aaa
aaa
aaa
aaa
aaa
oQm
aaa
aaa
aaa
@@ -82015,9 +82083,9 @@ aZx
aaa
aaa
aaa
aaa
aaa
aaa
aZx
pqP
aZx
aaa
aaa
aaa
@@ -82272,9 +82340,9 @@ aZx
aaa
aaa
aaa
aaa
aaa
aaa
aZx
bcX
aZx
aaa
aaa
aaa
@@ -82526,12 +82594,12 @@ aZx
bno
bon
aZx
aaa
aaa
aaa
aaa
aaa
aaa
aZx
aZx
aZx
aZx
qRm
aZx
aaa
aaa
aht
@@ -82781,15 +82849,15 @@ bbQ
bcX
bdV
bnp
bon
baK
pEH
deJ
sIK
wjQ
pEH
bbR
aZx
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aht
bBV
bDf
@@ -83038,15 +83106,15 @@ jzz
aZx
jzz
bnp
bon
aZx
aZx
aZx
aZx
aZx
baK
baK
baK
baK
baK
baK
baK
aZx
aaa
aht
bAI
abI
abI
@@ -83296,14 +83364,14 @@ bbR
bbR
bnp
baK
bbR
bbR
bbR
bbR
bbR
baK
baK
baK
baK
baK
baK
aZx
aZx
kIc
kIc
bAJ
bBX
bBX
@@ -83558,7 +83626,7 @@ baK
baK
baK
baK
aZx
baK
bxY
bzz
kGe
@@ -83815,7 +83883,7 @@ bbT
bbT
bbT
bbT
bwq
bbT
bxZ
bzA
bAK
@@ -84072,7 +84140,7 @@ bqS
bsm
btN
bfY
bwr
bfY
bya
bzB
bAL
@@ -94847,7 +94915,7 @@ aYg
aZd
beB
bbq
beB
abU
bdx
beB
bft
@@ -103588,7 +103656,7 @@ bbI
bcG
bdM
beP
bfH
vzp
bfH
bhv
bbI
@@ -104069,8 +104137,8 @@ aaY
awB
abe
abi
axw
axw
uNA
qAx
axw
axw
aBX
@@ -110784,7 +110852,7 @@ bcQ
aaa
aaa
aaa
abN
bBW
aaa
aEj
aEj
@@ -111041,7 +111109,7 @@ bcQ
aaa
aaa
aaa
aaa
cFB
aaa
aEl
bnl
_maps/map_files/Snaxi/Snaxi.dmm
+1 -1
View File
@@ -14395,7 +14395,6 @@
/obj/machinery/light{
dir = 1
},
/obj/structure/reagent_dispensers/fueltank,
/obj/machinery/camera{
c_tag = "Engineering Access"
},
@@ -14403,6 +14402,7 @@
name = "Station Intercom (General)";
pixel_y = 20
},
/obj/structure/reagent_dispensers/fueltank/high,
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
_maps/map_files/generic/CentCom.dmm
+1600 -1599
View File
File diff suppressed because it is too large Load Diff
_maps/multiz_debug.dm
+1 -1
View File
@@ -1 +1 @@
#define FORCE_MAP "_maps/multiz_debug.json"
#define FORCE_MAP "_maps/multiz_debug.json"
_maps/shuttles/emergency_nature.dmm
+14 -12
View File
@@ -33,8 +33,8 @@
"bg" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
pixel_y = 8;
pixel_x = -2
pixel_x = -2;
pixel_y = 8
},
/obj/item/storage/toolbox/electrical,
/obj/effect/turf_decal/stripes/line,
@@ -43,8 +43,8 @@
"bS" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/lights/mixed{
pixel_y = 9;
pixel_x = -5
pixel_x = -5;
pixel_y = 9
},
/obj/item/storage/box/matches{
pixel_y = 5
@@ -413,8 +413,8 @@
pixel_y = 4
},
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
pixel_y = 5;
pixel_x = 6
pixel_x = 6;
pixel_y = 5
},
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
@@ -494,8 +494,8 @@
/area/shuttle/escape)
"rg" = (
/obj/item/clothing/glasses/welding{
pixel_y = 8;
pixel_x = 3
pixel_x = 3;
pixel_y = 8
},
/obj/item/weldingtool/largetank{
pixel_x = -3
@@ -882,8 +882,8 @@
},
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
pixel_y = 10;
pixel_x = 5
pixel_x = 5;
pixel_y = 10
},
/obj/item/reagent_containers/food/snacks/cube/monkey{
pixel_x = 5
@@ -1156,8 +1156,8 @@
},
/obj/structure/table/glass,
/obj/item/clothing/suit/monkeysuit{
pixel_y = 4;
pixel_x = -2
pixel_x = -2;
pixel_y = 4
},
/obj/item/clothing/mask/gas/monkeymask{
pixel_x = 5;
@@ -1169,6 +1169,7 @@
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
},
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"ST" = (
@@ -1319,6 +1320,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency,
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"Yu" = (
_maps/shuttles/mining_common_kilo.dmm
+180
View File
@@ -0,0 +1,180 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/shuttle/mining/common,
/obj/effect/turf_decal/bot,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"e" = (
/obj/structure/table,
/obj/item/radio,
/obj/item/radio/intercom{
pixel_y = 22
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"f" = (
/obj/effect/turf_decal/stripes/end{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/mining)
"g" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/mining)
"h" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/mining)
"i" = (
/obj/structure/sign/nanotrasen,
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"j" = (
/obj/machinery/light{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"k" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/mining)
"l" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
/obj/machinery/atmospherics/components/binary/valve{
dir = 8
},
/turf/open/floor/mineral/titanium/yellow,
/area/shuttle/mining)
"m" = (
/obj/machinery/door/airlock/titanium{
name = "Lavaland Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining_shuttle_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
},
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/mining)
"n" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"o" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
/obj/machinery/airalarm{
dir = 4;
pixel_x = -22
},
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"p" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/shuttle/engine/heater,
/turf/open/floor/plating,
/area/shuttle/mining)
"q" = (
/obj/structure/ore_box,
/obj/effect/turf_decal/delivery,
/turf/open/floor/mineral/plastitanium,
/area/shuttle/mining)
"r" = (
/obj/structure/sign/warning/fire,
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"s" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
(1,1,1) = {"
a
a
b
i
b
a
a
"}
(2,1,1) = {"
a
c
f
j
n
o
r
"}
(3,1,1) = {"
b
d
g
k
n
p
s
"}
(4,1,1) = {"
a
e
h
l
n
q
r
"}
(5,1,1) = {"
a
a
b
m
b
a
a
"}
_maps/shuttles/mining_common_meta.dmm
+124
View File
@@ -0,0 +1,124 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/mining)
"b" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/mining)
"c" = (
/obj/structure/table,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"d" = (
/obj/machinery/computer/shuttle/mining/common,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"e" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"f" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"g" = (
/obj/machinery/light{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
"h" = (
/obj/machinery/door/airlock/titanium{
name = "Lavaland Shuttle Airlock"
},
/obj/docking_port/mobile{
dir = 8;
dwidth = 3;
height = 5;
id = "mining_shuttle_common";
name = "lavaland shuttle";
port_direction = 4;
width = 7
},
/turf/open/floor/plating,
/area/shuttle/mining)
"i" = (
/obj/structure/closet/crate,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"j" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1;
layer = 2.9
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/mining)
"k" = (
/obj/structure/ore_box,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/mining)
"l" = (
/obj/structure/shuttle/engine/propulsion/burst,
/turf/open/floor/plating/airless,
/area/shuttle/mining)
"Q" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/mining)
(1,1,1) = {"
a
a
b
a
b
a
a
"}
(2,1,1) = {"
a
c
e
g
f
i
a
"}
(3,1,1) = {"
b
d
Q
e
f
j
l
"}
(4,1,1) = {"
a
c
e
e
f
k
a
"}
(5,1,1) = {"
a
a
b
h
b
a
a
"}
_maps/shuttles/whiteship_box.dmm
+1
View File
@@ -1560,6 +1560,7 @@
/area/shuttle/abandoned/bridge)
"cc" = (
/obj/machinery/door/airlock/external,
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
_maps/templates/hilbertshotel.dmm
+1 -1
View File
@@ -72,7 +72,7 @@
/turf/open/indestructible/hotelwood,
/area/hilbertshotel)
"n" = (
/obj/effect/landmark/xmastree,
/obj/effect/landmark/xmastree/hilbert,
/turf/open/indestructible/hotelwood,
/area/hilbertshotel)
"o" = (