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

1726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
LetterJay
61fd162ca8 Merge pull request #982 from Citadel-Station-13/upstream-merge-27298 
[MIRROR] Reverts favoring empty positions
 2017-05-15 20:12:17 -04:00
CitadelStationBot
59b609c79d Reverts favoring empty positions 2017-05-15 10:36:56 -05:00
CitadelStationBot
56ccce82c8 Automatic changelog generation for PR #913 [ci skip] 2017-05-14 22:36:23 -05:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
c4901a4e7b Automatic changelog generation for PR #962 [ci skip] 2017-05-14 22:34:17 -05:00
CitadelStationBot
176c2003f9 [MIRROR] Enable Ambrosia Gaia, attempt balance (#962) 
* Enable Ambrosia Gaia, attempt balance

* Update ambrosia.dm

* Delete ambrosia.dm.rej
 2017-05-14 20:34:15 -07:00
CitadelStationBot
148666efed Disables Gaia mutation (#928) 2017-05-14 20:30:29 -07:00
CitadelStationBot
3644e9585e Cerestation Tweaks MKV (#683) 2017-05-14 20:25:28 -07:00
CitadelStationBot
040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968) 
* woops i forgot to check tick cannons fill proc.

* Delete pneumaticCannon.dm.rej

* Update pneumaticCannon.dm
 2017-05-14 20:23:39 -07:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00
CitadelStationBot
b95d4e0459 [MIRROR] Land Claim Flag (#951) 
* Land Claim Flag

* Delete charter.dm.rej

* Update charter.dm
 2017-05-14 20:16:17 -07:00
CitadelStationBot
0c1ed5bf33 [MIRROR] LITERALLY CHANGES C4 PLANT TIME TO 3 SECONDS FROM 5 FOR THE 3RD TIME THIS WEEK (#932) 
* LITERALLY CHANGES C4 PLANT TIME TO 3 SECONDS FROM 5 FOR THE 3RD TIME THIS WEEK

* Delete plastic.dm.rej
 2017-05-14 20:13:29 -07:00
CitadelStationBot
4041df2b45 Automatic changelog generation for PR #973 [ci skip] 2017-05-14 22:12:01 -05:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
CitadelStationBot
45a81d32a4 Adds round ID to MC panel (#846) 2017-05-14 20:10:22 -07:00
CitadelStationBot
d0aec14afb Automatic changelog generation for PR #969 [ci skip] 2017-05-14 22:07:21 -05:00
CitadelStationBot
b7adb8cd93 SMES units now accept charge even if the available input is less than the input rate. (#969) 2017-05-14 20:07:20 -07:00