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-20 11:17:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
268 Commits
Author SHA1 Message Date
BongaTheProto e1cb9c8346 Merge remote-tracking branch 'upstream/master' 2022-09-27 23:19:10 -05:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
BongaTheProto 811c1df810 Merge remote-tracking branch 'upstream/master' 2022-07-24 12:05:49 -05:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
siliconsGitHubdeathride58
 		42f14aaef2 Update code/modules/client/client_procs.dm 
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
 2022-07-23 14:28:09 -07:00
BongaTheProto 63e9e61921 file limits 
because we don't need even more lag
 2022-06-30 17:23:03 -05:00
siliconsandGitHub 763c5ff195 Update client_procs.dm 2022-06-11 01:11:17 -07:00
SandPoot 856850c1b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-29 21:41:59 -03:00
deathride58 b14b503dbd cleanup 2022-05-26 20:04:11 -04:00
deathride58 ace4eb6c8d [S] blocks a freshly rediscovered aimbot exploit 2022-05-26 20:03:03 -04:00
SandPoot 7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03:00
siliconsandGitHub cdefa4f64a Merge pull request #15535 from SandPoot/statpanel 
Statpanel update
 2022-03-10 16:50:59 -07:00
SandPoot 5f083fbddd Upload files 2022-03-05 14:22:42 -03:00
SandPoot 45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
SandPoot 7523279254 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-07 22:07:59 -03:00
siliconsandGitHub af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
SandPoot 3bbe8d199c emergency merge 2022-02-05 00:48:43 -03:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
LetterN 41e5034005 i forgot about this component. Lavaland should have sounds now 2021-11-22 14:18:46 +08:00
LetterN 8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
SandPoot b5f35da60d Update client_procs.dm 2021-11-11 13:23:05 -03:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
Letter NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
SandPootandGitHub 829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
SandPoot 5f72ad8d61 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-11 20:33:04 -03:00
Putnam3145andGitHub b6fdf671f1 Merge pull request #15215 from silicons/afk_tracking 
fixes afk detection
 2021-10-11 15:52:03 -07:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
silicons 0ec7e92f82 that too 2021-09-27 17:44:14 -07:00
silicons 697ea7ad93 fix 2021-09-27 17:40:53 -07:00
silicons ae513d3114 feautre 2021-09-17 21:58:26 -07:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +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
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
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08: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
silicons 3b441bfd28 kay 2021-02-13 19:03:27 -07:00
silicons 77f4e08727 AAAAAAAAA 2021-02-13 18:57:30 -07:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SandPootandGitHub d8e8592fa2 Adding a couple changeable things for hosts (#139) 2021-01-28 23:13:14 -03:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
silicons bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00