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

[PORT TG] ports some disposal changes, reroutes box and more disposals #21983

Merged
merged 27 commits into from
Jun 14, 2024
Merged

[PORT TG] ports some disposal changes, reroutes box and more disposals #21983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
6eaf096
Another byond min max update
wonderinghost Feb 26, 2024
93c1f55
wat
wonderinghost Apr 6, 2024
7b50998
Merge branch 'master' of https://github.com/wonderinghost/Yogstation
wonderinghost Apr 6, 2024
f3a76b6
Merge branch 'master' of https://github.com/wonderinghost/Yogstation
wonderinghost Apr 6, 2024
9bca962
new pipes
wonderinghost Apr 30, 2024
68e447b
the shit
wonderinghost Apr 30, 2024
bb44126
Merge branch 'yogstation13:master' into mapping/other
wonderinghost Apr 30, 2024
735b190
test map
wonderinghost Apr 30, 2024
499b659
for sarah
wonderinghost May 1, 2024
38034a2
Merge branch 'yogstation13:master' into mapping/other
wonderinghost May 3, 2024
65927aa
fixed?
wonderinghost May 3, 2024
7a70254
updating
wonderinghost May 8, 2024
a80ac29
cleanup
wonderinghost May 8, 2024
09b082d
yay combat
wonderinghost May 9, 2024
fe701d7
Merge branch 'yogstation13:master' into mapping/other
wonderinghost May 9, 2024
38f81e3
HMMM
wonderinghost May 10, 2024
a9582c4
atomizing
wonderinghost May 10, 2024
27faa94
something
wonderinghost May 10, 2024
da523c4
arg
wonderinghost May 10, 2024
644187e
final
wonderinghost May 11, 2024
26bfdd5
update mapmerge
wonderinghost May 11, 2024
7aa4520
fixes and fun toys
wonderinghost May 14, 2024
7760483
revert
wonderinghost May 14, 2024
cc5343c
whoops
wonderinghost May 14, 2024
1d475d9
Merge branch 'master' of https://github.com/wonderinghost/Yogstation …
wonderinghost May 26, 2024
b0e2476
final change
wonderinghost May 28, 2024
bdf0460
Merge branch 'yogstation13:master' into mapping/other
wonderinghost Jun 10, 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
1 change: 1 addition & 0 deletions _maps/RandomRuins/StationRuins/BoxStation/chapel1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/effect/mapping_helpers/mail_sorting/service/chapel,
/turf/open/floor/plasteel/dark,
/area/chapel/main)
"YT" = (
Expand Down
1 change: 1 addition & 0 deletions _maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
/obj/structure/disposalpipe/sorting/mail{
sortType = 17
},
/obj/effect/mapping_helpers/mail_sorting/service/chapel,
/turf/open/floor/carpet/black,
/area/chapel/office)
"gr" = (
Expand Down
Loading
Loading