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 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,744 Commits 55 Branches 0 Tags
754c24748edbe3c729f6e9615b12e7587cba6da2
Commit Graph

1568 Commits

Author SHA1 Message Date
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Letter N
1fdb7fd639 cleanup 2021-03-02 09:49:49 +08:00
SmArtKar
e925aea454 Fixes 2021-02-23 12:44:11 +03:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08: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
Letter N
6abad913ff the sqel 2021-02-19 14:52:18 +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
SmArtKar
fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar
756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
silicons
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
SmArtKar
3e95e28f85 Illegal cards will now permanently be marked, not for just one round 2021-02-16 20:05:59 +03:00
SmArtKar
cf76b9d740 Fixes card saving, fixes some icons, adds rulebook 2021-02-16 12:12:20 +03:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Putnam
7a6ed7f500 Added a config to disallow unreadied players from voting on modes/storytellers 2021-02-08 22:59:49 -08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SmArtKar
c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
SmArtKar
1b4072a1b6 Well, reverts illegal cards not saving. Fuck it 2021-02-04 22:36:46 +03:00
SmArtKar
24619344f5 Traitor/nuke ops cards no longer count as real cards in binders(they are cheap knock-offs like come on nobody will believe that its a real card) 2021-02-04 19:08:35 +03:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar
41d6ab6b07 REEEEEEEEEE 2021-02-03 16:50:23 +03:00
SmArtKar
b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout 
loadout part 3: custom names and descriptions
 2021-01-27 19:09:41 -07:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
Artur
16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
Artur
3737c52df8 Funny actions 2021-01-20 15:23:34 +02:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons
2b16435033 Merge pull request #13610 from Putnam3145/fix-eq-hogging 
Makes the atmos subsystem pause correctly
 2021-01-19 19:29:19 -07:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
timothyteakettle
837e766306 fixes sanitization 2021-01-19 01:04:01 +00:00
Timothy Teakettle
b956df2226 name description implement 2021-01-18 21:59:00 +00:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
Putnam
02efd6237f Replaces majority judgment with usual judgement 2021-01-11 12:39:18 -08:00
silicons
e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons
849e9405fd projectile fix 2021-01-08 18:53:49 -08:00
silicons
01321cb2ac let's just use the tg version 2021-01-08 12:06:15 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
Putnam3145
5cde6e0157 Merge pull request #13871 from silicons/debris 
Merry Christmas - GIVING JANITORS A JOB
 2021-01-08 00:26:52 -08:00
MrJWhit
cc2bcfedf1 Update garbage.dm 2021-01-07 22:50:03 -05:00
Letter N
cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Blue Wildrose
0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
Letter N
56789c5924 firsthit-lib_machines 2020-12-31 16:46:40 +08:00
silicons
0c87c3b0e0 fiX 2020-12-28 12:15:55 -08:00
silicons
57d85f7e86 okay 2020-12-27 05:20:29 -08:00
silicons
5266ae1437 okay 2020-12-26 22:28:41 -08:00