shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,685 Commits 5 Branches 0 Tags
8d9dc6dd136647149db6f0bc274a4e0729a2b0cd
Commit Graph

124 Commits

Author SHA1 Message Date
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025) 
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
 2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00
CitadelStationBot
55462ed7d1 Replaces ex_act and emp_act numbers with defines 2017-07-13 17:46:41 -05:00
CitadelStationBot
f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905) 
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
 2017-07-13 06:37:51 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
CitadelStationBot
d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
d105e57af1 Do not use your brain, do not look at the code, do not engage me (#1818) 2017-06-30 20:21:34 -07:00
CitadelStationBot
2312e89503 Makes IRC pm use ckey() on target 2017-06-29 22:22:21 -05:00
LetterJay
75339a25c4 Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782 
[MIRROR] Improves Ahelp feedback
 2017-06-26 06:19:03 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBot
5f4e1ed721 Improves Ahelp feedback 2017-06-26 06:01:38 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay
a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
CitadelStationBot
7fdb5f484e Makes vv log show intended change instead of result (#1575) 2017-06-17 13:30:45 -07:00
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
CitadelStationBot
a5a24e3955 Fixes admin being unable to see each other's PMs 2017-06-13 09:59:01 -05:00
LetterJay
49c35e6848 Merge pull request #1560 from Citadel-Station-13/upstream-merge-28225 
[MIRROR] New Ahelp IRC functions
 2017-06-13 06:12:22 -05:00
CitadelStationBot
0ff5c60acb Fixes buildmode help text 2017-06-13 02:30:20 -05:00
CitadelStationBot
82a1a5c03b New Ahelp IRC functions 2017-06-12 19:22:48 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot
1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot
d341334118 [s] Fixes IRC ahelps 2017-06-07 21:27:14 -05:00
LetterJay
43a3a6b52a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27708 2017-06-05 22:48:20 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot
e8663bee81 Refactors the latejoin list 2017-06-04 15:08:35 -05:00
CitadelStationBot
13767b91ad Fixes admiral recall (#1374) 2017-06-04 02:18:42 -07:00
CitadelStationBot
263b79b299 [MIRROR] Individual logs are no longer lost with mob changes (#1249) 
* Individual logs are no longer lost with mob changes

* Delete mob_defines.dm.rej
 2017-06-02 22:01:58 -07:00
CitadelStationBot
538bce59a6 Advanced proccall now supports /proc/PROCNAME 2017-05-31 19:24:13 -05:00
CitadelStationBot
22e6669111 Small outfit refactor 2017-05-27 20:47:45 -05:00
LetterJay
aad357bd74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27450 2017-05-22 16:56:18 -05:00
CitadelStationBot
26448d7016 Removes the mess added with recalling with a message 2017-05-21 07:57:17 -05:00
Poojawa
186ed2acbb Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268 2017-05-21 00:44:08 -05:00
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
94b7e560ab World.dm Refactor 2017-05-18 16:37:46 -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