 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
|
7ec9e65dcf
|
cease those screams
|
2024-04-05 18:39:33 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
BongaTheProto
|
9faeb05972
|
fixes wrong verb references
Regex is a double edged sword.
Also fixes a bug I hadn't noticed in mentor verbs
|
2024-03-31 22:00:37 -05: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 |
|
|
ariaworld
|
93f0fb7e6c
|
Fix a few hard-dels
|
2024-01-21 16:14:07 +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 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
BongaTheProto
|
750f742f95
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-28 18:31:39 -05:00 |
|
|
SandPoot
|
e7b267ca63
|
push
|
2023-12-27 01:06:25 -03: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 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -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 |
|