shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,972 Commits 5 Branches 0 Tags
cd82124ef508f2c6c42e9d404fc7b0e76fc119cb
Commit Graph

88 Commits

Author SHA1 Message Date
CitadelStationBot
f624071766 [MIRROR] Ninja Refactor (#1037) 
* Ninja Refactor

* Update antagonists.dm

* Delete antagonists.dm.rej

* Update antagonists.dm

* Update mind.dm

* Update mind.dm

* whatever, I fixed that cunt
 2017-05-21 00:39:26 -05:00
CitadelStationBot
915fa6cac1 IsAdminAdvancedProcCall returns FALSE in TESTING 2017-05-19 16:00:23 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
ad65636014 [MIRROR] Fixes saying nothing when you have no language (#861) 
* Fixes saying nothing when you have no language

* fix .rej

* Update say.dm
 2017-05-18 06:12:39 -05:00
LetterJay
58909705e5 MAPPING DEBUG! WOO! 2017-05-17 10:01:38 -05:00
LetterJay
d7c24de679 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492 2017-05-17 09:58:53 -05:00
CitadelStationBot
013101bd48 Fixes spelling on the EM Pulse action 2017-05-17 05:01:25 -05:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
e66cbfd7db my v key is broken 2017-05-13 23:32:47 -05:00
LetterJay
36de555483 commit 2017-05-13 23:32:23 -05:00
CitadelStationBot
a679933cc7 SDQL cleanup (#904) 2017-05-11 18:26:15 -07:00
LetterJay
3c131800b6 Merge pull request #722 from Citadel-Station-13/upstream-merge-26645 
[MIRROR] Persistent investigate and game logs separated by round ID
 2017-05-10 21:12:08 -04:00
kevinz000
49881624e2 Merge pull request #772 from Citadel-Station-13/upstream-merge-26874 
[MIRROR] Fixes the most annoying thing about admin helping.
 2017-05-07 23:16:33 -07:00
kevinz000
102b28b1c1 Delete deadsay.dm.rej 2017-05-06 21:28:23 -07:00
LetterJay
f2f42091f3 Merge branch 'master' into upstream-merge-26685 2017-05-05 09:42:36 -05:00
LetterJay
5d0f7eafaa Merge pull request #719 from Citadel-Station-13/upstream-merge-26771 
[MIRROR] Removes vestigial list from minds.
 2017-05-05 09:40:28 -05:00
LetterJay
da4e4bbefe Merge pull request #707 from Citadel-Station-13/upstream-merge-26746 
[MIRROR] Makes admin sound announcement use the right span
 2017-05-05 09:39:04 -05:00
LetterJay
91f3059be1 Merge pull request #693 from Citadel-Station-13/upstream-merge-26722 
[MIRROR] Moves tips from config to strings tree
 2017-05-05 09:33:45 -05:00
CitadelStationBot
73bef0b6c8 Fixes the most annoying thing about admin helping. 2017-05-04 20:40:09 -05:00
LetterJay
007281a51c Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts" 2017-05-02 18:53:59 -05:00
CitadelStationBot
49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -05:00
CitadelStationBot
7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129 
[MIRROR] Unorphans the blackbox
 2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae Merge pull request #581 from Citadel-Station-13/upstream-merge-26524 
[MIRROR] Admin proc calls are now serialized per admin
 2017-05-02 04:51:43 -05:00
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
CitadelStationBot
b45d4ba668 Makes admin sound announcement use the right span 2017-05-01 17:32:29 -05:00
CitadelStationBot
529125d3dd Moves tips from config to strings tree 2017-05-01 11:51:27 -05:00
CitadelStationBot
34a701a1bc You can no longer queue up ahelps by queing up prompts 2017-05-01 11:38:04 -05:00
LetterJay
31ea9cb309 Merge pull request #657 from Citadel-Station-13/upstream-merge-26689 
[MIRROR] [s] Patches SDQL exploits that can return world reference
 2017-05-01 08:11:22 -05:00
LetterJay
d46b85e9ed Merge pull request #653 from Citadel-Station-13/upstream-merge-26676 
[MIRROR] Fix SDQL vars again
 2017-05-01 07:59:42 -05:00
CitadelStationBot
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
CitadelStationBot
9ef9161537 [s] Patches SDQL exploits that can return world reference 2017-04-29 16:59:08 -05:00
CitadelStationBot
c6544f20fd Fix SDQL vars again 2017-04-29 16:36:36 -05:00
CitadelStationBot
f972199a15 Fixed Dsay always causing a disk read 2017-04-29 15:44:51 -05:00
LetterJay
29720a0bb5 Update randomverbs.dm 2017-04-29 12:01:32 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c manual merge 2017-04-29 11:42:28 -05:00
LetterJay
101f1337a6 manual merge 2017-04-29 07:43:07 -05:00
CitadelStationBot
29fd2c6de6 Option for admins to show a song's title 2017-04-28 21:02:52 -05:00
CitadelStationBot
717d63f129 Adds new debug verb for highlighting roundstart ATs 2017-04-28 10:59:14 -05:00
LetterJay
a39b40d879 Merge pull request #578 from Citadel-Station-13/upstream-merge-25981 
[MIRROR] Initialize Refactor
 2017-04-28 09:29:00 -05:00
LetterJay
f7fa4d9843 Merge pull request #615 from Citadel-Station-13/upstream-merge-26187 
[MIRROR] Adds a delete verb to the vv_drop_down
 2017-04-28 08:18:07 -05:00
CitadelStationBot
6e874d1089 Fixes ircadminwho making the wrong list check 2017-04-27 17:56:36 -05:00