cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8750 from VictorZisthus/VictorZisthus/Maptweaks

Browse Source 
Talon Bugfixes and QOL
This commit is contained in:
Novacat
2020-08-21 01:45:08 -04:00
committed by GitHub
parent 4374731142 50f334ba28
commit 2636620dce
2 changed files with 592 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/submaps/offmap/talon1.dmm
+465 -353
View File
File diff suppressed because it is too large Load Diff
maps/tether/submaps/offmap/talon2.dmm
+127 -79
View File
@@ -114,11 +114,21 @@
dir = 1;
icon_state = "map_connector-aux"
},
/obj/machinery/portable_atmospherics/canister/air/airlock{
start_pressure = 4559.63
},
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_aft)
"ar" = (
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0
},
/turf/simulated/floor/wood,
/area/talon/decktwo/eng_room)
"as" = (
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0
},
/turf/simulated/floor/wood,
/area/talon/decktwo/pilot_room)
"at" = (
/turf/simulated/floor/tiled/eris/steel,
/area/talon/decktwo/central_hallway)
@@ -185,6 +195,18 @@
"aC" = (
/turf/simulated/wall,
/area/talon/decktwo/cap_room)
"aD" = (
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0
},
/turf/simulated/floor/wood,
/area/talon/decktwo/med_room)
"aE" = (
/obj/structure/closet/secure_closet/personal/cabinet{
locked = 0
},
/turf/simulated/floor/wood,
/area/talon/decktwo/sec_room)
"aF" = (
/obj/structure/bed/chair/bay/chair,
/turf/simulated/floor/wood,
@@ -203,6 +225,29 @@
},
/turf/simulated/floor/tiled/eris/white,
/area/talon/decktwo/central_hallway)
"aI" = (
/obj/structure/catwalk,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/small{
dir = 4;
pixel_y = 0
},
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_port)
"aJ" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
dir = 4
},
/obj/structure/catwalk,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_aft)
"aK" = (
/turf/simulated/floor/carpet/blucarpet,
/area/talon/decktwo/cap_room)
@@ -217,6 +262,39 @@
"aM" = (
/turf/simulated/floor/wood,
/area/talon/decktwo/cap_room)
"aN" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atm{
pixel_x = 32;
step_x = 0
},
/turf/simulated/floor/tiled/eris/steel,
/area/talon/decktwo/central_hallway)
"aO" = (
/obj/machinery/airlock_sensor{
dir = 4;
pixel_x = -28;
req_one_access = list(301)
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
dir = 8;
id_tag = "talon_aft_solar";
pixel_x = 28;
req_one_access = list(301)
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{
dir = 1
},
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_aft)
"aP" = (
/obj/machinery/alarm/talon{
dir = 4;
@@ -230,12 +308,38 @@
"aQ" = (
/turf/simulated/floor/wood,
/area/talon/decktwo/bar)
"aV" = (
"aR" = (
/obj/structure/handrail{
dir = 1
},
/turf/simulated/floor/hull/airless,
/area/talon/maintenance/decktwo_solars)
"aS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9;
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/vending/food{
dir = 1
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/talon/decktwo/bar)
"aT" = (
/obj/machinery/vending/coffee{
dir = 1
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/talon/decktwo/bar)
"aU" = (
/obj/machinery/vending/dinnerware{
dir = 1;
icon_state = "dinnerware"
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/talon/decktwo/bar)
"aX" = (
/obj/structure/bed/chair/bay/chair{
dir = 1;
@@ -560,13 +664,6 @@
},
/turf/simulated/open,
/area/talon/decktwo/central_hallway)
"cn" = (
/obj/machinery/vending/dinnerware{
dir = 1;
icon_state = "dinnerware"
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/talon/decktwo/bar)
"cp" = (
/obj/structure/lattice,
/obj/structure/cable/green{
@@ -991,10 +1088,6 @@
},
/turf/simulated/floor/wood,
/area/talon/decktwo/eng_room)
"eE" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/simulated/floor/wood,
/area/talon/decktwo/eng_room)
"eF" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -1022,10 +1115,6 @@
/obj/structure/closet/secure_closet/talon_pilot,
/turf/simulated/floor/wood,
/area/talon/decktwo/pilot_room)
"eJ" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/simulated/floor/wood,
/area/talon/decktwo/pilot_room)
"eK" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -1346,10 +1435,6 @@
},
/turf/simulated/floor/wood,
/area/talon/decktwo/med_room)
"ga" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/simulated/floor/wood,
/area/talon/decktwo/med_room)
"gb" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -1364,10 +1449,6 @@
/obj/structure/closet/secure_closet/talon_guard,
/turf/simulated/floor/wood,
/area/talon/decktwo/sec_room)
"gd" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/turf/simulated/floor/wood,
/area/talon/decktwo/sec_room)
"ge" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -2265,19 +2346,6 @@
},
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_aft)
"rz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9;
pixel_y = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
/obj/machinery/vending/food{
dir = 1
},
/turf/simulated/floor/tiled/eris/steel/gray_perforated,
/area/talon/decktwo/bar)
"rA" = (
/obj/structure/cable/yellow{
d1 = 2;
@@ -2309,26 +2377,6 @@
},
/turf/simulated/floor/tiled/eris/steel,
/area/talon/decktwo/central_hallway)
"rJ" = (
/obj/machinery/airlock_sensor{
dir = 4;
pixel_x = -28;
req_one_access = list(301)
},
/obj/machinery/atmospherics/unary/vent_pump/aux{
dir = 1;
icon_state = "map_vent_aux"
},
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
dir = 8;
id_tag = "talon_aft_solar";
pixel_x = 28;
req_one_access = list(301)
},
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/effect/map_helper/airlock/sensor/chamber_sensor,
/turf/simulated/floor/plating/eris/under,
/area/talon/maintenance/decktwo_aft)
"rQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12990,7 +13038,7 @@ Qt
lx
lx
lx
lx
aI
lx
lx
lx
@@ -13281,7 +13329,7 @@ cc
gZ
gZ
hu
WG
aJ
mm
ht
ao
@@ -13385,7 +13433,7 @@ aa
aa
aa
pi
pi
aR
ap
ap
ap
@@ -13833,13 +13881,13 @@ dz
dM
ea
eo
eE
ar
dr
eV
fm
fA
fN
ga
aD
eT
gn
gn
@@ -14525,7 +14573,7 @@ As
dX
ay
Rm
Gq
aN
Gq
Af
Gq
@@ -14561,7 +14609,7 @@ gC
gT
gS
nj
rJ
aO
pt
DT
pi
@@ -15100,7 +15148,7 @@ WS
VZ
bI
Uf
rz
aS
aw
cl
cz
@@ -15242,7 +15290,7 @@ Zn
UY
aQ
vB
aV
aT
aw
cl
cz
@@ -15253,13 +15301,13 @@ dH
dU
eh
ew
eJ
as
du
fb
fs
fG
fT
gd
aE
eZ
gn
gn
@@ -15384,7 +15432,7 @@ UY
ZF
bJ
bP
cn
aU
aw
ck
cy
@@ -15656,8 +15704,8 @@ aa
aa
aa
aa
aa
aa
pi
aR
ax
ax
ax
@@ -15798,8 +15846,8 @@ aa
aa
aa
aa
aa
aa
pi
pi
pi
pi
pi
@@ -15940,8 +15988,8 @@ aa
aa
aa
aa
aa
aa
pi
pi
pi
pi
pi
@@ -16114,7 +16162,7 @@ Az
QA
QA
QA
QA
AX
QA
QA
QA