Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moves our mapping directory over to the main one so things like mapping unit tests can run on it #1016

Merged
merged 6 commits into from
Jan 24, 2024
Merged

Moves our mapping directory over to the main one so things like mapping unit tests can run on it #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8356c4a
move the file
wraith-54321 Jan 22, 2024
f0b418c
repath
wraith-54321 Jan 22, 2024
b954462
why we are here
wraith-54321 Jan 22, 2024
80e34c6
yet more
wraith-54321 Jan 22, 2024
fb9539a
finally
wraith-54321 Jan 22, 2024
2f2b0ca
cable
wraith-54321 Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 48 additions & 145 deletions ...station/_maps/RandomBars/Icebox/BarSM.dmm → ...~monkestation/RandomBars/Icebox/BarSM.dmm
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions ...n/_maps/RandomBars/Icebox/Drunkopsbar.dmm → ...station/RandomBars/Icebox/Drunkopsbar.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@
/area/station/service/bar)
"ox" = (
/obj/structure/cable,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/fakespace,
Expand Down Expand Up @@ -366,7 +365,7 @@
/area/station/commons/lounge)
"tX" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = WEWBAR
id = "WEWBAR"
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -445,7 +444,7 @@
/obj/item/toy/plush/nukeplushie{
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. Has crude nametag - Bar-Dweetos toy, return if found.";
name = "DrunkOps plushie";
squeak_override = sssssssssssssssssssssssssssssssssssssslist('sound/effects/hit_punch.ogg'=1)
squeak_override = list('sound/effects/hit_punch.ogg'=1)
},
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/service/bar)
Expand Down Expand Up @@ -720,7 +719,7 @@
/obj/item/toy/plush/nukeplushie{
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. Has crude nametag - Bar-Dweetos toy, return if found.";
name = "DrunkOps plushie";
squeak_override = sssssssssssssssssssssssssssssssssssssslist('sound/effects/hit_punch.ogg'=1)
squeak_override = list('sound/effects/hit_punch.ogg'=1)
},
/turf/open/floor/mineral/plastitanium,
/area/station/commons/lounge)
Expand Down Expand Up @@ -941,7 +940,6 @@
/area/station/service/bar/backroom)
"TT" = (
/obj/structure/cable,
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
Expand Down
0 ...tation/_maps/RandomBars/Icebox/Magbar.dmm → ...monkestation/RandomBars/Icebox/Magbar.dmm
View file
Open in desktop
File renamed without changes.
7 changes: 1 addition & 6 deletions ...tion/_maps/RandomBars/Icebox/MaidCafe.dmm → ...nkestation/RandomBars/Icebox/MaidCafe.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,6 @@
},
/turf/open/floor/carpet/black,
/area/station/service/bar)
"oY" = (
/obj/structure/cable,
/obj/structure/cable,
/turf/open/floor/bamboo,
/area/station/commons/lounge)
"pA" = (
/turf/open/floor/wood/tile,
/area/station/service/bar)
Expand Down Expand Up @@ -865,7 +860,7 @@ xW
EK
"}
(5,1,1) = {"
oY
Qu
XZ
XZ
XZ
Expand Down
52 changes: 21 additions & 31 deletions ...ps/RandomBars/Icebox/clockwork_icebox.dmm → ...on/RandomBars/Icebox/clockwork_icebox.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 1;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -132,8 +132,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 1;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -175,8 +175,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 1;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand All @@ -199,8 +199,8 @@
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 8;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -322,16 +322,6 @@
/obj/machinery/disposal/bin,
/turf/open/floor/bronze/filled,
/area/station/service/bar)
"qu" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable,
/obj/structure/cable,
/turf/open/floor/bronze,
/area/station/commons/lounge)
"rs" = (
/obj/structure/chair/sofa/right/brown{
dir = 1
Expand Down Expand Up @@ -418,8 +408,8 @@
"uH" = (
/obj/structure/table/bronze,
/obj/machinery/door/poddoor/shutters/window/preopen{
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -493,8 +483,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 8;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -562,8 +552,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 8;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -642,8 +632,8 @@
/area/station/commons/lounge)
"Hj" = (
/obj/machinery/door/window{
color = #c09e13;
name = "bronze windoor"
color = "#c09e13";
name = "Bronze Windoor"
},
/obj/machinery/door/firedoor/border_only,
/obj/structure/disposalpipe/segment,
Expand Down Expand Up @@ -726,8 +716,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 8;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -905,8 +895,8 @@
},
/obj/machinery/door/poddoor/shutters/window/preopen{
dir = 8;
color = #c09e13;
name = "Bar shutters"
color = "#c09e13";
name = "Bar Shutters"
},
/turf/open/floor/bronze/filled,
/area/station/service/bar)
Expand Down Expand Up @@ -948,7 +938,7 @@ kU
Xo
mI
Xx
qu
Xp
GP
ME
Vw
Expand Down
1 change: 0 additions & 1 deletion ...maps/RandomBars/Icebox/cultbar_icebox.dmm → ...tion/RandomBars/Icebox/cultbar_icebox.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,6 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/structure/cable,
/obj/structure/sink/kitchen/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/cult,
Expand Down
17 changes: 8 additions & 9 deletions .../_maps/RandomBars/Icebox/disco_icebox.dmm → ...tation/RandomBars/Icebox/disco_icebox.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@
/area/station/commons/lounge)
"gm" = (
/obj/effect/mapping_helpers/airlock/access/all/service,
/obj/machinery/door/airlock{
/obj/machinery/door/airlock/wood{
name = "Service Hall"
},
/obj/machinery/door/airlock/wood,
/obj/machinery/door/firedoor,
/obj/structure/cable,
/turf/open/floor/wood,
Expand Down Expand Up @@ -149,14 +148,13 @@
/area/station/commons/lounge)
"pW" = (
/obj/effect/mapping_helpers/airlock/access/all/service,
/obj/machinery/door/airlock{
name = "Service Hall"
},
/obj/machinery/door/airlock/wood,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/door/airlock/wood{
name = "Bar"
},
/turf/open/floor/wood,
/area/station/service/bar/backroom)
"qx" = (
Expand Down Expand Up @@ -272,10 +270,11 @@
"BL" = (
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/obj/structure/cable,
/obj/machinery/door/airlock/silver/glass,
/obj/machinery/door/airlock/wood,
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/door/airlock/wood{
name = "Service Hall"
},
/turf/open/floor/eighties/red,
/area/station/service/bar)
"BO" = (
Expand All @@ -291,7 +290,7 @@
"Cf" = (
/obj/structure/table/wood,
/obj/item/food/pie/cream/nostun{
desc = thisone...looks...different....
desc = "this one looks... different..."
},
/turf/open/floor/light/colour_cycle/dancefloor_b,
/area/station/commons/lounge)
Expand Down
0 ...aps/RandomBars/Icebox/green_bar_disco.dmm → ...ion/RandomBars/Icebox/green_bar_disco.dmm
View file
Open in desktop
File renamed without changes.
20 changes: 6 additions & 14 deletions ...RandomBars/Icebox/icebox_bar_abductor.dmm → ...RandomBars/Icebox/icebox_bar_abductor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,19 +466,15 @@
/area/station/commons/lounge)
"yP" = (
/obj/structure/table/fake_abductor,
/obj/machinery/door/window{
base_state = "right";
dir = 4;
icon_state = "right";
name = "bar mixing area";
req_access = list("bar")
},
/obj/structure/desk_bell{
desc = "Why, I'm always here! I should get absolute service. Pronto, garcon!";
name = "The Regular's Bell";
pixel_x = -6
},
/mob/living/carbon/human/species/monkey/punpun,
/obj/machinery/door/window/left/directional/east{
name = "Bar Mixing Area"
},
/turf/open/floor/mineral/fake_abductor,
/area/station/service/bar)
"zj" = (
Expand Down Expand Up @@ -733,16 +729,12 @@
dir = 4
},
/obj/structure/table/fake_abductor,
/obj/machinery/door/window{
base_state = "right";
dir = 4;
icon_state = "right";
name = "bar mixing area";
req_access = list("bar")
},
/obj/structure/displaycase/forsale/kitchen{
pixel_y = 8
},
/obj/machinery/door/window/right/directional/east{
name = "Bar Mixing Area"
},
/turf/open/floor/mineral/fake_abductor,
/area/station/service/bar)
"Jh" = (
Expand Down
16 changes: 6 additions & 10 deletions ...s/RandomBars/Icebox/icebox_bar_arcade.dmm → ...n/RandomBars/Icebox/icebox_bar_arcade.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
/obj/effect/spawner/random/entertainment/gambling,
/obj/structure/sign/poster/random/directional/east,
/turf/open/floor/carpet/neon/simple/yellow,
/area/station/commons/lounge)
/area/station/service/bar)
"gc" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/computer/arcade/amputation/bar,
Expand Down Expand Up @@ -283,7 +283,7 @@
/obj/machinery/duct,
/obj/structure/cable,
/turf/open/floor/carpet/neon/simple/yellow,
/area/station/commons/lounge)
/area/station/service/bar)
"pH" = (
/obj/effect/turf_decal/siding/purple,
/turf/open/floor/eighties,
Expand Down Expand Up @@ -622,14 +622,10 @@
dir = 8
},
/obj/machinery/airalarm/directional/north,
/obj/machinery/door/window{
base_state = "right";
dir = 8;
icon_state = "right";
name = "bar mixing area";
req_access = list("bar")
},
/obj/structure/cable,
/obj/machinery/door/window/right/directional/west{
name = "Bar Mixing Area"
},
/turf/open/floor/carpet/neon/simple/yellow,
/area/station/service/bar)
"FR" = (
Expand Down Expand Up @@ -757,7 +753,7 @@
/obj/structure/disposalpipe/trunk,
/obj/machinery/disposal/bin,
/turf/open/floor/carpet/neon/simple/yellow,
/area/station/commons/lounge)
/area/station/service/bar)
"Kq" = (
/obj/machinery/door/airlock{
name = "Bar"
Expand Down
0 ...aps/RandomBars/Icebox/icebox_bar_base.dmm → ...ion/RandomBars/Icebox/icebox_bar_base.dmm
View file
Open in desktop
File renamed without changes.
10 changes: 1 addition & 9 deletions ...ion/_maps/RandomBars/Icebox/junglebar.dmm → ...kestation/RandomBars/Icebox/junglebar.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall,
/area/station/service/bar)
"YA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/commons/lounge)
"YU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand All @@ -519,7 +511,7 @@ xY
OC
Vc
TK
YA
Ke
pl
zS
nX
Expand Down
0 ...tion/_maps/RandomBars/Icebox/mime_bar.dmm → ...nkestation/RandomBars/Icebox/mime_bar.dmm
View file
Open in desktop
File renamed without changes.
0 ...aps/RandomBars/Icebox/template_icebox.dmm → ...ion/RandomBars/Icebox/template_icebox.dmm
View file
Open in desktop
File renamed without changes.
0 ...n/_maps/RandomBars/Tram/tram_bar_base.dmm → ...station/RandomBars/Tram/tram_bar_base.dmm
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ps/RandomBars/Tram/tram_bar_beachside.dmm → ...on/RandomBars/Tram/tram_bar_beachside.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@
"nN" = (
/obj/structure/ladder,
/obj/machinery/door/window/left/directional/north{
name = "Bar backroom Access";
name = "Bar Backroom Access";
req_one_access = list("bar")
},
/obj/structure/window/reinforced/spawner/directional/west,
Expand Down
0 ...maps/RandomBars/Tram/tram_bar_biodome.dmm → ...tion/RandomBars/Tram/tram_bar_biodome.dmm
View file
Open in desktop
File renamed without changes.
Loading
Loading