 Mosley
|
0d9eebd20c
|
Merge remote-tracking branch 'upstream/master'
|
2025-04-24 17:03:15 -05:00 |
|
|
SandPoot
|
2d87780147
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2025-02-13 18:06:56 -03:00 |
|
|
SandPoot
|
56d972eb0b
|
all sorts of fixes and updates, may break stuff
|
2025-02-09 02:09:28 -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 |
|
|
BongaTheProto
|
353e81e8ce
|
Merge remote-tracking branch 'upstream/master'
|
2024-05-29 17:56:50 -05:00 |
|
|
SandPoot
|
95a30412ad
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-25 15:46:29 -03:00 |
|
|
SandPoot
|
ad0f659226
|
push
|
2024-05-23 21:53:15 -03:00 |
|
|
BongaTheProto
|
1e1fc329f8
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-13 14:12:39 -05:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
SandPoot
|
91045350e5
|
overlay stuff
|
2024-04-12 22:01:03 -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
|
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 |
|
|
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 |
|
|
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 |
|
|
SandPoot
|
b945e7a5ed
|
push
|
2023-10-07 20:48:02 -03:00 |
|
|
Tsurupeta
|
d4ec25e748
|
all else
|
2023-08-08 14:01:18 +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 |
|
|
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 |
|