 Mosley
|
106d5b3c1e
|
Merge remote-tracking branch 'upstream/master'
|
2024-08-25 12:48:45 -05:00 |
|
|
SandPoot
|
a1905591f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-08-24 23:49:10 -03:00 |
|
|
SandPoot
|
c07e94be66
|
push
|
2024-08-24 21:28:55 -03:00 |
|
|
SandPoot
|
c2df4281b9
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-05 23:31:50 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
BongaTheProto
|
327ea3999f
|
Merge branch 'master' into 515-auxmos
|
2024-03-31 21:32:01 -05:00 |
|
|
BongaTheProto
|
6df04b8167
|
Merge remote-tracking branch 'upstream/master' into 515-auxmos
|
2024-03-30 17:40:23 -05:00 |
|
|
SandPoot
|
d585e57f55
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-30 18:57:19 -03:00 |
|
|
SandPoot
|
ffe55f67b1
|
go!!
|
2024-03-30 18:29:11 -03:00 |
|
|
Elizabeth Lavenza
|
90378d4da9
|
Fix direct Destroy calls
|
2024-03-28 18:18:31 -04:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -05:00 |
|
|
BongaTheProto
|
8bbb0fda41
|
Merge branch 'master' into upstream-merge
|
2024-03-24 16:41:07 -05:00 |
|
|
SandPoot
|
b76127c2d7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-15 19:21:39 -03:00 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
SandPoot
|
a65f323734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
|
2024-03-08 19:10:22 -03:00 |
|
|
ariaworld
|
6318464f06
|
Fix mecha mobs + add a chocolate box and letter to Hilbert's hotel
|
2024-03-02 18:26:56 +01:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -03:00 |
|
|
deathride58andGitHub
|
ce1d757159
|
Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
|
2023-12-28 22:44:59 -05:00 |
|
|
BongaTheProto
|
13cd269788
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-25 14:28:51 -05:00 |
|
|
SandPoot
|
be37603291
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-23 13:28:41 -03:00 |
|
|
SandPoot
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
5116acad15
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-06 18:31:55 -05:00 |
|
|
SandPoot
|
7038059ab5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-05-06 10:47:06 -03:00 |
|
|
KrissKr0ss
|
66aa1cb05c
|
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
|
2023-05-01 00:16:20 -05:00 |
|
|
BongaTheProtoandGitHub
|
a3d68a2f95
|
Merge pull request #786 from KeplerWasTaken/mechdrillfix
Mech Drill Fix & Lavaland Syndicate Base Fix
|
2023-03-23 02:45:07 -05:00 |
|
|
BongaTheProto
|
017c235b4f
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-14 17:43:38 -05:00 |
|
|
SandPoot
|
e42166dda7
|
branch name
|
2023-03-14 16:34:54 -03:00 |
|
|
SandPoot
|
8d6e9f5a2d
|
branch name
|
2023-03-14 16:25:22 -03:00 |
|
|
KeplerWasTaken
|
6516901a9c
|
Mech Drill now no longer works if the target is further away than 1 tile, and the diamond drill applies the correct damage
|
2023-03-12 10:37:25 +01:00 |
|
|
SandPoot
|
d743096f8a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-09 17:50:19 -03:00 |
|
|
Jerry WesterandGitHub
|
ae347f3399
|
Revert "MODsuits"
|
2023-01-08 17:30:26 -07:00 |
|
|
SandPoot
|
82eff346c7
|
Merge Upstream
|
2023-01-07 22:52:22 -03:00 |
|
|
Jerry WesterandGitHub
|
32a5d02434
|
Merge branch 'master' into modsuits
|
2022-12-13 19:18:24 -07:00 |
|
|
BongaTheProto
|
ee6823c69b
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-13 12:14:11 -05:00 |
|
|
SandPoot
|
f4b7513f10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-13 01:35:33 -03:00 |
|
|
LinandGitHub
|
7205781c47
|
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
|
2022-12-12 19:11:49 -07:00 |
|
|
Jerry Wester
|
f7ac3c7624
|
beeg commit
|
2022-12-11 20:32:35 -07:00 |
|
|
SandPoot
|
8911fe5e0b
|
clear em
|
2022-12-11 17:58:45 -03:00 |
|
|
BongaTheProto
|
79fa770ab3
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-13 11:21:32 -05:00 |
|
|
SandPoot
|
5384cb9d4b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-12 22:25:25 -03:00 |
|
|
Dan-Neposh
|
a447d337a8
|
misc balance changes
|
2022-10-06 00:22:51 -04:00 |
|