 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
|
d7942e1365
|
button
|
2023-12-10 00:50:10 -03:00 |
|
|
BongaTheProto
|
37bbecefb4
|
Merge remote-tracking branch 'upstream/master'
|
2023-11-05 18:01:32 -05:00 |
|
|
SandPoot
|
fd124b03e4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-03 21:27:30 -03:00 |
|
|
SandPoot
|
55e0e5de06
|
real quick
|
2023-10-28 17:54:31 -03:00 |
|
|
SandPoot
|
0b6d743e22
|
go
|
2023-10-28 17:51:02 -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
|
dca4dab806
|
Merge remote-tracking branch 'upstream/master'
|
2023-10-10 21:58:50 -05:00 |
|
|
SandPoot
|
41671a5f22
|
quick dmapi stuff update
|
2023-10-10 18:30:48 -03:00 |
|
|
BongaTheProto
|
fb1dc86226
|
Merge remote-tracking branch 'upstream/master'
|
2023-09-03 18:06:53 -05:00 |
|
|
SandPoot
|
f53a7a1f40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-03 17:47:27 -03:00 |
|
|
Katherine Kiefer
|
117690b5a3
|
use the config
|
2023-08-18 22:38:21 +10:00 |
|
|
Katherine Kiefer
|
0870fa9734
|
disable eq
|
2023-08-18 22:36:39 +10:00 |
|
|
Katherine Kiefer
|
16a490ee5c
|
update auxmos
|
2023-08-18 22:13:30 +10: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
|
9a902b6348
|
branch name goes hard
|
2023-08-04 12:29:29 -03:00 |
|
|
BongaTheProto
|
7405dab0c7
|
better than youtube downloads I suppose
I mean, they'll still download their songs from youtube most likely but at least we'll make sure it won't crash the server lol
|
2023-07-15 14:09:59 -05:00 |
|
|
Comicao1
|
4feb5f5b35
|
Merge remote-tracking branch 'upstream/master' into xenoarch-new
|
2023-04-03 20:32:55 -03:00 |
|
|
Comicao1
|
a5cee0c4cb
|
Merge remote-tracking branch 'upstream/master' into xenoarch-new
|
2023-04-03 19:31:53 -03:00 |
|
|
BongaTheProto
|
1f58235a4a
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-03 11:52:47 -05:00 |
|
|
SandPoot
|
9d214e2f9d
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-04-03 12:53:37 -03:00 |
|
|
Comicao1
|
d25175edb2
|
Done
|
2023-04-02 11:56:09 -03:00 |
|
|
LinandGitHub
|
654e5dad9d
|
Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
|
2023-04-01 00:17:22 -07:00 |
|
|
BongaTheProtoandGitHub
|
a3cdbf3d1c
|
Merge branch 'Sandstorm-Station:master' into master
|
2023-03-30 19:20:25 -05:00 |
|
|
SandPoot
|
66a61e52c6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-30 15:25:34 -03:00 |
|
|
Drulikar
|
ad145751a7
|
Fix admin command to load away missions.
|
2023-03-26 00:01:04 -07:00 |
|
|
Comicao1
|
d1f6424325
|
Initial XENOARCH port
|
2023-03-14 19:25:05 -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 |
|
|
Timothy TeakettleandGitHub
|
390dcbcea0
|
Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
|
2023-02-09 21:39:05 +00:00 |
|
|
SandPoot
|
5052f836e7
|
the stuff
|
2023-02-06 19:54:54 -03:00 |
|
|
BongaTheProto
|
7146a5f2eb
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-30 17:02:01 -05:00 |
|
|
SandPoot
|
8ae64b1bd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-01-29 19:16:50 -03:00 |
|
|
SandPoot
|
54641ce201
|
send
|
2023-01-23 20:44:28 -03:00 |
|
|
T-I-MandGitHub
|
e602dc6ef2
|
Game mode in status panel
|
2023-01-01 16:19:13 +03:00 |
|
|
BongaTheProto
|
ee6823c69b
|
Merge remote-tracking branch 'upstream/master'
|
2022-12-13 12:14:11 -05:00 |
|
|
SandPoot
|
f4b7513f10
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-12-13 01:35:33 -03:00 |
|
|
LinandGitHub
|
7205781c47
|
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
|
2022-12-12 19:11:49 -07:00 |
|
|
SandPoot
|
8911fe5e0b
|
clear em
|
2022-12-11 17:58:45 -03:00 |
|
|
BongaTheProto
|
f923e016e9
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-28 18:44:15 -05:00 |
|
|
SandPootandGitHub
|
a21a047c3d
|
Fixes custom roundstart items (#272)
|
2022-10-28 20:30:36 -03:00 |
|
|
SandPoot
|
03dce922a1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2022-10-28 19:20:03 -03:00 |
|
|
BongaTheProto
|
a949e5d08c
|
Merge remote-tracking branch 'upstream/master'
|
2022-10-28 16:43:28 -05:00 |
|
|
IHOPMommyLich
|
a18577a334
|
Lowering Threshold
Lowers the base transfer vote threshold from 3 to 1.
|
2022-10-25 23:00:22 -04: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 |
|