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.

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

renames bad camera in box chapel #22844

Merged
merged 43 commits into from
Dec 12, 2024
Merged
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
da3cf9e
moves clown/mime space to north of theatre
ToasterBiome Sep 7, 2021
a10e105
moved kitchen receiving to east instead of south of cold room
ToasterBiome Sep 7, 2021
9571dd6
move janitors closet and service maint and hydroponics help
ToasterBiome Sep 7, 2021
2c7bc22
Merge branch 'yogstation13:master' into master
ToasterBiome Sep 7, 2021
f88adf7
upstream fix
ToasterBiome Sep 7, 2021
92047e9
obvious fixes
ToasterBiome Sep 7, 2021
7f04913
merge conflicts + floor decals
ToasterBiome Sep 7, 2021
a2565f8
revert yogsmeta to previous state (ugh)
ToasterBiome Sep 7, 2021
224faaa
readds changes (ugh)
ToasterBiome Sep 7, 2021
7210e29
Update Yogsmeta.dmm
ToasterBiome Sep 7, 2021
c39db7d
Update tails.dm
ToasterBiome Dec 29, 2021
5662edc
Merge branch 'master' of https://github.com/yogstation13/Yogstation
ToasterBiome Apr 10, 2022
ff46e93
Merge remote-tracking branch 'upstream/master'
ToasterBiome Apr 11, 2022
514b11a
disposals
ToasterBiome May 3, 2022
522de80
Merge remote-tracking branch 'upstream/master'
ToasterBiome Jun 19, 2022
9ce0fde
Merge remote-tracking branch 'upstream/master'
ToasterBiome Jul 4, 2022
e8e8a46
Merge remote-tracking branch 'upstream/master'
ToasterBiome Aug 21, 2022
d86106b
Merge remote-tracking branch 'upstream/master'
ToasterBiome Oct 8, 2022
1dd3877
Merge remote-tracking branch 'upstream/master'
ToasterBiome Oct 22, 2022
094415a
Merge remote-tracking branch 'upstream/master'
ToasterBiome Jan 17, 2023
53cd2b1
Merge remote-tracking branch 'upstream/master'
ToasterBiome Mar 1, 2023
4be1bf2
Merge remote-tracking branch 'upstream/master'
ToasterBiome Apr 1, 2023
2332fa9
Merge remote-tracking branch 'upstream/master'
ToasterBiome Apr 28, 2023
641a7c2
Merge remote-tracking branch 'upstream/master'
ToasterBiome May 19, 2023
223dbab
Merge remote-tracking branch 'upstream/master'
ToasterBiome Jun 26, 2023
2568578
Merge remote-tracking branch 'upstream/master'
ToasterBiome Nov 21, 2023
f316cf9
Merge remote-tracking branch 'upstream/master'
ToasterBiome Nov 22, 2023
8e655d8
removes all this stuff and replaces tiles
ToasterBiome Nov 22, 2023
e896391
Merge remote-tracking branch 'upstream/master'
ToasterBiome Jan 30, 2024
55b85a3
Merge remote-tracking branch 'upstream/master'
ToasterBiome Feb 19, 2024
79da609
Merge remote-tracking branch 'upstream/master'
ToasterBiome Mar 11, 2024
d616c27
Merge remote-tracking branch 'upstream/master'
ToasterBiome May 9, 2024
6bc2867
Merge remote-tracking branch 'upstream/master'
ToasterBiome Aug 5, 2024
e5910da
goodbye
ToasterBiome Aug 5, 2024
0546b5b
Merge remote-tracking branch 'upstream/master'
ToasterBiome Sep 5, 2024
ded6214
Update flora.dm
ToasterBiome Sep 5, 2024
9b4c1ef
manateestation
ToasterBiome Oct 11, 2024
9fcc400
Merge remote-tracking branch 'upstream/master' into manateestation
ToasterBiome Oct 14, 2024
8bb26d7
Merge branch 'manateestation' of https://github.com/ToasterBiome/Yogs…
ToasterBiome Oct 14, 2024
92d643b
Merge branch 'ToasterBiome-manateestation'
ToasterBiome Oct 14, 2024
ca22881
Delete byond-extools.dll
ToasterBiome Nov 20, 2024
869d810
Merge remote-tracking branch 'upstream/master'
ToasterBiome Dec 11, 2024
5b14069
Update chapel2.dmm
ToasterBiome Dec 11, 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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/BoxStation/chapel2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
"kU" = (
/obj/effect/turf_decal/ramp_middle,
/obj/machinery/camera{
c_tag = "Atmospherics East";
c_tag = "Chapel East";
dir = 8
},
/turf/open/floor/plasteel/dark,
Expand Down
Loading