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

Blespace beacon removal #6797

Merged
merged 12 commits into from
Aug 17, 2024
Merged

Blespace beacon removal #6797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9676fa0
eh
uuuuhuuuu Jul 13, 2024
a184b87
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 13, 2024
444b74c
ehm
uuuuhuuuu Jul 16, 2024
98fa1ae
Merge branch 'master' of https://github.com/cuberound/cmss13
uuuuhuuuu Jul 16, 2024
2a78285
ehm
uuuuhuuuu Jul 16, 2024
b412fdb
Merge branch 'cmss13-devs:master' into master
cuberound Jul 18, 2024
8557165
removes bluespace beacon
uuuuhuuuu Jul 26, 2024
ac884e9
eh
uuuuhuuuu Jul 26, 2024
d2d0c64
Merge branch 'cmss13-devs:master' into master
cuberound Aug 9, 2024
920c4a3
Merge branch 'cmss13-devs:master' into master
cuberound Aug 10, 2024
0b4cf17
Merge branch 'cmss13-devs:master' into master
cuberound Aug 17, 2024
d7f3452
should be it
uuuuhuuuu Aug 17, 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
54 changes: 0 additions & 54 deletions code/game/machinery/Beacon.dm
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion colonialmarines.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,6 @@
#include "code\game\machinery\air_alarm.dm"
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\autolathe_datums.dm"
#include "code\game\machinery\Beacon.dm"
#include "code\game\machinery\biohazard_lockdown.dm"
#include "code\game\machinery\bioprinter.dm"
#include "code\game\machinery\buttons.dm"
Expand Down
Loading