Skip to content

Commit 10b3168

Browse files
authored
Adding more tramstation areas/bar touchups (#5050)
* Pass 1 of renaming disease/advanced * Revert "Pass 1 of renaming disease/advanced" This reverts commit bb43f9f. * Bar Update! Removes double walls/airlocks on most versions * replacing 'station asteriod' * Adding more navigation locations * Sanctuary APC
1 parent 95a94c3 commit 10b3168

File tree

9 files changed

+3573
-3108
lines changed

9 files changed

+3573
-3108
lines changed

_maps/map_files/tramstation/tramstation.dmm

Lines changed: 3193 additions & 2720 deletions
Large diffs are not rendered by default.

_maps/~monkestation/RandomBars/Tram/tram_bar_base.dmm

Lines changed: 103 additions & 125 deletions
Large diffs are not rendered by default.

_maps/~monkestation/RandomBars/Tram/tram_bar_biodome.dmm

Lines changed: 58 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
/area/station/commons/lounge)
8080
"bP" = (
8181
/obj/structure/table/wood,
82-
/obj/item/instrument/violin,
82+
/obj/item/clothing/glasses/eyepatch,
8383
/turf/open/misc/snow/actually_safe,
8484
/area/station/service/theater)
8585
"bX" = (
@@ -110,8 +110,12 @@
110110
/turf/open/misc/snow/actually_safe,
111111
/area/station/service/theater)
112112
"cu" = (
113-
/turf/closed/wall/mineral/wood,
114-
/area/station/maintenance/department/security)
113+
/obj/structure/table/wood,
114+
/obj/item/staff/broom,
115+
/obj/item/clothing/head/costume/sombrero/green,
116+
/obj/item/radio/intercom/directional/east,
117+
/turf/open/misc/snow/actually_safe,
118+
/area/station/service/theater)
115119
"cA" = (
116120
/obj/structure/table/wood,
117121
/obj/machinery/processor{
@@ -699,12 +703,6 @@
699703
/obj/structure/window/reinforced/spawner/directional/west,
700704
/turf/open/misc/snow/actually_safe,
701705
/area/station/service/theater)
702-
"qE" = (
703-
/obj/structure/table/wood,
704-
/obj/item/staff/broom,
705-
/obj/item/clothing/head/costume/sombrero/green,
706-
/turf/open/misc/snow/actually_safe,
707-
/area/station/service/theater)
708706
"qF" = (
709707
/obj/structure/chair/stool/bar/directional/east,
710708
/obj/structure/disposalpipe/segment,
@@ -714,18 +712,12 @@
714712
/turf/open/floor/wood,
715713
/area/station/commons/lounge)
716714
"qQ" = (
717-
/obj/machinery/door/airlock/maintenance_hatch{
718-
name = "Theatre Maintenance Hatch"
719-
},
720-
/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
721-
/obj/effect/mapping_helpers/airlock/unres{
722-
dir = 4
723-
},
724715
/obj/structure/cable,
725716
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
726717
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
718+
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/east_offset,
727719
/turf/open/misc/snow/actually_safe,
728-
/area/station/maintenance/department/cargo)
720+
/area/station/service/theater)
729721
"qR" = (
730722
/obj/structure/cable,
731723
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -960,8 +952,11 @@
960952
/turf/open/openspace,
961953
/area/station/service/kitchen)
962954
"yp" = (
963-
/turf/closed/wall/r_wall,
964-
/area/station/maintenance/department/security)
955+
/obj/structure/table/wood,
956+
/obj/item/instrument/violin,
957+
/obj/machinery/light/warm/directional/east,
958+
/turf/open/misc/snow/actually_safe,
959+
/area/station/service/theater)
965960
"yE" = (
966961
/obj/machinery/power/apc/auto_name/directional/west,
967962
/obj/structure/cable,
@@ -1564,13 +1559,6 @@
15641559
/obj/effect/landmark/start/hangover,
15651560
/turf/open/misc/snow/actually_safe,
15661561
/area/station/service/kitchen)
1567-
"KW" = (
1568-
/obj/machinery/camera/directional/east{
1569-
c_tag = "Civilian - Theatre Stage"
1570-
},
1571-
/obj/item/radio/intercom/directional/east,
1572-
/turf/open/misc/snow/actually_safe,
1573-
/area/station/service/theater)
15741562
"Lh" = (
15751563
/obj/structure/dresser,
15761564
/turf/open/floor/pod/light,
@@ -1990,9 +1978,9 @@
19901978
/turf/open/floor/pod/light,
19911979
/area/station/commons/lounge)
19921980
"Vs" = (
1993-
/obj/structure/table/wood,
1994-
/obj/machinery/light/warm/directional/east,
1995-
/obj/item/clothing/glasses/eyepatch,
1981+
/obj/machinery/camera/directional/east{
1982+
c_tag = "Civilian - Theatre Stage"
1983+
},
19961984
/turf/open/misc/snow/actually_safe,
19971985
/area/station/service/theater)
19981986
"VL" = (
@@ -2067,7 +2055,7 @@
20672055
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
20682056
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
20692057
/turf/open/floor/catwalk_floor,
2070-
/area/station/maintenance/department/security)
2058+
/area/station/commons/lounge)
20712059
"WW" = (
20722060
/obj/machinery/navbeacon{
20732061
codes_txt = "delivery;dir=2";
@@ -2096,7 +2084,7 @@
20962084
name = "navigation beacon (Bar Delivery)"
20972085
},
20982086
/turf/open/misc/snow/actually_safe,
2099-
/area/station/maintenance/department/cargo)
2087+
/area/station/service/theater)
21002088
"Xa" = (
21012089
/obj/effect/turf_decal/siding/thinplating/dark{
21022090
dir = 8
@@ -2237,9 +2225,9 @@ Ud
22372225
Ud
22382226
Ud
22392227
Ud
2240-
yp
2241-
cu
2242-
cu
2228+
wx
2229+
MO
2230+
MO
22432231
MO
22442232
MO
22452233
wx
@@ -2264,7 +2252,7 @@ lU
22642252
Ud
22652253
Ud
22662254
Ud
2267-
cu
2255+
MO
22682256
CF
22692257
LD
22702258
RJ
@@ -2291,7 +2279,7 @@ lU
22912279
Ud
22922280
Ud
22932281
Ud
2294-
cu
2282+
MO
22952283
CF
22962284
RJ
22972285
KN
@@ -2317,8 +2305,8 @@ lU
23172305
lU
23182306
Ud
23192307
Ud
2320-
yp
2321-
yp
2308+
wx
2309+
wx
23222310
nk
23232311
fW
23242312
EG
@@ -2344,7 +2332,7 @@ Ud
23442332
Ud
23452333
Ud
23462334
Ud
2347-
cu
2335+
MO
23482336
eT
23492337
JI
23502338
mE
@@ -2371,7 +2359,7 @@ Ud
23712359
Ud
23722360
Ud
23732361
Ud
2374-
cu
2362+
MO
23752363
Vq
23762364
mp
23772365
iq
@@ -2398,7 +2386,7 @@ Ud
23982386
Ud
23992387
Ud
24002388
Ud
2401-
cu
2389+
MO
24022390
eT
24032391
GP
24042392
iu
@@ -2423,9 +2411,9 @@ lU
24232411
lU
24242412
lU
24252413
lU
2426-
yp
2414+
wx
24272415
WP
2428-
yp
2416+
wx
24292417
wx
24302418
EV
24312419
dS
@@ -2784,7 +2772,7 @@ YZ
27842772
Tv
27852773
kI
27862774
Va
2787-
MO
2775+
FI
27882776
QC
27892777
QC
27902778
QC
@@ -2811,7 +2799,7 @@ cr
28112799
FY
28122800
Ul
28132801
sm
2814-
MO
2802+
FI
28152803
QC
28162804
QC
28172805
QC
@@ -2838,7 +2826,7 @@ bX
28382826
sK
28392827
ED
28402828
wM
2841-
MO
2829+
FI
28422830
QC
28432831
QC
28442832
QC
@@ -2865,7 +2853,7 @@ dA
28652853
hd
28662854
TV
28672855
sm
2868-
MO
2856+
FI
28692857
QC
28702858
QC
28712859
QC
@@ -2892,7 +2880,7 @@ qC
28922880
qC
28932881
qC
28942882
Ow
2895-
UF
2883+
mC
28962884
lU
28972885
lU
28982886
lU
@@ -2946,7 +2934,7 @@ ji
29462934
ji
29472935
ji
29482936
St
2949-
UF
2937+
mC
29502938
lU
29512939
lU
29522940
lU
@@ -2964,16 +2952,16 @@ mQ
29642952
Hj
29652953
TE
29662954
mC
2967-
pe
2968-
sK
2955+
nx
2956+
nx
29692957
nx
29702958
YQ
29712959
XG
29722960
nx
29732961
nx
2974-
sK
2975-
qE
2976-
CG
2962+
nx
2963+
nx
2964+
FI
29772965
lU
29782966
lU
29792967
lU
@@ -2991,16 +2979,16 @@ kz
29912979
Lh
29922980
cT
29932981
FI
2994-
yV
2982+
pe
29952983
bP
2996-
Vs
2984+
nx
29972985
hA
29982986
XG
2999-
KW
3000-
oj
3001-
JH
3002-
UF
3003-
UF
2987+
nx
2988+
nx
2989+
sK
2990+
cu
2991+
mC
30042992
lU
30052993
lU
30062994
lU
@@ -3017,16 +3005,16 @@ UF
30173005
CG
30183006
CG
30193007
CG
3020-
UF
3021-
CG
3022-
CG
3023-
UF
3008+
mC
3009+
yV
3010+
yp
3011+
nx
30243012
qQ
3025-
UF
3026-
CG
3027-
CG
3028-
CG
3029-
UF
3013+
nx
3014+
Vs
3015+
oj
3016+
JH
3017+
mC
30303018
lU
30313019
lU
30323020
lU

_maps/~monkestation/RandomBars/Tram/tram_bar_cult.dmm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,11 @@
14321432
/obj/machinery/duct,
14331433
/turf/open/floor/cult,
14341434
/area/station/service/theater)
1435+
"FM" = (
1436+
/obj/structure/cable,
1437+
/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance/east_offset,
1438+
/turf/open/floor/cult,
1439+
/area/station/commons/lounge)
14351440
"FW" = (
14361441
/obj/effect/turf_decal/siding/thinplating/dark,
14371442
/obj/structure/cable,
@@ -3027,7 +3032,7 @@ jH
30273032
jH
30283033
jH
30293034
Vd
3030-
Hv
3035+
FM
30313036
Vd
30323037
jH
30333038
jH

0 commit comments

Comments
 (0)