cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-18 02:06:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
2490 Commits
Author SHA1 Message Date
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 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
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 7b5ecc7b49 Merge remote-tracking branch 'upstream/master' 2023-10-07 23:28:42 -05:00
SandPoot 910263d2d9 Merge branch 'update-config' of https://github.com/SandPoot/Citadel-Station-13 2023-10-05 22:01:18 -03:00
SandPoot d16a39505f oopsies 2023-10-05 21:39:55 -03:00
SandPoot 6cd2cfcd01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-config 2023-10-05 21:25:29 -03:00
SandPoot ddf9827afb lowercasing possible 2023-10-05 21:24:13 -03:00
SandPootandМарк a105852042 the stuff 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
 2023-10-05 21:15:11 -03:00
BongaTheProto cd026aaddb Merge remote-tracking branch 'upstream/master' 2023-10-05 13:38:12 -05:00
SandPoot bb1886ddb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-03 21:00:13 -03:00
SandPoot 962c3e7b76 fix 2023-10-03 14:31:45 -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 5382130370 Squashed commit of the following: 
commit 0081f9fa79
Author: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com>
Date:   Mon Jul 31 18:40:02 2023 +0000

    Automatic changelog compile [ci skip]

commit 94be79788c
Merge: 13da11c4bc ee540149d8
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:38:17 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit ee540149d8
Merge: c317c8b8fc 410d80987e
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Mon Jul 31 11:37:20 2023 -0700

    Merge pull request #15994 from SandPoot/quick-fix-1

    Fixes changeling's stings

commit 13da11c4bc
Merge: 8b56f314e6 c317c8b8fc
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:36:19 2023 -0300

    Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

commit 410d80987e
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:04:52 2023 -0300

    nope, who OWNS it

commit 860f75d464
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Mon Jul 31 15:02:51 2023 -0300

    go

commit c317c8b8fc
Merge: 19dee4e0f6 bfe07112ff
Author: silicons <2003111+silicons@users.noreply.github.com>
Date:   Sun Jul 30 10:49:51 2023 -0700

    Merge pull request #15993 from SandPoot/station-name

    New Station Trait: Randomizing Station Name

commit bfe07112ff
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Fri Jul 28 13:53:09 2023 -0300

    i hate keyed_list, i'm not keeping it in

commit 6896a2e481
Author: SandPoot <enric_gabirel@hotmail.com>
Date:   Thu Jul 27 21:09:41 2023 -0300

    what was it again?
 2023-08-01 00:22:39 -05:00
SandPoot 13da11c4bc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-31 15:36:19 -03:00
SandPoot bfe07112ff i hate keyed_list, i'm not keeping it in 2023-07-28 13:53:09 -03:00
SandPoot 6896a2e481 what was it again? 2023-07-27 21:09:41 -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