 BongaTheProto
|
c5f07b2c14
|
Update preferences.dm
adds more link options
|
2024-04-17 18:37:10 -05:00 |
|
|
BongaTheProto
|
65c2092959
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-12 18:40:08 -05:00 |
|
|
SandPoot
|
407e286274
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-08 15:18:51 -03:00 |
|
|
SandPoot
|
f8a912b7c6
|
ye
|
2024-04-08 14:50:40 -03:00 |
|
|
BongaTheProto
|
b2e14a5393
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-03-24 17:02:38 -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
|
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 |
|
|
BongaTheProto
|
558d33f7c6
|
Merge branch 'master' into upstream-merge
|
2024-03-04 16:59:05 -05:00 |
|
|
BongaTheProtoandGitHub
|
b07d12e225
|
Merge pull request #1093 from xhianil/E621-images
E621 images
|
2024-03-01 21:27:31 -05:00 |
|
|
BongaTheProto
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
xhianilandGitHub
|
b3890bcd5a
|
Update preferences.dm
|
2024-02-24 18:43:04 -07:00 |
|
|
ariaworld
|
c0306166ba
|
Update headshot info tip
|
2024-02-24 21:42:19 +01:00 |
|
|
ariaworld
|
88328acd56
|
Balance time!
|
2024-01-26 22:16:57 +01:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
ariaworldandGitHub
|
a736dca31d
|
Merge branch 'SPLURT-Station:master' into tweak-undead
|
2024-01-08 23:47:14 +01:00 |
|
|
BongaTheProtoandGitHub
|
8e8999fa08
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-07 19:58:34 -05:00 |
|
|
SandPoot
|
46384d2a67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-07 03:36:25 -03:00 |
|
|
SandPoot
|
003eec1850
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons
|
2024-01-07 02:09:58 -03:00 |
|
|
SandPoot
|
51c1c2abc9
|
huds!
|
2024-01-05 17:07:54 -03:00 |
|
|
SandPoot
|
00b30e0672
|
stoppable
|
2024-01-05 12:53:42 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
05e2cc0979
|
there
|
2024-01-05 00:18:21 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
ariaworld
|
7f940eba77
|
Quirk rebalance
|
2023-12-31 15:05:38 +01: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 |
|
|
ariaworld
|
f0c288c5c2
|
Potency + Body morpher
|
2023-12-20 19:33:47 +01: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 |
|
|
ariaworld
|
56f9956fbc
|
Remove: Accidental code clone.
|
2023-11-18 17:36:37 +01:00 |
|
|
ariaworld
|
1f463a734c
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-11-17 23:26:33 +01:00 |
|
|
ariaworld
|
e98019e91e
|
Push, push, push.
|
2023-11-17 21:34:27 +01:00 |
|
|
BongaTheProto
|
37bbecefb4
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 18:01:32 -05:00 |
|
|
SandPoot
|
fd124b03e4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-03 21:27:30 -03:00 |
|
|
BlueWildroseandGitHub
|
720374a7ef
|
Merge pull request #16022 from SandPoot/fix-loadout-runtime-not-spawning-items
Fix loadout runtime (which prevents remaining items from spawning)
|
2023-10-31 14:47:20 -06:00 |
|
|
ariaworld
|
1594bd360e
|
Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update
|
2023-10-31 14:03:41 +01:00 |
|
|
ariaworld
|
23f141965e
|
First draft.
|
2023-10-31 14:03:34 +01:00 |
|
|
SandPoot
|
0b6d743e22
|
go
|
2023-10-28 17:51:02 -03:00 |
|
|
BongaTheProto
|
604b8ea867
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-20 22:29:47 -05:00 |
|
|
SandPoot
|
3aa3aead3d
|
re-do the whole goddamn thing.
|
2023-10-20 17:48:13 -03:00 |
|
|
Марк
|
73e33a788e
|
Choosable Laws.
|
2023-10-20 16:43:14 +05:00 |
|
|
BongaTheProto
|
3230992305
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-12 13:28:32 -05:00 |
|
|
SandPoot
|
45d5d92775
|
oops
|
2023-10-12 14:28:57 -03:00 |
|
|
SandPoot
|
ee163aae68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-12 02:40:12 -03:00 |
|
|
BlueWildroseandGitHub
|
9f29f08cd0
|
Merge pull request #16013 from SandPoot/change-preferences
Preferences menu layout change
|
2023-10-11 13:51:37 -06:00 |
|
|
SandPoot
|
d4ea14c4ef
|
push
|
2023-10-09 16:15:49 -03:00 |
|
|
BongaTheProtoandGitHub
|
4742a61480
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-10-08 02:36:51 -05:00 |
|
|
BongaTheProto
|
0770dfc412
|
followup
|
2023-10-08 02:33:47 -05:00 |
|
|
BongaTheProto
|
7b5ecc7b49
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-07 23:28:42 -05:00 |
|