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-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,646 Commits 55 Branches 0 Tags
88dfc6cf036312d16300f7a2eb8e64ed2fc76183
Commit Graph

2070 Commits

Author SHA1 Message Date
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
silicons
3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons
70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp 
Adds clown waddle to clown shoes.
 2021-02-08 03:02:40 -07:00
SmArtKar
c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
Chiirno
c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
SmArtKar
17e8e72df2 Fuck this shit I am out 2021-02-02 16:28:42 +03:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
TyrianTyrell
fdf575e618 Update tgstation.dme 2021-01-31 15:16:55 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat 
two toggled self-buffing spells that have no relation to any anime or video game in particular
 2021-01-13 16:50:50 -07:00
kappa-sama
3d9e907532 fixed 2021-01-12 02:19:13 -05:00
DeltaFire
2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
silicons
9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky 
Good Night Disky
 2021-01-09 15:39:06 -07:00
silicons
f1c6cbed1d dme 2021-01-08 00:56:00 -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
silicons
16a9361345 move this 2021-01-05 22:48:28 -08:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
silicons
ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon 
Ports bluespace navigation gigabeacon from TG
 2021-01-03 18:11:10 -07:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
shellspeed1
45ce0a72a1 Ports bluespace navigation gigabeaconon 
port of https://github.com/tgstation/tgstation/pull/44807
 2020-12-31 01:49:38 -08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
raspy-on-osu
0e652cb64c init 2020-12-26 06:02:09 -05:00
silicons
d5ab4b79dc dme 2020-12-25 16:07:29 -08:00
silicons
c05c57acf9 persistent module 2020-12-25 15:49:55 -08:00
Letter N
47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N
e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFire
d796952800 Merge pull request #13835 from silicons/pugilist_parry 
Pugilists can now parry most things with their bare hands
 2020-12-22 17:42:19 +01:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2 
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
 2020-12-22 17:40:33 +01:00
silicons
97e4aad75f changes 2020-12-21 17:14:22 -07:00
Letter N
abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N
2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N
a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates 
ports colormates from rp/vorestation
 2020-12-20 18:14:48 +00:00
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons
b34f5d56f6 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 22:54:16 -07:00
DeltaFire
d3f3862e18 Merge pull request #13696 from silicons/slime_tf 
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
 2020-12-14 05:57:03 +01:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07:00
silicons
599a1f0419 fix 2020-12-11 05:06:44 -07:00
Timothy Teakettle
a976d42305 Revert "webedit adds spaces for some reason" 
This reverts commit 8d41c15b75.
 2020-11-22 21:42:36 +00:00
Timothy Teakettle
8d41c15b75 webedit adds spaces for some reason 2020-11-22 21:42:14 +00:00
Timothy Teakettle
285208ece3 Merge branch 'master' into communication-hotkeys 2020-11-22 21:30:43 +00:00
silicons
27c4dff507 ports 2020-11-21 21:02:54 -07:00