Merge remote-tracking branch 'origin/master' into TGUI-3.0

This commit is contained in:
Artur
2020-06-09 11:07:39 +03:00
177 changed files with 249863 additions and 2481 deletions
+74 -63
View File
@@ -23380,7 +23380,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
/obj/item/paper/guides/cogstation/letter_sec,
/obj/item/paper/fluff/cogstation/secsolars,
/turf/open/floor/plasteel,
/area/security/main)
"aYJ" = (
@@ -27342,13 +27342,16 @@
/turf/open/floor/plasteel,
/area/security/courtroom)
"bhA" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/trunk{
dir = 4
/obj/item/stack/cable_coil/red,
/obj/item/multitool,
/obj/item/wrench,
/obj/item/stack/sheet/metal/five{
pixel_x = 6;
pixel_y = -6
},
/turf/open/floor/plasteel,
/area/quartermaster/sorting)
/obj/item/paper/fluff/cogstation/letter_arrd,
/turf/open/floor/plating,
/area/maintenance/disposal)
"bhB" = (
/obj/structure/table/wood,
/obj/item/stack/packageWrap,
@@ -28343,6 +28346,7 @@
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/obj/item/paper/guides/cogstation/letter_atmos,
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
@@ -34940,15 +34944,19 @@
},
/area/maintenance/disposal)
"bxz" = (
/obj/item/stack/cable_coil/red,
/obj/item/multitool,
/obj/item/wrench,
/obj/item/stack/sheet/metal/five{
pixel_x = 6;
pixel_y = -6
/obj/effect/turf_decal/tile/yellow{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/disposal)
/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/safety_eye_protection{
pixel_y = 32
},
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/item/paper/guides/cogstation/letter_eng,
/turf/open/floor/plasteel,
/area/engine/break_room)
"bxA" = (
/obj/machinery/announcement_system,
/turf/open/floor/plasteel/dark,
@@ -43875,14 +43883,19 @@
/turf/open/floor/plasteel/dark,
/area/science/robotics/lab)
"bQq" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
icon_state = "4-8"
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
/obj/effect/turf_decal/tile/yellow,
/obj/structure/table/wood,
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/item/modular_computer/laptop/preset/civilian,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/item/paper/guides/cogstation/letter_atmos,
/turf/open/floor/plasteel,
/area/engine/break_room)
"bQr" = (
@@ -51737,27 +51750,17 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"cfU" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/purple{
dir = 4
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/turf_decal/tile/purple{
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow,
/obj/item/clothing/gloves/color/latex,
/obj/item/book/manual/wiki/cit/chem_recipies,
/obj/item/book/manual/wiki/cit/chemistry{
pixel_x = 2;
pixel_y = -3
},
/obj/item/reagent_containers/dropper,
/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
/obj/item/beacon,
/turf/open/floor/plasteel,
/area/engine/break_room)
"cfV" = (
/obj/machinery/door/airlock/external{
name = "Atmospherics External Airlock";
@@ -57026,18 +57029,18 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cqt" = (
/obj/effect/turf_decal/tile/yellow{
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/computer/station_alert,
/obj/structure/sign/poster/official/safety_eye_protection{
pixel_y = 32
},
/obj/effect/turf_decal/tile/red{
dir = 1
/obj/structure/noticeboard/qm{
dir = 4;
icon_state = "nboard00";
pixel_x = -32
},
/turf/open/floor/plasteel,
/area/engine/break_room)
/area/quartermaster/sorting)
"cqu" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -57106,20 +57109,28 @@
/turf/open/floor/plasteel,
/area/engine/break_room)
"cqz" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/effect/turf_decal/tile/yellow{
dir = 1
},
/obj/effect/turf_decal/tile/yellow,
/obj/structure/table/wood,
/obj/machinery/airalarm{
pixel_y = 24
/obj/item/clothing/gloves/color/latex,
/obj/item/book/manual/wiki/cit/chem_recipies,
/obj/item/book/manual/wiki/cit/chemistry{
pixel_x = 2;
pixel_y = -3
},
/obj/item/modular_computer/laptop/preset/civilian,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel,
/area/engine/break_room)
/obj/machinery/atmospherics/pipe/manifold/orange/hidden,
/obj/item/paper/fluff/cogstation/chemists,
/obj/item/reagent_containers/dropper,
/turf/open/floor/plasteel/white,
/area/medical/chemistry)
"cqA" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -96465,7 +96476,7 @@ bBQ
csV
bIe
bYB
cfU
cqz
bIM
cvt
cmS
@@ -109285,7 +109296,7 @@ asR
aSK
aSr
aeI
cqt
bxz
bwP
cBn
cBH
@@ -110315,7 +110326,7 @@ aUf
aeI
bnp
cmO
bQq
cfU
cmm
cri
cdH
@@ -111598,7 +111609,7 @@ aRR
cpj
aSr
aeI
cqz
bQq
cqI
bQM
cdl
@@ -114945,7 +114956,7 @@ bbV
bjf
bkh
blu
bbV
ciI
ccZ
cgs
cxo
@@ -116742,7 +116753,7 @@ cPH
bfU
bFD
bgO
bhA
cqt
bUQ
cvj
cDg
@@ -117990,7 +118001,7 @@ bwb
aMs
cAb
cAl
bxz
bhA
bgP
bzO
caD
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+224
View File
@@ -0,0 +1,224 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/arrival)
"c" = (
/obj/machinery/door/airlock/titanium{
name = "Arrivals Shuttle Airlock"
},
/obj/structure/fans/tiny,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"d" = (
/obj/effect/spawner/structure/window/shuttle,
/turf/open/floor/plating,
/area/shuttle/arrival)
"e" = (
/obj/structure/closet/wardrobe/black,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"f" = (
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"g" = (
/obj/machinery/computer/arcade,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"h" = (
/obj/structure/closet/wardrobe/grey,
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"i" = (
/obj/structure/closet/wardrobe/green,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"j" = (
/obj/machinery/requests_console{
department = "Arrival shuttle";
name = "Arrivals Shuttle console";
pixel_y = 30
},
/obj/machinery/light{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"k" = (
/obj/structure/shuttle/engine/heater{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"m" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"n" = (
/obj/docking_port/mobile/arrivals{
name = "Snaxi Arrivals Shuttle"
},
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
"o" = (
/obj/structure/table,
/obj/item/storage/firstaid/regular,
/obj/machinery/light/small,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"p" = (
/obj/structure/table,
/obj/item/storage/toolbox/emergency,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"q" = (
/obj/machinery/light,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"r" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/arrival)
"s" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
pixel_y = -29
},
/obj/machinery/light,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"x" = (
/obj/structure/closet/emcloset,
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/arrival)
"z" = (
/obj/structure/shuttle/engine/propulsion/burst/right{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/arrival)
(1,1,1) = {"
a
b
d
d
d
b
a
"}
(2,1,1) = {"
b
b
r
r
r
b
b
"}
(3,1,1) = {"
b
h
f
f
f
o
b
"}
(4,1,1) = {"
b
i
r
r
r
p
b
"}
(5,1,1) = {"
b
e
f
f
f
x
b
"}
(6,1,1) = {"
b
m
r
r
r
q
b
"}
(7,1,1) = {"
d
g
f
f
f
f
d
"}
(8,1,1) = {"
c
f
r
r
r
f
c
"}
(9,1,1) = {"
c
f
f
f
f
f
c
"}
(10,1,1) = {"
b
j
r
r
r
s
b
"}
(11,1,1) = {"
b
k
k
k
k
k
b
"}
(12,1,1) = {"
b
z
z
n
z
z
b
"}
+39 -13
View File
@@ -342,11 +342,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aN" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aO" = (
/obj/structure/chair/comfy/shuttle{
dir = 4;
@@ -385,8 +380,9 @@
/turf/open/floor/mineral/plastitanium,
/area/shuttle/syndicate/eva)
"aS" = (
/obj/structure/tank_dispenser/oxygen,
/obj/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"aT" = (
@@ -1172,15 +1168,37 @@
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/armory)
"gZ" = (
/obj/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"pd" = (
/obj/machinery/porta_turret/syndicate/shuttle{
dir = 5
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/bridge)
"vv" = (
/obj/structure/reagent_dispensers/fueltank,
"qk" = (
/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/effect/turf_decal/bot_white,
/obj/vehicle/ridden/atv/snowmobile,
/obj/item/key,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"vv" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/tank_dispenser/oxygen,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/eva)
"In" = (
@@ -1195,6 +1213,14 @@
},
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/medical)
"Sz" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
(1,1,1) = {"
aa
@@ -1330,7 +1356,7 @@ ac
ad
aa
ax
aN
aS
aS
aU
aZ
@@ -1480,7 +1506,7 @@ ac
In
aa
aB
aO
gZ
aO
aX
bc
@@ -1505,7 +1531,7 @@ ac
aa
aa
aB
aP
qk
aP
aP
aP
@@ -1530,7 +1556,7 @@ aa
aa
aa
aB
aP
qk
aP
aP
aP
@@ -1587,7 +1613,7 @@ bd
aB
bm
bB
bG
Sz
bQ
bX
ci
+116
View File
@@ -0,0 +1,116 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/snowtaxi)
"b" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/obj/structure/window/reinforced{
dir = 8
},
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"c" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"e" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"f" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"g" = (
/obj/machinery/door/airlock/titanium{
name = "Mining Shuttle Airlock"
},
/obj/docking_port/mobile{
dwidth = 3;
height = 4;
id = "snow_taxi";
name = "snow taxi";
port_direction = 8;
width = 6
},
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 1
},
/obj/structure/fans/tiny,
/turf/open/floor/plating,
/area/shuttle/snowtaxi)
"i" = (
/obj/machinery/light,
/obj/machinery/computer/shuttle/snow_taxi{
dir = 4
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"j" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"k" = (
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
"l" = (
/obj/effect/spawner/structure/window/shuttle,
/obj/structure/fans/tiny/invisible,
/turf/open/floor/plating/airless,
/area/shuttle/snowtaxi)
"u" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/mineral/titanium,
/area/shuttle/snowtaxi)
(1,1,1) = {"
a
e
e
a
"}
(2,1,1) = {"
a
f
i
a
"}
(3,1,1) = {"
e
u
j
l
"}
(4,1,1) = {"
c
k
k
g
"}
(5,1,1) = {"
a
u
j
a
"}
(6,1,1) = {"
a
b
b
a
"}
+1
View File
@@ -0,0 +1 @@
#define FORCE_MAP "_maps/snaxi.json"
+49
View File
@@ -0,0 +1,49 @@
{
"map_name":"Snow Taxi",
"map_path":"map_files/Snaxi",
"map_file":[
"IcemoonUnderground_Below.dmm",
"IcemoonUnderground_Above.dmm",
"Snaxi.dmm"
],
"station_ruin_budget":0,
"space_ruin_levels":0,
"space_empty_levels":0,
"shuttles":{
"cargo":"cargo_box",
"ferry":"ferry_fancy",
"whiteship":"whiteship_box",
"emergency":"emergency_box"
},
"traits":[
{
"Up":1,
"Station":0,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
"Baseturf":"/turf/open/lava/plasma/ice_moon"
},
{
"Down":-1,
"Up":1,
"Station":0,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins Underground":true,
"Baseturf":"/turf/open/openspace/icemoon"
},
{
"Down":-1,
"Mining":true,
"Linkage":null,
"Gravity":true,
"Ice Ruins":true,
"Weather_Snowstorm":true,
"Baseturf":"/turf/open/floor/plating/asteroid/snow/icemoon"
}
],
"minetype":"none"
}