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-22 04:07:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph
289 Commits
Author SHA1 Message Date
Mosley 0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
BongaTheProto 353e81e8ce Merge remote-tracking branch 'upstream/master' 2024-05-29 17:56:50 -05:00
SandPoot 897f4e2914 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-22 21:08:11 -03:00
SandPoot 912ca1e374 poosh 2024-05-21 00:06:26 -03:00
BongaTheProto 51916b6bbc Update client_procs.dm 
fixes the focus resetting to the chat bar on click
 2024-04-08 01:38:43 -05:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
SandPoot 0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
SandPoot 17a01b6f2a revert stuff 2024-01-16 14:53:48 -03:00
SandPoot 1dad7e880e 514 click stuff? 2024-01-13 13:35:54 -03:00
SandPoot c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
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
shellspeed1 17f513eae4 Fixes clicking in the object menu but at what cost 2022-09-20 23:08:24 -07:00
shellspeed1 f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1 fbc80cf829 initial port 2022-09-09 00:29:20 -07: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