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

[Port] Radiation Rework #11434

Closed
wants to merge 63 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
21398f0
and so it begins
XeonMations Sep 5, 2024
4e4c6b0
aaaaa
XeonMations Sep 6, 2024
85ae885
rahhhhhgh
XeonMations Sep 6, 2024
4a79a65
hhhhh
XeonMations Sep 6, 2024
56820fb
engineering is going to fucking kill me for this
XeonMations Sep 6, 2024
863a30d
and now, for errors
XeonMations Sep 6, 2024
a5753dc
rahhhhh
XeonMations Sep 6, 2024
c806ec3
dasdsadsa
XeonMations Sep 6, 2024
0bce78f
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 8, 2024
f8d8026
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 9, 2024
85d66c7
target acquired
XeonMations Sep 9, 2024
5e4b0a7
rah
XeonMations Sep 9, 2024
801f681
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 11, 2024
11c7de6
getline
XeonMations Sep 11, 2024
e15be4c
Update radiation.dm
XeonMations Sep 11, 2024
67e002b
_traits.dm
XeonMations Sep 11, 2024
c8b3e10
grep checks
XeonMations Sep 11, 2024
7b11cf5
CI my beloved
XeonMations Sep 11, 2024
6d55cce
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 11, 2024
2f13d35
Update other_tools.dm
XeonMations Sep 11, 2024
d857f9b
MAPS
XeonMations Sep 11, 2024
b70fe0e
Update all_nodes.dm
XeonMations Sep 11, 2024
d24d002
maps
XeonMations Sep 11, 2024
41cc970
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 13, 2024
ab81a37
Update DeltaStation2.dmm
XeonMations Sep 13, 2024
f304416
made radsuits actually protect against radiation
XeonMations Sep 13, 2024
0833abd
to do: fix SM monitor showing radiation
XeonMations Sep 13, 2024
5a3efd4
rahhh
XeonMations Sep 13, 2024
6477e3d
CE hardsuit is also radproof
XeonMations Sep 13, 2024
6a1f44b
hmmm
XeonMations Sep 13, 2024
df387fb
no more radiation monitoring for you
XeonMations Sep 13, 2024
e2706a3
more radproof things
XeonMations Sep 13, 2024
0b96fec
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 15, 2024
65fe655
maps
XeonMations Sep 15, 2024
16f15d9
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 19, 2024
1e53cd1
Update EchoStation.dmm
XeonMations Sep 19, 2024
e2eec23
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 20, 2024
7a0e151
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 23, 2024
55f7b22
finished merge
XeonMations Sep 23, 2024
b992bff
handle dionae being in the game now
XeonMations Sep 23, 2024
18cb489
Update _traits.dm
XeonMations Sep 23, 2024
2ac3680
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Sep 28, 2024
31c2348
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 4, 2024
b266229
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 6, 2024
e9c61ab
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 19, 2024
2e87000
mapdiffbot
XeonMations Oct 20, 2024
a5e6e40
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 25, 2024
4d8bd8d
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 25, 2024
49991c2
aa
XeonMations Oct 25, 2024
431a043
CI/CD
XeonMations Oct 25, 2024
144ec49
Revert "Merge remote-tracking branch 'upstream/master' into radiation"
XeonMations Oct 25, 2024
1dc8dd3
icon diff bot please work
XeonMations Oct 25, 2024
358d83b
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 27, 2024
d39aa48
Update KiloStation.dmm
XeonMations Oct 27, 2024
caf981b
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 30, 2024
a248728
deltastation + ruin i forgor about
XeonMations Oct 30, 2024
46609ba
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Oct 31, 2024
0968134
Update hardsuit.dm
XeonMations Oct 31, 2024
c8bdeef
Update DeltaStation2.dmm
XeonMations Nov 1, 2024
b4a1003
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Nov 2, 2024
9221d61
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Nov 10, 2024
f3fbf57
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Nov 10, 2024
21bb0eb
Merge remote-tracking branch 'upstream/master' into radiation
XeonMations Nov 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 4 additions & 9 deletions _maps/RandomRuins/SpaceRuins/oldstation.dmm

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

3 changes: 1 addition & 2 deletions _maps/RuinGeneration/21x21_singularity.dmm

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

25 changes: 5 additions & 20 deletions _maps/map_files/BoxStation/BoxStation.dmm

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

33 changes: 6 additions & 27 deletions _maps/map_files/CorgStation/CorgStation.dmm

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

20 changes: 10 additions & 10 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

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

Loading
Loading