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-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1577 Commits
Author SHA1 Message Date
SandPoot 4fa8abfca7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-16 18:54:54 -03:00
DeltaFireandGitHub b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab 
the speech panel pr
 2021-03-16 20:31:58 +01:00
SandPoot f6758d2b73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-10 02:05:24 -03:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
necromanceranne bdcd2904e6 Fixes going over the defined limit of roundstart prosthetics 2021-03-09 03:56:51 +11:00
Letter N 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
SandPoot af6a8bdd5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-03 12:05:27 -03:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
siliconsandGitHub 8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Timothy Teakettle 9c3f7cbad6 no 2021-03-01 21:05:32 +00:00
Timothy Teakettle 806ad46aa6 no 2021-03-01 20:57:51 +00:00
Timothy Teakettle 329e8e7d38 Merge branch 'master' into language-tab 2021-03-01 20:49:16 +00:00
MarinaGryphonandGitHub cc0f79f772 Fixes #14341 2021-02-28 19:05:10 -06:00
Letter N 5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
siliconsandGitHub ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
SandPoot 2c618200f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 12:14:31 -03:00
Letter N 7c0a63f729 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-21 09:57:22 +08:00
Letter N 0bb5ec3316 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-21 09:55:36 +08:00
Putnam ecc1ff26bb Slightly more logging, whoops added pref 2021-02-18 21:27:59 -08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
SandPoot e33b171693 some troubleshooting and making sure people can open pref menus, and a list containing a null is very bad. 2021-02-17 20:50:20 -03:00
SandPoot 96fc996306 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 into better-size-code 2021-02-17 17:43:53 -03:00
SandPoot 1bdabd4e82 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-17 17:35:20 -03:00
SandPootandGitHub 9a6dbc2141 Additional languages rework (#143) 
* upload files

* upload files
 2021-02-17 16:23:58 -03:00
siliconsandGitHub e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
SandPoot e1e3ec8e9f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-14 19:08:22 -03:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons 3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons 77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
SandPoot 16caee3026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-12 14:30:56 -03:00
Letter N a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Timothy Teakettle d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SandPoot 3aa7554135 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-06 20:36:07 -03:00
TyrianTyrellandGitHub d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
TyrianTyrellandGitHub 7ffbc07e03 Update preferences.dm 2021-02-04 15:08:32 -05:00
TyrianTyrellandGitHub 26d911a643 Update preferences.dm 2021-02-04 15:07:52 -05:00
SmArtKar b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
TyrianTyrellandGitHub e47fdeab5d Fixed typo 2021-02-01 09:10:34 -05:00
TyrianTyrellandGitHub db548a4cfa Removed antag languages 2021-02-01 09:03:27 -05:00
TyrianTyrellandGitHub 6c49becd2e Update preferences.dm 2021-02-01 05:52:44 -05:00
TyrianTyrellandGitHub c8f797d69c Update preferences_savefile.dm 2021-02-01 05:45:14 -05:00
TyrianTyrellandGitHub 6ad09c3de1 Update preferences.dm 2021-02-01 05:42:42 -05:00
SandPootandGitHub d8e8592fa2 Adding a couple changeable things for hosts (#139) 2021-01-28 23:13:14 -03:00
SandPoot 28e87a5db5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-28 21:57:36 -03:00