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

Jump to bottom

[MDB IGNORE] The Great Enswitchening #21854

Merged
merged 8 commits into from
Apr 21, 2024
Merged

[MDB IGNORE] The Great Enswitchening #21854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01c4c75
yogs
Aquizit Apr 6, 2024
915717e
asteroid
Aquizit Apr 6, 2024
8d97c66
gax and ai whale
Aquizit Apr 8, 2024
07ac8d5
donut
Aquizit Apr 10, 2024
07433c2
meta
Aquizit Apr 10, 2024
f13c699
box ruins pass
Aquizit Apr 10, 2024
70fc2ef
meta ruins pass
Aquizit Apr 10, 2024
6bc2aa6
recommended changes + other fixes
Aquizit Apr 21, 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
25 changes: 14 additions & 11 deletions _maps/RandomRuins/StationRuins/BoxStation/clerk_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,6 @@
},
/turf/open/floor/plasteel,
/area/clerk)
"g" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/effect/turf_decal/tile/green/opposingcorners{
dir = 1
},
/turf/open/floor/plasteel,
/area/clerk)
"h" = (
/obj/machinery/light{
dir = 4
Expand Down Expand Up @@ -274,6 +264,19 @@
},
/turf/open/floor/plasteel,
/area/clerk)
"u" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/effect/turf_decal/tile/green/opposingcorners{
dir = 1
},
/obj/machinery/light_switch{
pixel_x = 23
},
/turf/open/floor/plasteel,
/area/clerk)
"v" = (
/obj/structure/rack,
/obj/item/book/random,
Expand Down Expand Up @@ -689,7 +692,7 @@ l
o
Y
j
g
u
E
z
i
Expand Down
32 changes: 19 additions & 13 deletions _maps/RandomRuins/StationRuins/BoxStation/clerk_gamble.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,10 @@
/turf/open/floor/wood,
/area/clerk)
"f" = (
/obj/structure/table/wood,
/obj/item/coinstack,
/obj/item/coin/gold,
/obj/item/coin/gold,
/obj/item/coin/gold,
/obj/item/coin/plasma,
/obj/item/coin/uranium,
/obj/item/coin/diamond,
/obj/item/coin/iron,
/obj/item/coin/iron,
/turf/open/floor/carpet/black,
/obj/machinery/light_switch{
pixel_y = 25
},
/turf/open/floor/wood,
/area/clerk)
"g" = (
/obj/structure/table/wood/poker,
Expand Down Expand Up @@ -319,6 +312,19 @@
"V" = (
/turf/open/floor/carpet/black,
/area/clerk)
"W" = (
/obj/structure/table/wood,
/obj/item/coinstack,
/obj/item/coin/gold,
/obj/item/coin/gold,
/obj/item/coin/gold,
/obj/item/coin/plasma,
/obj/item/coin/uranium,
/obj/item/coin/diamond,
/obj/item/coin/iron,
/obj/item/coin/iron,
/turf/open/floor/carpet/black,
/area/clerk)
"X" = (
/obj/structure/chair/stool,
/obj/machinery/light{
Expand Down Expand Up @@ -374,7 +380,7 @@ G
(3,1,1) = {"
j
G
H
f
Z
G
e
Expand Down Expand Up @@ -441,7 +447,7 @@ G
G
F
u
f
W
G
w
A
Expand Down
9 changes: 8 additions & 1 deletion _maps/RandomRuins/StationRuins/BoxStation/clerk_meta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,13 @@
},
/turf/open/floor/plasteel/dark,
/area/clerk)
"H" = (
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/light_switch{
pixel_x = 23
},
/turf/open/floor/plasteel/dark,
/area/clerk)
"I" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
Expand Down Expand Up @@ -471,7 +478,7 @@ o
U
a
X
g
H
q
t
Z
Expand Down
57 changes: 30 additions & 27 deletions _maps/RandomRuins/StationRuins/BoxStation/clerk_pod.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@
},
/turf/open/floor/pod/dark,
/area/clerk)
"h" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
/obj/structure/chair/americandiner{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/clerk)
"i" = (
/obj/structure/rack,
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
Expand Down Expand Up @@ -231,6 +222,15 @@
},
/turf/open/floor/pod/dark,
/area/clerk)
"z" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
/obj/structure/chair/americandiner{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/clerk)
"A" = (
/obj/machinery/door/firedoor/border_only{
dir = 8
Expand Down Expand Up @@ -305,18 +305,7 @@
},
/turf/open/floor/plasteel/dark,
/area/clerk)
"I" = (
/obj/structure/rack,
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
dir = 1
},
/obj/effect/spawner/lootdrop/plushies,
/turf/open/floor/pod/dark,
/area/clerk)
"J" = (
"H" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
Expand All @@ -327,6 +316,20 @@
dir = 1
},
/obj/effect/turf_decal/trimline/secred/filled/corner/lower,
/obj/machinery/light_switch{
pixel_y = 25
},
/turf/open/floor/pod/dark,
/area/clerk)
"I" = (
/obj/structure/rack,
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
dir = 1
},
/obj/effect/spawner/lootdrop/plushies,
/turf/open/floor/pod/dark,
/area/clerk)
"K" = (
Expand Down Expand Up @@ -381,8 +384,8 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/poddoor/multi_tile/four_tile_hor{
id = "giftshop";
armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
armor = list("melee" = 50, "bullet" = 80, "laser" = 80, "energy" = 100, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70);
id = "giftshop"
},
/turf/open/floor/plasteel/dark,
/area/clerk)
Expand Down Expand Up @@ -477,9 +480,9 @@
},
/obj/structure/table/reinforced,
/obj/item/toy/plush/nukeplushie{
pixel_y = 7;
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. This one seems to be skilled at guitar.";
pixel_x = 4;
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. This one seems to be skilled at guitar."
pixel_y = 7
},
/obj/item/instrument/eguitar{
pixel_x = 4;
Expand Down Expand Up @@ -547,7 +550,7 @@ o
(5,1,1) = {"
Y
a
J
H
Z
d
t
Expand All @@ -570,7 +573,7 @@ T
a
c
p
h
z
a
E
x
Expand Down
Loading
Loading