cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-24 05:39:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,788 Commits 8 Branches 0 Tags
modsuit-update
Commit Graph
1384 Commits
Author SHA1 Message Date
SandPoot e07874972b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-06-25 01:01:18 -03:00
KrissKr0ssandGitHub 0212870845 Update SDQL_2.dm 2023-06-24 22:41:56 -05:00
SandPoot 8ae64b1bd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-29 19:16:50 -03:00
siliconsandGitHub 469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui 
Event menu rewrite
 2023-01-29 13:46:39 -08:00
siliconsandGitHub eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix 
update mentor admin log sql query
 2023-01-29 13:46:12 -08:00
SandPoot 122bc02af9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-23 20:58:51 -03:00
SandPoot 54641ce201 send 2023-01-23 20:44:28 -03:00
SandPoot 854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
LetterN d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08:00
SandPoot 02e4551a27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-25 22:52:45 -03:00
LinandGitHub 03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast 
Fixes deadchat_broadcast
 2022-10-25 04:36:00 +00:00
SandPoot 24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
SandPoot 00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145 b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
SandPoot 0a0e4de14b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-24 02:59:28 -03:00
deathride58 578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
TripleShades 3742e1e5a8 enables this verb for use by admins 2022-06-15 16:49:24 -04:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
deathride58 512a8c783c basic code cleanup and limits 2022-06-09 23:37:49 -04:00
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
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
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
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03: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
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
keronshb 3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -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
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
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
SandPootandGitHub ef1e5bae16 Adds a command for admins to easily end the shift (calls shuttle) + misc stuff (#222) 2022-01-30 21:09:11 -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 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot 086e3bc704 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-09 23:40:45 -03:00
siliconsandGitHub 4de727ce6e Update SDQL_2.dm (#15462) 2022-01-09 16:59:29 +01:00
SandPoot 9694d84e14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-02 20:56:15 -03:00