cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes metastation's broken tinted windows + misc map fixes (#19491)

Browse Source 
* Fixes metastation's broken tinted windows + misc map fixes

* every kind of touch
This commit is contained in:
Joan Lung
2016-07-26 16:32:37 -04:00
committed by oranges
parent d11793d909
commit 8b34590623
3 changed files with 74 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -9989,12 +9989,7 @@
/area/crew_quarters/sleep)
"arM" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
@@ -11593,12 +11588,7 @@
/area/security/main)
"aul" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/security/main)
"aum" = (
@@ -11952,15 +11942,10 @@
})
"auV" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/maintenance/fpmaint2{
name = "Port Maintenance"
@@ -21513,12 +21498,7 @@
/area/crew_quarters/sleep)
"aLa" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/crew_quarters/sleep)
@@ -22997,12 +22977,7 @@
/area/crew_quarters/locker)
"aOa" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/hallway/secondary/construction{
name = "\improper Garden"
@@ -24535,12 +24510,7 @@
/area/crew_quarters/locker)
"aQR" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -25095,12 +25065,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/crew_quarters/courtroom)
"aRP" = (
@@ -26574,12 +26539,7 @@
/area/hallway/primary/fore)
"aUz" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/crew_quarters/courtroom)
"aUA" = (
@@ -27082,25 +27042,15 @@
})
"aVu" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/hallway/secondary/entry{
name = "Arrivals"
})
"aVv" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/hallway/secondary/entry{
name = "Arrivals"
@@ -34397,11 +34347,10 @@
/turf/open/floor/plating,
/area/engine/break_room)
"bhJ" = (
/turf/open/floor/plating,
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/turf/closed/wall/mineral/titanium/interior,
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_4)
"bhK" = (
/turf/closed/wall/mineral/titanium,
@@ -69112,12 +69061,7 @@
"cpa" = (
/obj/structure/grille,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plating,
/area/medical/research{
name = "Research Division"
@@ -77788,12 +77732,7 @@
})
"cDj" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -85841,12 +85780,7 @@
/area/chapel/office)
"cQv" = (
/obj/structure/grille,
/obj/structure/window/reinforced/tinted{
dir = 5;
health = 120;
icon_state = "twindow";
reinf = 0
},
/obj/structure/window/reinforced/tinted/fulltile,
/turf/open/floor/plasteel/black,
/area/chapel/office)
"cQw" = (
@@ -116465,10 +116399,10 @@ ahj
agw
avc
avc
awg
atU
avc
avc
awg
atU
avc
avc
avc
@@ -132120,9 +132054,9 @@ aaa
aaa
aaa
aaa
aaf
aaf
aai
aaa
aaa
ado
adM
ado
@@ -132377,10 +132311,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aag
aaa
aaa
aaa
bjU
aaa
aeJ
@@ -132634,10 +132568,10 @@ aaa
aaa
aaa
aaa
aaa
aaa
aai
aaf
aaf
aaf
aai
aaf
aeI
@@ -137821,11 +137755,11 @@ ayr
ayo
bdf
aBZ
aaf
bhL
aaa
bhK
bjV
bhL
aaf
bhK
aaa
aaf
brt
aaf
@@ -138083,7 +138017,7 @@ aaa
cYF
aaa
aaf
aaa
aaf
brt
aaa
aaf

88
_maps/map_files/TgStation/tgstation.2.1.3.dmm
View File

@@ -58478,7 +58478,7 @@
name = "Emergency Shuttle Airlock";
req_access_txt = "2"
},
/turf/open/floor/mineral/plastitanium/brig,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"cxh" = (
/obj/structure/chair{
@@ -68917,11 +68917,11 @@ aaa
aaf
aaa
aaa
aCT
aCS
aCV
aCV
aCV
aCT
aCS
aaa
aaa
aaf
@@ -69416,11 +69416,11 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
aaa
aaa
aaa
@@ -69673,10 +69673,10 @@ aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaa
aaa
aaa
aaa
arB
asE
asE
@@ -69687,13 +69687,13 @@ awW
asE
arB
aaa
aCT
aCS
aCS
aCS
aHs
aCS
aCS
aCT
aCS
aaa
arB
asE
@@ -71729,10 +71729,10 @@ aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaa
aaa
aaa
aaa
arB
asE
asE
@@ -71986,9 +71986,9 @@ aaa
aaa
aaa
aaa
aaa
aaa
aaa
aaf
aaf
aaf
aaf
aaf
alU
@@ -72514,13 +72514,13 @@ ayo
azB
awW
aaa
aCT
aCS
aEx
aFF
aFF
aFF
aKi
aCT
aCS
aaa
awW
aPt
@@ -82518,10 +82518,10 @@ aaa
aaa
akD
akD
alk
ajX
akD
akD
alk
ajX
akD
akD
akD
@@ -94695,7 +94695,7 @@ cpd
czL
cpd
ccw
aaa
aaf
aaa
aaa
aaf
@@ -94947,12 +94947,12 @@ clb
clY
clZ
bOh
aaf
aaa
cpd
cpM
cpd
aaf
aaa
aaf
aaa
aaa
aaf
@@ -95204,12 +95204,12 @@ cla
cBP
cmW
bOh
aaf
aaa
aaa
czN
aaa
aaf
aaa
aaf
aaa
aaa
aaf
@@ -95461,14 +95461,14 @@ clc
clZ
clZ
bOh
aaf
aaa
aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaf
aaf
cso
@@ -95718,14 +95718,14 @@ bOh
bOh
bOh
bOh
aaf
aaa
aaa
aaa
aaa
aaa
aaf
aaa
aaa
aaa
aaf
aaa
csn
@@ -95973,13 +95973,13 @@ apQ
aoV
aoV
apQ
aoV
aoV
apQ
apQ
aoV
aoV
aoV
apQ
aoV
aoV
aoV
aaa
aaa
@@ -96230,13 +96230,13 @@ aoV
aoV
aoV
apQ
aoV
apQ
apQ
aoV
aoV
aoV
apQ
aoV
aoV
aoV
aoV
aaa
aaa
@@ -96487,8 +96487,8 @@ aoV
aoV
aoV
apQ
apQ
apQ
aoV
aoV
aoV
aoV
aoV
@@ -96744,7 +96744,7 @@ aoV
aoV
aoV
apQ
apQ
aoV
aoV
aoV
aoV
@@ -112873,7 +112873,7 @@ cwI
crx
cxf
crx
cwI
cxm
cwL
cxr
cxr

9
_maps/shuttles/emergency_box.dmm
View File

@@ -196,7 +196,7 @@
name = "Emergency Shuttle Airlock";
req_access_txt = "2"
},
/turf/open/floor/mineral/plastitanium/brig,
/turf/open/floor/plating,
/area/shuttle/escape)
"aJ" = (
/obj/structure/chair{
@@ -369,10 +369,7 @@
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"bj" = (
/turf/closed/wall/shuttle{
icon_state = "swall_s9";
dir = 2
},
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape)
"bk" = (
/obj/structure/shuttle/engine/propulsion,
@@ -484,7 +481,7 @@ ak
ac
aH
ac
ak
bj
an
aT
aT