Commit Graph

1200 Commits

Author SHA1 Message Date
CitadelStationBot
3b84fcb9c2 Playar byound accunt age storid in db 2017-05-04 18:14:23 -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
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
LetterJay
337e9ca937 Merge pull request #715 from Citadel-Station-13/upstream-merge-26769
[MIRROR] Fixes proximity sensors not tracking correctly
2017-05-02 18:45:21 -05:00
CitadelStationBot
c6f4d299f2 Automatic changelog generation for PR #699 [ci skip] 2017-05-02 18:44:55 -05:00
LetterJay
91cb42cf60 Merge pull request #699 from Citadel-Station-13/upstream-merge-26556
[MIRROR] Saline-glucose changes
2017-05-02 18:44:53 -05:00
LetterJay
8a5c180dd3 Update recipes_misc.dm 2017-05-02 13:41:10 -05:00
LetterJay
a57190b9c5 Merge pull request #694 from Citadel-Station-13/upstream-merge-26708
[MIRROR] Ore redemption machine cleanup
2017-05-02 12:26:28 -05:00
LetterJay
1eb0617037 Merge pull request #692 from Citadel-Station-13/upstream-merge-26738
[MIRROR] Small fixes to spatial gateways
2017-05-02 12:24:53 -05:00
CitadelStationBot
4a914a5e67 Automatic changelog generation for PR #718 [ci skip] 2017-05-02 12:24:26 -05:00
LetterJay
fe5e1db512 Merge pull request #718 from Citadel-Station-13/upstream-merge-26765
[MIRROR] Makes golems able to transfer into empty shells
2017-05-02 12:24:24 -05:00
LetterJay
4412b68e26 Merge pull request #680 from Citadel-Station-13/upstream-merge-26720
[MIRROR] Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-02 11:45:14 -05:00
LetterJay
4e620e54e6 fix 2017-05-02 11:38:06 -05:00
LetterJay
4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
c62fc3886a Merge pull request #671 from Citadel-Station-13/upstream-merge-26715
[MIRROR] [FUN REMOVAL] Makes fire not able to become ice.
2017-05-02 11:18:05 -05:00
LetterJay
818940cbc3 Merge pull request #645 from Citadel-Station-13/upstream-merge-26598
[MIRROR] Cult Construct Non-Balance Update
2017-05-02 11:16:12 -05:00
CitadelStationBot
85c9b40ede Automatic changelog generation for PR #641 [ci skip] 2017-05-02 11:15:55 -05:00
LetterJay
73b105ffe6 Merge pull request #641 from Citadel-Station-13/upstream-merge-26541
[MIRROR] Gives Backup Shuttle Lighting and Fixes Auxiliary Tool Storage Plating on Delta
2017-05-02 11:15:54 -05:00
LetterJay
b4782e24af Merge pull request #636 from Citadel-Station-13/upstream-merge-26594
[MIRROR] Blood Cult removals and tweaks
2017-05-02 11:15:14 -05:00
LetterJay
2abd7da7c4 Merge pull request #628 from Citadel-Station-13/upstream-merge-26642
[MIRROR] Fixes Linux buildscript chime when server ready
2017-05-02 11:14:56 -05:00
LetterJay
2bef665038 Merge pull request #613 from Citadel-Station-13/upstream-merge-26563
[MIRROR] Renames generic armor and athletic shorts
2017-05-02 11:14:47 -05:00
CitadelStationBot
284fc2f43a Automatic changelog generation for PR #602 [ci skip] 2017-05-02 11:14:15 -05:00
LetterJay
159f7f8d90 Merge pull request #602 from Citadel-Station-13/upstream-merge-26373
[MIRROR] Fixes being unable to empty an emagged cloning pod via manual ejection.
2017-05-02 11:14:14 -05:00
CitadelStationBot
e4c4176874 Automatic changelog generation for PR #591 [ci skip] 2017-05-02 11:10:15 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
2017-05-02 11:10:13 -05:00
CitadelStationBot
25f1b24f62 Makes golems able to transfer into empty shells 2017-05-02 10:00:33 -05:00
CitadelStationBot
913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -05:00