Commit Graph

1233 Commits

Author SHA1 Message Date
CitadelStationBot
d2612eaaaf Automatic changelog generation for PR #701 [ci skip] 2017-05-05 10:20:13 -05:00
LetterJay
811c74b45d Merge pull request #701 from Citadel-Station-13/upstream-merge-26477
[MIRROR] Subsystem change for the SM and TEG and slight QoL
2017-05-05 10:20:11 -05:00
CitadelStationBot
a873459fa4 Automatic changelog generation for PR #698 [ci skip] 2017-05-05 10:19:29 -05:00
LetterJay
caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
2017-05-05 10:19:28 -05:00
LetterJay
bbf43a464a yey 2017-05-05 10:00:17 -05:00
LetterJay
20f3280c96 this one time i ate boiled peanuts 2017-05-05 09:52:47 -05:00
LetterJay
f7572e62cf Merge pull request #769 from Citadel-Station-13/upstream-merge-26860
[MIRROR] Removes changeling genetic damage
2017-05-05 09:46:23 -05:00
CitadelStationBot
fbdbd67f1d Automatic changelog generation for PR #771 [ci skip] 2017-05-05 09:45:32 -05:00
LetterJay
7700171f3f Merge pull request #771 from Citadel-Station-13/upstream-merge-26872
[MIRROR] Takes out an airlock in xenobiology's kill room [Pubby]
2017-05-05 09:45:31 -05:00
LetterJay
590aaf4cc2 Merge pull request #773 from Citadel-Station-13/upstream-merge-26807
[MIRROR] Mobs that are faking death won't bleed.
2017-05-05 09:44:36 -05:00
LetterJay
c38d507791 Merge pull request #779 from Citadel-Station-13/upstream-merge-26880
[MIRROR] Only one successful Gang Tool recall per gang
2017-05-05 09:44:16 -05:00
LetterJay
f6f56a8b8f Merge pull request #728 from Citadel-Station-13/upstream-merge-26823
[MIRROR] Ports pastries to Initialize
2017-05-05 09:43:17 -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
CitadelStationBot
f902c11f3b Automatic changelog generation for PR #717 [ci skip] 2017-05-05 09:40:09 -05:00
LetterJay
2f44824951 Merge pull request #717 from Citadel-Station-13/upstream-merge-26767
[MIRROR] The alien hivemind uses a mob's real_name
2017-05-05 09:40:08 -05:00
CitadelStationBot
5d82e4e729 Automatic changelog generation for PR #714 [ci skip] 2017-05-05 09:39:55 -05:00
LetterJay
cd1d049c18 Merge pull request #714 from Citadel-Station-13/upstream-merge-26707
[MIRROR] Makes the cult Talisman of Horrors ranged
2017-05-05 09:39:54 -05:00
CitadelStationBot
c3f2e08304 Automatic changelog generation for PR #708 [ci skip] 2017-05-05 09:39:20 -05:00
LetterJay
1198a3cbb4 Merge pull request #708 from Citadel-Station-13/upstream-merge-26752
[MIRROR] Plants now react with turfs on squash()
2017-05-05 09:39:17 -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
933a8646ba Only one successful Gang Tool recall per gang 2017-05-05 06:05:05 -05:00
CitadelStationBot
d67618815c Mobs that are faking death won't bleed. 2017-05-04 20:59:29 -05:00
CitadelStationBot
01d80a0cc0 Takes out an airlock in xenobiology's kill room [Pubby] 2017-05-04 20:40:05 -05:00
CitadelStationBot
067e0b46ed Removes changeling genetic damage 2017-05-04 19:45:08 -05:00
CitadelStationBot
4ef516ca24 Automatic changelog generation for PR #706 [ci skip] 2017-05-03 22:49:51 -05:00
LetterJay
d5ade71ea9 Merge pull request #706 from Citadel-Station-13/upstream-merge-26745
[MIRROR] Adds persistent trophy cases
2017-05-03 22:49:50 -05:00
LetterJay
5d3fa7e63a Merge pull request #726 from Citadel-Station-13/upstream-merge-26842
[MIRROR] Adds eyeball soup and spaghetti to the game: it's now been 8 days edition
2017-05-03 22:46:29 -05:00
CitadelStationBot
a2dacb5893 Automatic changelog generation for PR #727 [ci skip] 2017-05-03 22:45:59 -05:00
LetterJay
795c11241d Merge pull request #727 from Citadel-Station-13/upstream-merge-26802
[MIRROR] Fixes the Slimecore HUD's neck slot
2017-05-03 22:45:58 -05:00
LetterJay
be00d77431 Merge pull request #729 from Citadel-Station-13/Better-Issues
Update ISSUE_TEMPLATE.md
2017-05-03 11:32:30 -05:00
LetterJay
e0539577d7 Merge pull request #724 from Citadel-Station-13/upstream-merge-26832
[MIRROR] Should fix all of the cult/clockcult issues
2017-05-03 11:31:48 -05:00
LetterJay
f333944be0 le fix 2017-05-03 09:02:19 -05:00
TalkingCactus
4c92b2c6ce another typo caught 2017-05-03 07:46:23 -04:00
TalkingCactus
f5fce8eeee typo fix 2017-05-03 07:22:08 -04:00
TalkingCactus
3f77a10266 Update ISSUE_TEMPLATE.md
makes issues less intimidating by removing unnecessary information.
2017-05-03 07:16:20 -04:00
CitadelStationBot
8a221b9637 Ports pastries to Initialize 2017-05-03 05:55:15 -05:00
CitadelStationBot
49a85dca36 Fixes the Slimecore HUD's neck slot 2017-05-03 04:07:38 -05:00
CitadelStationBot
4141b6549f Adds eyeball soup and spaghetti to the game: it's now been 8 days edition 2017-05-03 01:42:35 -05:00
CitadelStationBot
6a365857d1 Should fix all of the cult/clockcult issues 2017-05-02 20:44:34 -05:00
LetterJay
2926b7e8b1 Merge pull request #723 from Citadel-Station-13/revert-690-upstream-merge-26739
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 20:03:13 -05:00
CitadelStationBot
121df4527b Automatic changelog generation for PR #685 [ci skip] 2017-05-02 19:04:29 -05:00
LetterJay
9ef6e00ccc Merge pull request #685 from Citadel-Station-13/upstream-merge-26735
[MIRROR] Fixes the 'stuffed legion' recipie
2017-05-02 19:04:28 -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
LetterJay
8ab3f4fe39 Travis 2017-05-02 18:51:06 -05:00
LetterJay
0cb4d54194 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26735 2017-05-02 18:49:35 -05:00
LetterJay
368a2e82c1 Merge pull request #709 from Citadel-Station-13/upstream-merge-26762
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
2017-05-02 18:47:55 -05:00
CitadelStationBot
5edd88cd07 Automatic changelog generation for PR #705 [ci skip] 2017-05-02 18:47:24 -05:00
LetterJay
92f96986b9 Merge pull request #705 from Citadel-Station-13/upstream-merge-26743
[MIRROR] Fixes Biogenerator
2017-05-02 18:47:23 -05:00
LetterJay
84db006ea9 Merge pull request #711 from Citadel-Station-13/upstream-merge-26799
[MIRROR] Fixes cult and clockcult icons
2017-05-02 18:46:38 -05:00