Commit Graph
169 Commits
Author SHA1 Message Date
BongaTheProto 700fd57efb Merge remote-tracking branch 'upstream/master' 2023-12-08 20:22:05 -05:00
SandPoot 42fdd30ba4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-05 17:47:58 -03:00
SandPoot b290efc434 push 2023-11-22 14:11:17 -03:00
BongaTheProto fb1dc86226 Merge remote-tracking branch 'upstream/master' 2023-09-03 18:06:53 -05:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -03:00
Lex 116dddc134 added datum and verbs for chane ai laws 2023-02-09 10:32:53 +03:00
BongaTheProto 69d0eb78ed you ahelp for vpn now
because some people apparently need em
2022-08-21 21:33:31 -05:00
BongaTheProto 9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05: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
BongaTheProto 0b89d8c778 Merge remote-tracking branch 'upstream/master' 2022-06-20 01:08:17 -05: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
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
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
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
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
James 31b5fade19 Added more stuff to PP and misc 2022-02-25 05:12:50 +00:00
James 1038df6983 First page of panel basically done 2022-02-19 17:42:17 +00:00
BongaTheProto 9e01433882 Merge remote-tracking branch 'upstream/master' 2022-01-31 01:23:59 -05: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
BongaTheProto 973ed1824c fix
fix
2022-01-11 13:46:40 -05:00
BongaTheProto 61704cba70 Verbs ready
these are the base verbs
2022-01-06 18:56:03 -05:00
BongaTheProto 228156d4be Merge branch 'master' into tg-redbot-integration 2022-01-05 11:59:27 -05:00
BongaTheProto 91a6b73ae1 yeah
name's cringe but that's literally what it is lol
2022-01-05 04:09:12 -05:00
James a67efdc1fa TGUI Playtimes Panel 2022-01-05 05:22:53 +00:00
BongaTheProto 1fd1ae3771 no more clown I hate clown
I'll remove the clown job and anything clown related later I swear
2021-12-24 15:13:22 -05:00
Putnam3145 657b25b501 i forgot i didn't add ammonia yet 2021-12-08 18:05:19 -08: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
SandPoot d55d628efe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-08 21:34:03 -03:00
SandPoot 437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb 6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
keronshb 7ed5f622f4 Dynamic 2021-09-14 19:33:17 -04:00
SandPoot 51fdbc73d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-10 23:14:02 -03:00
LetterN e94725344b extool based reftracking 2021-09-08 10:30:35 +08:00
SandPoot d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
Putnam 833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
SandPoot 91fd04c552 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-10 23:41:21 -03:00
Putnam 1c17570ea8 works but leaks 2021-05-30 00:28:51 -07:00
keronshb 78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
keronshb 9e3c1ff860 adds floor cluwnes from yog 2021-05-24 22:46:59 -04:00