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
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1461 Commits
Author SHA1 Message Date
deathride58 f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
Putnam3145 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
AManWithAToolbox dda0869f82 Merge branch 'pr/1' into its-wasnt-gonna-happen 2022-04-18 23:19:18 -05:00
BongaTheProto 6ada3f7c94 Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen 2022-04-18 21:36:14 -05:00
ProdsandGitHub 7691d7ba0f Update adminhelp.dm 
Added functionality to send new ticket ahelp notifications to Discord for Crossed Cogs SS13 status cog.
 2022-04-16 19:24:06 -04:00
SandPoot 800817e2a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:45:37 -03:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsGitHubDeltaFire
 		be5a476aaf fixes being unable to access own notes (#15599) 
* Update sql_message_system.dm

* not webeditting

Co-authored-by: DeltaFire <andreoxgrievous@gmail.com>
 2022-04-16 04:35:56 +02:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
BongaTheProto b601e94958 Merge remote-tracking branch 'upstream/master' 2022-03-31 00:14:54 -05:00
SandPoot 282941ca5b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-31 00:21:11 -03:00
siliconsandGitHub bfbba7cb06 blocks investigate log access without R_SENSITIVE (#15573) 
* Update admin_verbs.dm

* Update admin_verbs.dm

* Update sql_message_system.dm
 2022-03-30 12:42:05 -07:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
BongaTheProto 6ca3ae40ec Update chat_commands.dm 
i seriusly wonder who in the fuck made this and said "yup, this is a good idea"
 2022-03-23 08:35:39 -05:00
James b3fc91a1f4 Adds logs button 2022-02-28 05:46:01 +00:00
BongaTheProto 899f66ecc6 Merge branch 'master' into pr/214 2022-02-27 15:16:13 -05:00
BongaTheProto ddd36b40cf Merge part 2 
Yeah this should fix everything with the update
 2022-02-27 14:39:07 -05:00
BongaTheProto 54aec9bd98 Merge remote-tracking branch 'upstream/master' 2022-02-27 14:38:06 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
James e1ec4b66fd Some modularisation 2022-02-27 16:02:26 +00:00
LinandGitHub ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck 
Ambitions from Skyrat
 2022-02-27 02:34:13 +00:00
siliconsandGitHub bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system 
[PORT] Removes the non bitflag slot defines
 2022-02-26 18:08:28 -07:00
siliconsandGitHub 87e58fcc14 Merge pull request #15505 from SandPoot/playertimes-tgui 
Player Playtime TGUI
 2022-02-26 18:08:18 -07:00
James 7932cd7b07 Cleanup 3 2022-02-26 09:59:54 +00:00
James a5d37e701f More cleanup 2022-02-26 09:07:58 +00:00
James d55f509282 Cleanup 2022-02-26 06:42:19 +00:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
James 31b5fade19 Added more stuff to PP and misc 2022-02-25 05:12:50 +00:00
keronshb 3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
James 6717ae7dd2 Jobban panel merged with player panel 2022-02-21 19:21:13 +00:00
James ef610eb21c WIP jobban panel 2022-02-20 18:40:00 +00:00
James 1038df6983 First page of panel basically done 2022-02-19 17:42:17 +00:00
BongaTheProtoandGitHub c8060ac1a2 Merge pull request #193 from Crowbar764/slaver-patch-4 
Slaver Patch 4
 2022-02-18 01:41:10 -05:00
BongaTheProtoandGitHub 93016e7568 Merge branch 'Sandstorm-Station:master' into master 2022-02-16 16:03:32 -05:00
SandPoot bf69229ada Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-16 17:18:56 -03:00
SandPoot c42aa2c30a Upload files 2022-02-15 22:16:07 -03:00
SandPoot a3d9dd2c99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into job-exp-exemption 2022-02-15 18:35:23 -03:00
SandPoot 52a8fe276b Update files 2022-02-15 18:27:33 -03:00
James 178b0ebef4 Adds option to recruit slaves 2022-02-15 13:27:59 +00:00
BongaTheProto b437b03b48 Merge remote-tracking branch 'upstream/master' 2022-02-13 13:40:33 -05:00
SandPoot 5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
BongaTheProtoandGitHub 4876b05297 Merge pull request #177 from SPLURT-Station/ambitions 
Ambitions from skyrat
 2022-02-08 16:21:00 -05:00
BongaTheProto ffcca5c46b Merge remote-tracking branch 'upstream/master' 2022-02-08 01:16:02 -05: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
BongaTheProto 5638985734 Merge branch 'ambitions' into pr/176 2022-02-06 20:27:38 -05:00
BongaTheProtoandGitHub d0054c5558 Merge pull request #161 from Crowbar764/slave-antag-patch 
Slave antag patch 2
 2022-02-01 20:16:19 -05:00
James 560b23592d More buyable stuff, new teleport gizmo, misc changes 2022-02-01 03:21:15 +00:00
BongaTheProto 9e01433882 Merge remote-tracking branch 'upstream/master' 2022-01-31 01:23:59 -05:00