Commit Graph
1448 Commits
Author SHA1 Message Date
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
SandPootandGitHub f1d9fb376e Merge pull request #15969 from Phoenix4O4/port-ability-to-change-AI/Robot-laws
[PORT-YOG] Gives admins the ability to change AI/Robot Laws at wil
2023-09-03 15:24:48 -03:00
Tsurupeta eca4935865 reftracking 2023-08-08 14:01:16 +03:00
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
BongaTheProto a5ccea762f Update SDQL_2.dm 2023-06-24 20:12:58 -05:00
Lex 116dddc134 added datum and verbs for chane ai laws 2023-02-09 10:32:53 +03:00
BongaTheProto 7146a5f2eb Merge remote-tracking branch 'upstream/master' 2023-01-30 17:02:01 -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
BongaTheProtoandGitHub 9a67937ff7 Merge branch 'Sandstorm-Station:master' into master 2023-01-23 23:08:25 -05: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
BongaTheProto a949e5d08c Merge remote-tracking branch 'upstream/master' 2022-10-28 16:43:28 -05: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
Iosyf fda19d3d11 Qareen Almost Completion
- Added the Qareen to the spawnable antagonists list
- Finished modifications to the "Bliss", "Harvest" and "Malfunction"  abilities
- All that's left now is the manifestation (but I couldn't find any spriters for it so...)
- Probably needs to be balanced
2022-09-28 21:19:28 +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
Putnam3145 e1c822cbd8 TGUI; actually fixes station announcer 2022-08-07 17:17:58 -07:00
James f771ad67e4 Version 01 2022-07-30 18:07:13 +01: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
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
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
BongaTheProto 03f4c65fc4 Merge remote-tracking branch 'upstream/master' 2022-06-11 23:25:29 -05: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
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
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