Commit Graph

12374 Commits

Author SHA1 Message Date
CitadelStationBot
021f55a4d1 Fixes alien eggs 2017-05-03 22:22:26 -05:00
CitadelStationBot
0dff1569a1 adds a safety catch to spin() 2017-05-03 22:22:23 -05:00
CitadelStationBot
b7d451cbe9 Gives ears, eyes, and vocal cords plural gender 2017-05-03 22:22:19 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
CitadelStationBot
a87a75d059 Draconic language, for lizards 2017-05-03 22:22:07 -05:00
CitadelStationBot
3deafbe39b Plasma vessels regenerate slowly off resin 2017-05-03 22:21:58 -05:00
CitadelStationBot
bafafbadf2 Clockwork component generation is twice as fast, but scriptures cost up to twice as much 2017-05-03 22:21:55 -05:00
LetterJay
f333944be0 le fix 2017-05-03 09:02:19 -05:00
CitadelStationBot
8a221b9637 Ports pastries to Initialize 2017-05-03 05:55:15 -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
fed69ce0ca Fixes sleepers. 2017-05-03 00:00:08 -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
LetterJay
007281a51c Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts" 2017-05-02 18:53:59 -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
CitadelStationBot
49990d0c05 Persistent investigate and game logs separated by round ID 2017-05-02 18:47:58 -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
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
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
CitadelStationBot
ce302f4fe7 Trophy case hotfixes 2017-05-02 14:37:11 -05:00
LetterJay
8a5c180dd3 Update recipes_misc.dm 2017-05-02 13:41:10 -05:00
CitadelStationBot
7baccb8b85 Removes vestigial list from minds. 2017-05-02 12:47:20 -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
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
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
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
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
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
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
d422b9bb39 The alien hivemind uses a mob's real_name 2017-05-02 09:57:25 -05:00
CitadelStationBot
6d6d01f105 Species-locked inventory slots are now indicated. 2017-05-02 09:56:21 -05:00
CitadelStationBot
913a0c7c7f Fixes proximity sensors not tracking correctly 2017-05-02 09:55:15 -05:00
LetterJay
587043f1e8 pls 2017-05-02 09:44:19 -05:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
c6e0c95f42 heh. 2017-05-02 09:17:52 -05:00
LetterJay
fd251eb56a oops 2017-05-02 08:43:10 -05:00
LetterJay
f7fe20887a manual merge 2017-05-02 08:40:10 -05:00
LetterJay
3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795 manual merge 2017-05-02 05:06:13 -05:00
CitadelStationBot
aa45f555e3 Makes the cult Talisman of Horrors ranged 2017-05-02 04:57:29 -05:00
LetterJay
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
LetterJay
d3850bde68 Merge pull request #691 from Citadel-Station-13/upstream-merge-26740
[MIRROR] Port SM shards to initialize
2017-05-02 03:04:54 -05:00