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

1749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay
da2fc1da0d Merge pull request #990 from Citadel-Station-13/upstream-merge-27271 
[MIRROR] Refactors supply talismans to be less shitcode
 2017-05-17 10:51:02 -04:00
CitadelStationBot
b4c1a9afc8 Automatic changelog generation for PR #989 [ci skip] 2017-05-17 09:50:22 -05:00
LetterJay
fe582cad7c Merge pull request #989 from Citadel-Station-13/upstream-merge-27214 
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
 2017-05-17 10:50:20 -04:00
CitadelStationBot
9d817eb6f8 Automatic changelog generation for PR #977 [ci skip] 2017-05-17 09:49:17 -05:00
LetterJay
ed11d756c2 Merge pull request #977 from Citadel-Station-13/upstream-merge-27248 
[MIRROR] [Box] Area Power Fixes
 2017-05-17 10:49:15 -04:00
CitadelStationBot
c5a623ab3d Automatic changelog generation for PR #974 [ci skip] 2017-05-17 09:48:41 -05:00
LetterJay
d82f9bf152 Merge pull request #974 from Citadel-Station-13/upstream-merge-27246 
[MIRROR] Fixes Graviton Typo
 2017-05-17 10:48:40 -04:00
LetterJay
d8c07bed4d Merge pull request #966 from Citadel-Station-13/upstream-merge-27221 
[MIRROR] Fixes the ore redemption machine's sheet amount upgrade
 2017-05-17 10:48:23 -04:00
CitadelStationBot
9a0ef7b0be Automatic changelog generation for PR #917 [ci skip] 2017-05-17 09:47:07 -05:00
LetterJay
6d8aa16c45 Merge pull request #917 from Citadel-Station-13/upstream-merge-27119 
[MIRROR] Wraiths now refund part of Phase Shift's cooldown by attacking
 2017-05-17 10:47:06 -04:00
CitadelStationBot
4e52f59571 Automatic changelog generation for PR #1023 [ci skip] 2017-05-17 09:45:40 -05:00
LetterJay
c8a8f77be8 Merge pull request #1023 from Citadel-Station-13/upstream-merge-27333 
[MIRROR] Stops people from beating a dead horse (revenant)
 2017-05-17 10:45:38 -04:00
LetterJay
5730df22d0 Merge pull request #1022 from Citadel-Station-13/upstream-merge-27321 
[MIRROR] Fixes spelling on the EM Pulse action
 2017-05-17 10:45:27 -04:00
LetterJay
ce925fa04c Merge pull request #1024 from Citadel-Station-13/upstream-merge-27360 
[MIRROR] Prepends object names with 'The' in speech
 2017-05-17 10:45:04 -04:00
CitadelStationBot
ee47d17a7e Automatic changelog generation for PR #1018 [ci skip] 2017-05-17 07:13:00 -05:00
LetterJay
335c031ca5 Merge pull request #1018 from Citadel-Station-13/hat_fix 
Fixes the hunter hat direction sprite
 2017-05-17 08:12:59 -04:00
LetterJay
0a903340a5 Merge pull request #795 from Citadel-Station-13/upstream-merge-26974 
[MIRROR] Fixes roundstart spawning
 2017-05-17 06:22:46 -04:00
CitadelStationBot
242bff4288 Prepends object names with 'The' in speech 2017-05-17 05:13:47 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
932f323e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26974 2017-05-17 05:06:23 -05:00
CitadelStationBot
bf3b6702c3 Stops people from beating a dead horse (revenant) 2017-05-17 05:03:31 -05:00
CitadelStationBot
013101bd48 Fixes spelling on the EM Pulse action 2017-05-17 05:01:25 -05:00
CitadelStationBot
5ea3d5c28d Automatic changelog generation for PR #780 [ci skip] 2017-05-17 04:44:09 -05:00
LetterJay
63a4d0bfec Merge pull request #780 from Citadel-Station-13/upstream-merge-26776 
[MIRROR] Moves languages to a holder datum, gives mind its own language holder
 2017-05-17 05:44:08 -04:00
LetterJay
2d66148b44 Update holocall.dm 2017-05-17 04:30:52 -05:00
LetterJay
1ee7686a5b Update holocall.dm 2017-05-17 04:26:16 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
e121ad79c9 commit 2017-05-17 04:03:54 -05:00
LetterJay
ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 
[MIRROR] Moves tongues to `mutanttongue` var
 2017-05-17 04:50:52 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
CitadelStationBot
3516852582 Automatic changelog generation for PR #734 [ci skip] 2017-05-17 03:49:14 -05:00
LetterJay
fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 
[MIRROR] Draconic language, for lizards
 2017-05-17 04:49:13 -04:00
LetterJay
a3cc3087b3 warrghhlbrarrggll 2017-05-16 23:55:38 -05:00
LetterJay
e03b4b7905 ooga booga lizard 2017-05-16 23:46:37 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
LetterJay
b4fea71c4c Merge pull request #1006 from Citadel-Station-13/CultFixes 
Cult fixes
 2017-05-17 00:09:45 -04:00
LetterJay
133a032ed2 adds the correct dmi for the hunter hats directional facings. 2017-05-16 23:08:23 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
be1702ff0d Revert "CultFix" 
This reverts commit f3e8cd3e2d.
 2017-05-16 22:49:23 -05:00
LetterJay
f3e8cd3e2d CultFix 2017-05-16 21:36:07 -05:00
CitadelStationBot
de10ad3ad2 Automatic changelog generation for PR #807 [ci skip] 2017-05-16 16:13:31 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJay
eac970c1f1 aids 2017-05-16 16:00:28 -05:00
LetterJay
f71a918ac8 screen rem 2017-05-16 15:53:44 -05:00
LetterJay
9ff038ed8f rem 2017-05-16 15:53:15 -05:00
LetterJay
ddee13467a fuck icons 2017-05-16 15:52:22 -05:00
LetterJay
beb89985be icons 2017-05-16 15:46:40 -05:00
LetterJay
3ba7433371 Delete screen_alert.dmi 
fix conflict with Cult rework
 2017-05-16 15:44:23 -05:00
LetterJay
296ae25734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-16 15:27:46 -05:00
LetterJay
42d354f9c8 cryo pod icon fix 2017-05-16 15:27:30 -05:00