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

Exploration Crates and Atmospherical and Electrical systems #10373

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
bb791a2
WIP
MarkusLarsson421 Dec 21, 2023
fdd987b
WIP
MarkusLarsson421 Dec 21, 2023
16b9630
WIP
MarkusLarsson421 Dec 21, 2023
98d87fe
Update MetaStation.dmm
MarkusLarsson421 Dec 21, 2023
6fab8ac
WIP
MarkusLarsson421 Dec 21, 2023
ffc864f
Fixed Secure Crate and Meta lacking a Pipe Dispenser
MarkusLarsson421 Dec 21, 2023
37c8989
Added Volume Pump to all Exploration and Science docks, swapped aroun…
MarkusLarsson421 Dec 22, 2023
673ea6e
WIP
MarkusLarsson421 Dec 22, 2023
d5ec978
WIP
MarkusLarsson421 Dec 22, 2023
fbb96ad
WIP
MarkusLarsson421 Dec 22, 2023
74b8176
Fixed contraband crate and other issues.
MarkusLarsson421 Dec 22, 2023
24bf32a
Merge branch 'BeeStation:master' into exploration-connections
MarkusLarsson421 Dec 22, 2023
9844c6b
Update rust_g.dll
MarkusLarsson421 Jan 31, 2024
0d1c7bd
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jan 31, 2024
4ecfdc0
wip
MarkusLarsson421 Jan 31, 2024
944b0c9
wip
MarkusLarsson421 Jan 31, 2024
0ac6358
Update BoxStation.dmm
MarkusLarsson421 Jan 31, 2024
268d4fc
Update BoxStation.dmm
MarkusLarsson421 Jan 31, 2024
9e1c0c0
WIP
MarkusLarsson421 Jan 31, 2024
23d190e
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jan 31, 2024
a6e571b
fixed delta and fland, reorganized box shuttle
MarkusLarsson421 Jan 31, 2024
d672576
polished all the shuttles and replaced exploration relay with mining …
MarkusLarsson421 Feb 4, 2024
caee415
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 4, 2024
cf6019d
fixed linters error
MarkusLarsson421 Feb 4, 2024
1d71975
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 11, 2024
54b8e9b
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 14, 2024
1689081
Update hub.dm
MarkusLarsson421 Feb 14, 2024
4bbc37f
trying to workout telecomms
MarkusLarsson421 Feb 14, 2024
cad0ab8
Empty commit
MarkusLarsson421 Feb 14, 2024
df8e063
fixed the relay
MarkusLarsson421 Feb 15, 2024
b3d02c0
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 16, 2024
cfe8ac8
Update exploration_rad.dmm
MarkusLarsson421 Feb 16, 2024
910e888
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 17, 2024
155e1b3
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Feb 25, 2024
b4dd8e4
Update BoxStation.dmm
MarkusLarsson421 Feb 25, 2024
c1c1729
fixed default exploration shuttle comms and corg exploration disposals
MarkusLarsson421 Mar 2, 2024
0bbb859
removed exploration insuls and added science shuttle cargo bolt by re…
MarkusLarsson421 Mar 2, 2024
5734f14
Update CorgStation.dmm
MarkusLarsson421 Mar 2, 2024
2da5526
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Mar 3, 2024
b3bbbcc
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Mar 16, 2024
bd9335d
Update secure.dm
MarkusLarsson421 Mar 16, 2024
b156a1d
empty commit
MarkusLarsson421 Mar 16, 2024
95932bc
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 May 27, 2024
63a2b60
merge conflict fix
MarkusLarsson421 May 27, 2024
499738d
fixes floors path error
MarkusLarsson421 May 27, 2024
0f9d3bd
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 May 28, 2024
58d5cb4
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jun 14, 2024
80eb9ae
fixed merge conflicts
MarkusLarsson421 Jun 14, 2024
b53bde5
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jun 19, 2024
ce10485
fixed error
MarkusLarsson421 Jun 19, 2024
f13a965
fixed stuff after xeon's feedback
MarkusLarsson421 Jun 19, 2024
97643f6
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jun 28, 2024
655fe86
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Jul 23, 2024
f9419fd
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Aug 1, 2024
782698a
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Aug 30, 2024
d7b8f6e
fixed merge conflicts on all main maps except delta
MarkusLarsson421 Aug 30, 2024
40aff8c
fixed all merge conflicts
MarkusLarsson421 Aug 31, 2024
2b0ebce
minor changes
MarkusLarsson421 Aug 31, 2024
83bba74
i lied, there was one more merge conflict
MarkusLarsson421 Aug 31, 2024
af1e6ca
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Aug 31, 2024
e15187e
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Aug 31, 2024
e2b040e
Update DeltaStation2.dmm
MarkusLarsson421 Aug 31, 2024
fe863b6
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 2, 2024
67a69a8
added vent/scrubber :tea:
MarkusLarsson421 Sep 2, 2024
4c1f7fc
fixed merge conflicts
MarkusLarsson421 Sep 2, 2024
8c52116
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 8, 2024
bad2604
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 8, 2024
deb99cc
shuttle fixes
MarkusLarsson421 Sep 8, 2024
31eeba0
station fixes minus rad
MarkusLarsson421 Sep 8, 2024
94d9496
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 14, 2024
5b062b6
Update RadStation.dmm
MarkusLarsson421 Sep 14, 2024
fbda606
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 15, 2024
7384959
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 18, 2024
230eee5
Merge remote-tracking branch 'upstream/master' into exploration-conne…
MarkusLarsson421 Sep 20, 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
34,069 changes: 17,056 additions & 17,013 deletions _maps/map_files/BoxStation/BoxStation.dmm

Large diffs are not rendered by default.

2,727 changes: 1,485 additions & 1,242 deletions _maps/map_files/CorgStation/CorgStation.dmm

Large diffs are not rendered by default.

1,952 changes: 1,059 additions & 893 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

37,768 changes: 18,914 additions & 18,854 deletions _maps/map_files/EchoStation/EchoStation.dmm

Large diffs are not rendered by default.

1,365 changes: 726 additions & 639 deletions _maps/map_files/FlandStation/FlandStation.dmm

Large diffs are not rendered by default.

2,353 changes: 1,209 additions & 1,144 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

13,387 changes: 6,711 additions & 6,676 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

281 changes: 147 additions & 134 deletions _maps/map_files/Mining/Lavaland.dmm

Large diffs are not rendered by default.

1,715 changes: 877 additions & 838 deletions _maps/map_files/RadStation/RadStation.dmm

Large diffs are not rendered by default.

1,872 changes: 1,044 additions & 828 deletions _maps/shuttles/exploration/exploration_corg.dmm

Large diffs are not rendered by default.

741 changes: 410 additions & 331 deletions _maps/shuttles/exploration/exploration_delta.dmm

Large diffs are not rendered by default.

1,807 changes: 1,054 additions & 753 deletions _maps/shuttles/exploration/exploration_fland.dmm

Large diffs are not rendered by default.

837 changes: 536 additions & 301 deletions _maps/shuttles/exploration/exploration_kilo.dmm

Large diffs are not rendered by default.

815 changes: 436 additions & 379 deletions _maps/shuttles/exploration/exploration_rad.dmm

Large diffs are not rendered by default.

848 changes: 481 additions & 367 deletions _maps/shuttles/exploration/exploration_shuttle.dmm

Large diffs are not rendered by default.

265 changes: 177 additions & 88 deletions _maps/shuttles/science/science_outpost.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1672,6 +1672,7 @@
#include "code\game\objects\structures\crates_lockers\crates.dm"
#include "code\game\objects\structures\crates_lockers\closets\bodybag.dm"
#include "code\game\objects\structures\crates_lockers\closets\cardboardbox.dm"
#include "code\game\objects\structures\crates_lockers\closets\exploration.dm"
#include "code\game\objects\structures\crates_lockers\closets\fitness.dm"
#include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
#include "code\game\objects\structures\crates_lockers\closets\infinite.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/telecomms/machines/relay.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@

/obj/machinery/telecomms/relay/preset/exploration
id = "Exploration Relay"
autolinkers = list("exp_relay")
autolinkers = list("exp_relay", "hub")
Loading
Loading