 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
|
1a7a423032
|
safeguard for those who already joined before
|
2024-04-08 14:59:09 -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
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
SandPoot
|
e71c5c9530
|
could be null i guess
|
2024-02-25 14:02:55 -03:00 |
|
|
SandPoot
|
17362e5881
|
push em
|
2024-02-25 13:41:28 -03: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
|
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 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
BongaTheProto
|
a6b7bab389
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-22 21:26:12 -05:00 |
|
|
SandPoot
|
cb24bd8256
|
Quickly makes lawsets per character and defaults on server default
|
2023-10-22 19:39:50 -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
|
58bdf9876b
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-14 19:50:53 -05:00 |
|
|
SandPoot
|
b78cf83df9
|
quick fix for the language refactor
|
2023-10-13 12:54:41 -03:00 |
|
|
BongaTheProto
|
3230992305
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-12 13:28:32 -05:00 |
|
|
SandPoot
|
ee163aae68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-12 02:40:12 -03: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 |
|
|
SandPootandМарк
|
bcbecabf74
|
push
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
|
2023-10-06 01:11:28 -03:00 |
|
|
SandPoot
|
910263d2d9
|
Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13
|
2023-10-05 22:01:18 -03:00 |
|
|
SandPootandМарк
|
a105852042
|
the stuff
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
|
2023-10-05 21:15:11 -03:00 |
|
|
BongaTheProto
|
83918aa030
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-28 14:08:02 -05:00 |
|
|
SandPoot
|
e317be4989
|
oh boy i can't wait to find out people managing to exploit this
|
2023-09-27 17:11:10 -03:00 |
|
|
Zattarra
|
60bf3ed43b
|
Updates savefile version, changes default to TRUE.
|
2023-07-31 13:46:46 -07:00 |
|
|
BongaTheProto
|
650642d379
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-20 00:23:25 -05:00 |
|
|
SandPoot
|
1ec6b97ea3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-19 18:01:35 -03:00 |
|
|
SandPoot
|
217e23fc7f
|
push
|
2023-07-18 15:22:24 -03:00 |
|
|
BongaTheProtoandGitHub
|
5ec4426798
|
Merge pull request #845 from SPLURT-Station/character-ads
Ports the character directory
|
2023-05-27 14:27:24 -05:00 |
|
|
BongaTheProto
|
f74b876b5e
|
we've got a new menu boys
those crewmembers are looking quite exquisite today
also felinids are half-price
|
2023-05-20 15:38:43 -05:00 |
|
|
BongaTheProto
|
8c42034e40
|
only 16 pixels??? Bruh?????
Reinstates the original pixelshift range and also makes the viewport shifting a config so people don't get vertigo from the sliding sprites
|
2023-05-19 23:35:56 -05:00 |
|
|
Pin-alternative
|
cd29d1e6bc
|
changes
|
2023-04-23 17:17:52 +10:00 |
|
|
Pin-alternative
|
4ff94bb142
|
add min size
|
2023-03-05 20:02:51 +11:00 |
|
|
Pin-alternative
|
5ce56db316
|
Merge branch 'rework' of pin:Pin-alternative/S.P.L.U.R.T-Station-13 into rework
|
2023-03-05 19:17:54 +11:00 |
|
|
Pin-alternative
|
d1b3acbc5c
|
Merge remote-tracking branch 'upstream/master' into rework
|
2023-03-05 19:16:26 +11:00 |
|
|
Pin-alternative
|
3811cb58ec
|
remove stuff
|
2023-03-05 18:57:58 +11:00 |
|
|
BongaTheProto
|
acf6b87535
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-24 01:39:26 -05:00 |
|
|
SandPoot
|
f0dcf824a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-24 01:59:45 -03:00 |
|
|
SandPoot
|
cc8d385371
|
sanity
|
2023-02-24 01:11:12 -03:00 |
|
|
SandPoot
|
e6d471ef0d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into screentips-update
|
2023-02-24 01:07:49 -03:00 |
|
|
BongaTheProto
|
2151624f10
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-22 19:14:08 -05:00 |
|
|
SandPoot
|
13e0c6de7e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-21 02:04:25 -03:00 |
|
|
BongaTheProtoandGitHub
|
4f44965172
|
Merge pull request #765 from SPLURT-Station/old-character-menu
Brings back the old character creation menu
|
2023-02-20 11:52:05 -05:00 |
|