Commit Graph

1640 Commits

Author SHA1 Message Date
CitadelStationBot
cd68a8c4bb Automatic changelog generation for PR #944 [ci skip] 2017-05-14 15:29:19 -05:00
LetterJay
5bdeefb050 Merge pull request #944 from Citadel-Station-13/upstream-merge-27175
[MIRROR] Fixes pizza box icons
2017-05-14 16:29:18 -04:00
LetterJay
505a6c7124 Merge pull request #945 from Citadel-Station-13/upstream-merge-27180
[MIRROR] Fixes an overlays runtime
2017-05-14 16:29:01 -04:00
LetterJay
4d8972bfe0 Merge pull request #946 from Citadel-Station-13/upstream-merge-27181
[MIRROR] Clipboard Initialize + GC fixes
2017-05-14 16:28:41 -04:00
LetterJay
ffbf47041d Merge pull request #949 from Citadel-Station-13/upstream-merge-27149
[MIRROR] Adds sixteen new OOC emoticons
2017-05-14 16:28:19 -04:00
LetterJay
1c422705d0 Merge pull request #950 from Citadel-Station-13/upstream-merge-27190
[MIRROR] WHOSE FOOTPRINTS ARE THESE
2017-05-14 16:28:05 -04:00
LetterJay
f838bb36ac Merge pull request #953 from Citadel-Station-13/upstream-merge-27203
[MIRROR] Soul Vessels now have the proper laws
2017-05-14 16:27:39 -04:00
CitadelStationBot
e62ec09f50 Automatic changelog generation for PR #954 [ci skip] 2017-05-14 15:27:26 -05:00
LetterJay
d64e569d6c Merge pull request #954 from Citadel-Station-13/upstream-merge-27199
[MIRROR] Free Golems can purchase their own royal capes
2017-05-14 16:27:25 -04:00
LetterJay
6ab7cfe9b9 Merge pull request #957 from Citadel-Station-13/upstream-merge-27215
[MIRROR] Petting is better
2017-05-14 16:27:08 -04:00
LetterJay
d307da185a Merge pull request #956 from Citadel-Station-13/upstream-merge-27197
[MIRROR] Job assign at roundstart now favors empty positions first
2017-05-14 16:26:45 -04:00
CitadelStationBot
a3d83323d5 Automatic changelog generation for PR #958 [ci skip] 2017-05-14 15:26:05 -05:00
LetterJay
cf1d9228f9 Merge pull request #958 from Citadel-Station-13/upstream-merge-27200
[MIRROR] Goats eat glowshrooms
2017-05-14 16:26:04 -04:00
LetterJay
9e94109c29 Merge pull request #959 from Citadel-Station-13/upstream-merge-27208
[MIRROR] Buffs nitrous oxide
2017-05-14 16:25:44 -04:00
LetterJay
54df11503f Merge pull request #960 from Citadel-Station-13/upstream-merge-27213
[MIRROR] Makes turrets less of a joke
2017-05-14 16:25:16 -04:00
CitadelStationBot
ddd139aea5 Automatic changelog generation for PR #963 [ci skip] 2017-05-14 15:24:14 -05:00
LetterJay
22a8b7c1bf Merge pull request #963 from Citadel-Station-13/upstream-merge-27217
[MIRROR] Glowshrooms have a less saturated glow
2017-05-14 16:24:13 -04:00
CitadelStationBot
015369c24a Automatic changelog generation for PR #964 [ci skip] 2017-05-14 15:23:52 -05:00
LetterJay
33b38b07b1 Merge pull request #964 from Citadel-Station-13/upstream-merge-27186
[MIRROR] Fixes engraved messages
2017-05-14 16:23:51 -04:00
CitadelStationBot
abc74c8b06 Fixes engraved messages 2017-05-14 14:50:49 -05:00
CitadelStationBot
c8c86a98da Glowshrooms have a less saturated glow 2017-05-14 11:31:47 -05:00
CitadelStationBot
5f603b7d85 Makes turrets less of a joke 2017-05-14 08:01:28 -05:00
CitadelStationBot
4a67fe55a4 Buffs nitrous oxide 2017-05-14 07:39:05 -05:00
CitadelStationBot
e661d82030 Goats eat glowshrooms 2017-05-14 07:38:00 -05:00
CitadelStationBot
962d114339 Petting is better 2017-05-14 07:36:55 -05:00
CitadelStationBot
7b0532089f Job assign at roundstart now favors empty positions first 2017-05-14 07:34:50 -05:00
LetterJay
155f1d3ad0 Merge pull request #789 from Citadel-Station-13/upstream-merge-26908
[MIRROR] Fixes dead mobs being initialized twice
2017-05-14 01:35:52 -04:00
LetterJay
4b72cc0486 Merge pull request #712 from Citadel-Station-13/upstream-merge-26760
[MIRROR] Changes a bunch of hrefs to the proper defines
2017-05-14 01:32:52 -04:00
CitadelStationBot
fb639b569e Automatic changelog generation for PR #739 [ci skip] 2017-05-14 00:12:36 -05:00
LetterJay
e36d24ee24 Merge pull request #739 from Citadel-Station-13/upstream-merge-26783
[MIRROR] Mania Motors now do minor damage and continue to affect targets after they leave its range
2017-05-14 01:12:34 -04:00
LetterJay
7613a1618e Merge pull request #786 from Citadel-Station-13/upstream-merge-26958
[MIRROR] Fixes log files not generating with default config
2017-05-14 01:12:07 -04:00
LetterJay
8d237cd8bb define var 2017-05-14 00:11:23 -05:00
LetterJay
3d0a1b2573 commit 2017-05-14 00:05:53 -05:00
LetterJay
a9e0b28872 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26908 2017-05-14 00:04:52 -05:00
LetterJay
44036f1c6d Merge pull request #725 from Citadel-Station-13/upstream-merge-26840
[DNM - Relies on another PR] [MIRROR] Fixes sleepers.
2017-05-14 01:03:03 -04:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04:00
LetterJay
ca1f0ef04e commit 2017-05-13 23:59:54 -05:00
LetterJay
e6ccfeaa51 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26958 2017-05-13 23:58:14 -05:00
LetterJay
ebb4e134cb commit 2017-05-13 23:45:02 -05:00
LetterJay
38eeeaa6d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26783 2017-05-13 23:42:19 -05:00
LetterJay
a09e1ff34b Merge branch 'master' into upstream-merge-26840 2017-05-14 00:37:03 -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
73101cbd88 Free Golems can purchase their own royal capes 2017-05-13 21:17:37 -05:00
CitadelStationBot
e59c48b20d Soul Vessels now have the proper laws 2017-05-13 21:15:32 -05:00
CitadelStationBot
9dcac046ef WHOSE FOOTPRINTS ARE THESE 2017-05-13 18:01:40 -05:00
CitadelStationBot
dcc6e9ced1 Adds sixteen new OOC emoticons 2017-05-13 18:01:36 -05:00
CitadelStationBot
eacd4305e6 Clipboard Initialize + GC fixes 2017-05-13 18:01:26 -05:00
CitadelStationBot
a57afab0a9 Fixes an overlays runtime 2017-05-13 18:01:22 -05:00
CitadelStationBot
d9a2939143 Fixes pizza box icons 2017-05-13 18:01:19 -05:00