 BongaTheProto
|
2d1d665e41
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit c1c9fef224, reversing
changes made to 6767f48e82.
|
2023-12-16 10:48:35 -05:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
36f3edaf4c
|
push
|
2023-12-10 15:16:51 -03:00 |
|
|
BongaTheProto
|
6e6bce8772
|
Merge remote-tracking branch 'upstream/master' into hate-upstream
|
2023-10-18 22:02:48 -05:00 |
|
|
SandPoot
|
45a94856c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-18 18:24:11 -03:00 |
|
|
SandPoot
|
297ee64977
|
push
|
2023-10-12 15:45:35 -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 |
|
|
BlueWildroseandGitHub
|
9f29f08cd0
|
Merge pull request #16013 from SandPoot/change-preferences
Preferences menu layout change
|
2023-10-11 13:51:37 -06:00 |
|
|
BongaTheProto
|
dca4dab806
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-10 21:58:50 -05:00 |
|
|
SandPoot
|
a70314d98e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-10 17:29:05 -03:00 |
|
|
SandPoot
|
d4ea14c4ef
|
push
|
2023-10-09 16:15:49 -03:00 |
|
|
SandPoot
|
b624de1c10
|
you go
|
2023-10-08 13:01:15 -03:00 |
|
|
BongaTheProtoandGitHub
|
4742a61480
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-10-08 02:36:51 -05:00 |
|
|
SandPoot
|
b945e7a5ed
|
push
|
2023-10-07 20:48:02 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +03:00 |
|
|
BongaTheProto
|
cdd5bb87d8
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-08 01:42:46 -05:00 |
|
|
SandPoot
|
4b9488a9b3
|
right codebase!
|
2023-08-05 14:05:00 -03:00 |
|
|
SandPoot
|
8bf6e9ffcc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-08-05 13:51:50 -03:00 |
|
|
SandPoot
|
c54ce2d09d
|
wrong codebase
|
2023-08-04 00:16:53 -03:00 |
|
|
SandPoot
|
403c49afab
|
push
|
2023-08-04 00:11:08 -03:00 |
|
|
BongaTheProto
|
2b718295d3
|
Merge remote-tracking branch 'upstream/master'
|
2023-07-23 13:41:11 -05:00 |
|
|
SandPoot
|
8b66a57665
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-07-21 00:23:16 -03:00 |
|
|
SandPoot
|
6ab934f6a1
|
pushies
|
2023-07-19 15:06:23 -03:00 |
|
|
KeplerWasTaken
|
02c20c35e4
|
Mafia verb removal
|
2023-03-28 23:22:55 +02:00 |
|
|
BongaTheProto
|
3f376c1bb3
|
Merge remote-tracking branch 'upstream/master'
|
2023-02-13 19:36:05 -05:00 |
|
|
SandPootandGitHub
|
4a01b9f5e2
|
Re-UI-ing (just steals old skyrat) (#302)
* send it
* redefining counts as error, so goodbye
|
2023-02-13 00:22:01 -03:00 |
|
|
BongaTheProtoandGitHub
|
d9d617bf8d
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-02-10 16:53:13 -05:00 |
|
|
SandPoot
|
65c38e9828
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-02-10 02:18:08 -03:00 |
|
|
SandPoot
|
5052f836e7
|
the stuff
|
2023-02-06 19:54:54 -03:00 |
|
|
BongaTheProto
|
ebbb0ad08c
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-10 16:51:46 -05:00 |
|
|
DariusandGitHub
|
7fdaa58689
|
Fix latejoin panel slot displays (#281)
Fixes a redundant display of job slots on the latejoin panel, caused by non-modular edits.
|
2023-01-10 08:23:38 -03:00 |
|
|
BongaTheProto
|
ab9d691f1a
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-09 16:59:38 -05:00 |
|
|
SandPoot
|
42d4abc164
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-07 16:44:44 -03:00 |
|
|
Darius
|
3adcab1756
|
Display job slots out of total during late-join
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
|
2023-01-04 19:15:09 -05:00 |
|
|
BongaTheProto
|
a04476b38d
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-16 20:39:53 -05:00 |
|
|
SandPoot
|
011dd2e817
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-16 16:47:19 -03:00 |
|
|
LinandGitHub
|
7d0c3df2ad
|
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
|
2022-12-14 19:07:59 -07:00 |
|
|
BongaTheProtoandGitHub
|
a1c93d4767
|
Merge branch 'Sandstorm-Station:master' into master
|
2022-11-09 19:12:06 -05:00 |
|
|
SandPoot
|
ba6d614e6a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-11-09 20:50:44 -03:00 |
|
|
siliconsandGitHub
|
268184347a
|
Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs
Revert "Grant Arachnid Abilities to Driders"
|
2022-11-03 22:52:38 -07:00 |
|
|
BongaTheProto
|
a949e5d08c
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-28 16:43:28 -05:00 |
|
|
SandPoot
|
02e4551a27
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-25 22:52:45 -03:00 |
|
|
LinandGitHub
|
03c62f4359
|
Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
|
2022-10-25 04:36:00 +00:00 |
|
|
SandPoot
|
24ee6077c7
|
push changes
|
2022-10-23 00:18:03 -03:00 |
|
|
Jerry WesterandGitHub
|
aace737989
|
Revert "Grant Arachnid Abilities to Driders"
|
2022-10-19 17:20:52 -06:00 |
|
|
siliconsandGitHub
|
afed04d2fa
|
Merge pull request #15873 from zeroisthebiggay/tallears
tall ears from virgo
|
2022-10-19 16:15:11 -07:00 |
|
|
zerothebigboy
|
1f8f5dc071
|
cocka
|
2022-10-19 03:49:33 -04:00 |
|
|
zerothebigboy
|
2fd981a05a
|
penis
|
2022-10-18 23:57:02 -04:00 |
|
|
zerothebigboy
|
30bf2312f3
|
seizure
|
2022-10-18 23:37:40 -04:00 |
|