Commit Graph

1683 Commits

Author SHA1 Message Date
CitadelStationBot
56ccce82c8 Automatic changelog generation for PR #913 [ci skip] 2017-05-14 22:36:23 -05:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
c4901a4e7b Automatic changelog generation for PR #962 [ci skip] 2017-05-14 22:34:17 -05:00
CitadelStationBot
176c2003f9 [MIRROR] Enable Ambrosia Gaia, attempt balance (#962)
* Enable Ambrosia Gaia, attempt balance

* Update ambrosia.dm

* Delete ambrosia.dm.rej
2017-05-14 20:34:15 -07:00
CitadelStationBot
148666efed Disables Gaia mutation (#928) 2017-05-14 20:30:29 -07:00
CitadelStationBot
3644e9585e Cerestation Tweaks MKV (#683) 2017-05-14 20:25:28 -07:00
CitadelStationBot
040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968)
* woops i forgot to check tick cannons fill proc.

* Delete pneumaticCannon.dm.rej

* Update pneumaticCannon.dm
2017-05-14 20:23:39 -07:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935)
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
2017-05-14 20:18:02 -07:00
CitadelStationBot
b95d4e0459 [MIRROR] Land Claim Flag (#951)
* Land Claim Flag

* Delete charter.dm.rej

* Update charter.dm
2017-05-14 20:16:17 -07:00
CitadelStationBot
0c1ed5bf33 [MIRROR] LITERALLY CHANGES C4 PLANT TIME TO 3 SECONDS FROM 5 FOR THE 3RD TIME THIS WEEK (#932)
* LITERALLY CHANGES C4 PLANT TIME TO 3 SECONDS FROM 5 FOR THE 3RD TIME THIS WEEK

* Delete plastic.dm.rej
2017-05-14 20:13:29 -07:00
CitadelStationBot
4041df2b45 Automatic changelog generation for PR #973 [ci skip] 2017-05-14 22:12:01 -05:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
CitadelStationBot
45a81d32a4 Adds round ID to MC panel (#846) 2017-05-14 20:10:22 -07:00
CitadelStationBot
d0aec14afb Automatic changelog generation for PR #969 [ci skip] 2017-05-14 22:07:21 -05:00
CitadelStationBot
b7adb8cd93 SMES units now accept charge even if the available input is less than the input rate. (#969) 2017-05-14 20:07:20 -07:00
CitadelStationBot
fde364e82f The punisher! (#967) 2017-05-14 20:06:13 -07:00
LetterJay
6c4a355379 Merge pull request #850 from Citadel-Station-13/upstream-merge-26980
[MIRROR] Small Click refactor.
2017-05-14 16:40:30 -04:00
CitadelStationBot
2cf744d69b Automatic changelog generation for PR #854 [ci skip] 2017-05-14 15:39:29 -05:00
LetterJay
96e128ecb7 Merge pull request #854 from Citadel-Station-13/upstream-merge-27036
[MIRROR] Add Slime Scanner to Autolathe
2017-05-14 16:39:28 -04:00
LetterJay
7748c04f60 Merge pull request #871 from Citadel-Station-13/upstream-merge-27073
[MIRROR] Fixes some things not using log_world
2017-05-14 16:38:49 -04:00
LetterJay
c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151
[MIRROR] Adds a visible message to teleport runes being teleported to
2017-05-14 16:36:49 -04:00
LetterJay
051de8da99 Merge pull request #936 from Citadel-Station-13/upstream-merge-27184
[MIRROR] Explosion flame_range now defaults to light range instead of zero
2017-05-14 16:33:00 -04:00
CitadelStationBot
ebd23c3adf Automatic changelog generation for PR #931 [ci skip] 2017-05-14 15:32:41 -05:00
LetterJay
bf26c247e0 Merge pull request #931 from Citadel-Station-13/upstream-merge-27167
[MIRROR] Ports dakimakuras from HippieStation.
2017-05-14 16:32:40 -04:00
CitadelStationBot
e7040e57a9 Automatic changelog generation for PR #937 [ci skip] 2017-05-14 15:30:52 -05:00
LetterJay
6718ea096d Merge pull request #937 from Citadel-Station-13/upstream-merge-27148
[MIRROR] Buffs honey
2017-05-14 16:30:51 -04:00
CitadelStationBot
d3140e3251 Automatic changelog generation for PR #938 [ci skip] 2017-05-14 15:30:37 -05:00
LetterJay
e681a4b25f Merge pull request #938 from Citadel-Station-13/upstream-merge-27169
[MIRROR] Adds Several Butter-filled Foods
2017-05-14 16:30:35 -04:00
CitadelStationBot
191e549ae2 Automatic changelog generation for PR #940 [ci skip] 2017-05-14 15:30:17 -05:00
LetterJay
8cce0f181a Merge pull request #940 from Citadel-Station-13/upstream-merge-27168
[MIRROR] Make Hermit Ruin more self-sufficient
2017-05-14 16:30:16 -04:00
LetterJay
42bb7a5ccd Merge pull request #941 from Citadel-Station-13/upstream-merge-27166
[MIRROR] Fixes the recycler gibbing brainmobs
2017-05-14 16:29:59 -04:00
LetterJay
c329a74c4b Merge pull request #942 from Citadel-Station-13/upstream-merge-27173
[MIRROR] Fixes something not using create_reagents
2017-05-14 16:29:44 -04:00
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