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

Final Fix For Conflicts

Browse Source
This commit is contained in:
TheFurryFeline
2021-04-18 11:59:03 -04:00
parent 58ee0327a7
commit fed2f9f393
1 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/tether-07-station3.dmm
+80 -43
View File
@@ -1566,12 +1566,9 @@
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"add" = (
/obj/structure/toilet,
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
/obj/machinery/button/remote/airlock,
/turf/simulated/floor/tiled,
/area/security/hallwayaux)
"ade" = (
/obj/machinery/door/airlock/glass_security{
name = "Break Room";
@@ -3488,13 +3485,59 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/excursion/general)
"agq" = (
/obj/machinery/button/remote/airlock,
/turf/simulated/wall,
/area/security/breakroom)
"agr" = (
/obj/structure/toilet,
/obj/machinery/light/small{
dir = 1
},
/obj/machinery/button/remote/airlock{
id = "bathroomlock27";
name = "Security Toilet Lock";
pixel_x = -20;
pixel_y = -10;
specialfunctions = 4
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
"ags" = (
/obj/machinery/door/airlock/security{
id_tag = "bathroomlock27";
name = "Security Restroom";
req_one_access = list(1,38)
},
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
"agt" = (
/obj/machinery/atmospherics/unary/engine{
dir = 1
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/general)
"agr" = (
"agu" = (
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/button/remote/airlock{
id = "bathroomlock28";
name = "Medical Toilet Lock";
pixel_x = -20;
pixel_y = -10;
specialfunctions = 4
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"agv" = (
/obj/machinery/door/airlock/medical{
id_tag = "bathroomlock28";
name = "Rest Room"
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"agw" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
@@ -3502,21 +3545,6 @@
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
"ags" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
"agt" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
"agx" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
frequency = 1379;
@@ -3531,6 +3559,21 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/excursion/general)
"agz" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
"agA" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
},
/turf/simulated/floor/tiled/asteroid_steel/airless,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/mining_outpost/shuttle)
"agJ" = (
/turf/simulated/mineral/vacuum,
/area/maintenance/station/ai)
@@ -21056,12 +21099,6 @@
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"aZx" = (
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"aZy" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 1
@@ -31353,8 +31390,8 @@ aab
aab
aKE
aQf
aZx
aMd
agu
agv
aZu
aTf
aKE
@@ -33998,8 +34035,8 @@ aSa
iUO
ain
abu
aiR
aYT
add
agq
ajp
ajC
anY
@@ -34568,8 +34605,8 @@ abz
abw
aaB
adS
add
aSX
agr
ags
aST
aew
aUT
@@ -36136,7 +36173,7 @@ aUJ
aXb
afT
aez
agq
agt
ams
aXq
abe
@@ -36278,7 +36315,7 @@ wRt
eug
afT
aeG
agq
agt
ams
aXq
abe
@@ -37414,7 +37451,7 @@ ikk
efQ
wPF
aeG
agq
agt
ams
aSx
krj
@@ -37556,7 +37593,7 @@ iEV
tEV
xiw
aeH
agq
agt
ams
eAm
abe
@@ -39593,11 +39630,11 @@ avt
avt
adD
aZS
agr
ags
ags
ags
agt
agw
agz
agz
agz
agA
baB
adD
avt