Commit Graph

1686 Commits

Author SHA1 Message Date
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
LetterJay
00b17f1649 maybe 2017-05-14 00:28:07 -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
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
LetterJay
4b2b5e7520 commit 2017-05-13 23:21:40 -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
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
CitadelStationBot
b0bfcdabe9 Fixes something not using create_reagents 2017-05-13 18:01:12 -05:00
CitadelStationBot
b19b680467 Fixes the recycler gibbing brainmobs 2017-05-13 18:01:09 -05:00
CitadelStationBot
b9e3e99faa Adds Several Butter-filled Foods 2017-05-13 18:00:57 -05:00
CitadelStationBot
b9ad2c31c9 Buffs honey 2017-05-13 18:00:53 -05:00
CitadelStationBot
3d4356cd7c Explosion flame_range now defaults to light range instead of zero 2017-05-13 18:00:49 -05:00
CitadelStationBot
474fd582ea Ports dakimakuras from HippieStation. 2017-05-13 18:00:32 -05:00
LetterJay
22aef374e2 Merge branch 'master' into upstream-merge-26140 2017-05-13 01:28:34 -04:00
LetterJay
485bca003f Merge pull request #640 from Citadel-Station-13/upstream-merge-26527
[MIRROR] Zombie/limb refactors/fixes
2017-05-13 01:24:55 -04:00
LetterJay
bba7b9246d rej cleanup 2017-05-13 00:12:05 -05:00
LetterJay
8c4fbd35e7 Merge pull request #697 from Citadel-Station-13/upstream-merge-25596
[MIRROR] Clockcult component generation will automatically focus on components needed to activate the Ark
2017-05-13 00:57:48 -04:00
LetterJay
f5e8a7e4e4 rej merges 2017-05-12 23:57:11 -05:00
LetterJay
18bb37f34a rej remove 2017-05-12 23:03:48 -05:00
LetterJay
a7a32e6127 commit 2017-05-12 23:03:27 -05:00
LetterJay
74ea8ce4b4 Merge pull request #790 from Citadel-Station-13/upstream-merge-26962
[MIRROR] Patches the new cleanbot bug
2017-05-12 23:54:29 -04:00
CitadelStationBot
c5ed5b84e3 Zombies can see in the dark 2017-05-12 15:57:11 -05:00
LetterJay
6989a33584 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-12 15:25:26 -05:00
LetterJay
adc1b96b74 this is kenzie's fault 2017-05-12 15:25:11 -05:00
LetterJay
a1c04dd314 Merge pull request #898 from LetterJay/master
Adds a hunter hat to the game/clothesmate
2017-05-12 16:24:17 -04:00
CitadelStationBot
4280c20af8 Adds a visible message to teleport runes being teleported to 2017-05-12 15:12:46 -05:00
CitadelStationBot
5625ff030a Dominators require an open space, except it works this time 2017-05-12 11:11:34 -05:00
LetterJay
91c58632b3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-12 10:55:10 -05:00
LetterJay
6d1fb0d48a the ride never ends 2017-05-12 10:54:57 -05:00