 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
f6405100b5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-25 21:46:53 -03:00 |
|
|
SandPoot
|
3425760ced
|
push
|
2025-02-25 17:48:02 -03:00 |
|
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -03:00 |
|
|
SandPoot
|
2fdbecaddc
|
Fixes people being unable to open character setup due to not having a savefile
|
2025-02-01 02:19:13 -03:00 |
|
|
Mosley
|
a44046076a
|
Merge remote-tracking branch 'upstream/master'
|
2024-11-21 22:44:41 -05:00 |
|
|
SandPoot
|
1d6008397a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-11-19 23:22:26 -03:00 |
|
|
Metis
|
f6af059a06
|
job titles
|
2024-11-02 03:16:16 -04:00 |
|
|
Mosley
|
518fea2b1a
|
Merge remote-tracking branch 'upstream/master'
|
2024-10-24 01:00:56 -05:00 |
|
|
SandPoot
|
049f964f94
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-10-24 01:37:36 -03:00 |
|
|
SandPoot
|
b65df409d7
|
that was weird
|
2024-09-29 17:11:32 -03:00 |
|
|
Mosley
|
e7adc7f3d8
|
Revert "Change workflows: S.P.L.U.R.T -> V.E.N.U.S"
This reverts commit bdd62f77e1.
|
2024-09-18 17:39:35 -05:00 |
|
|
SandPoot
|
19c436e994
|
push
|
2024-09-17 16:52:54 -03:00 |
|
|
ariaworld
|
568480f190
|
Merge remote-tracking branch
|
2024-09-15 02:04:30 +02:00 |
|
|
ariaworld
|
31d7aa0f97
|
Fix character imports
|
2024-09-08 19:32:03 +02:00 |
|
|
SandPoot
|
7a31222a7a
|
unbreak exports :)
|
2024-09-08 14:24:36 -03:00 |
|
|
ariaworld
|
e0b2d50710
|
Merge remote-tracking branch 'splurt/master'
|
2024-09-08 01:20:49 +02:00 |
|
|
Mosley
|
bd1993e2a8
|
Merge remote-tracking branch 'upstream/master'
|
2024-09-07 15:56:35 -05:00 |
|
|
SandPoot
|
d5adf30038
|
no self giving and alert box doesn't scale right
|
2024-09-07 17:00:56 -03:00 |
|
|
SandPoot
|
6c30fa6883
|
push
|
2024-09-07 16:45:30 -03:00 |
|
|
SandPoot
|
b3b6edf602
|
oops
|
2024-09-05 13:44:00 -03:00 |
|
|
SandPoot
|
3ab730e300
|
a different type is returned actually
|
2024-09-05 13:39:44 -03:00 |
|
|
ariaworld
|
d0b3976987
|
Always use new playerpanel.
|
2024-08-18 19:59:16 +02:00 |
|
|
ariaworld
|
6eee0c7280
|
parallax, fps
|
2024-08-18 19:55:08 +02:00 |
|
|
ariaworld
|
f1421f5fd8
|
Let's remove those unnecessary dots
|
2024-08-07 00:45:50 +02:00 |
|
|
ariaworld
|
bdd62f77e1
|
Change workflows: S.P.L.U.R.T -> V.E.N.U.S
|
2024-08-05 21:17:33 +02:00 |
|
|
BongaTheProto
|
7d0d1b32d6
|
Merge remote-tracking branch 'upstream/master'
|
2024-07-25 16:39:46 -05:00 |
|
|
SandPoot
|
8c85d0d630
|
push
|
2024-07-24 15:27:51 -03:00 |
|
|
ariaworld
|
356e09656a
|
Universal instead of human custom blood color
|
2024-05-09 22:33:50 +02:00 |
|
|
ariaworld
|
9e4e33392a
|
Adds custom blood color!
|
2024-05-09 22:30:46 +02:00 |
|
|
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 |
|