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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
LetterJay
|
6718ea096d
|
Merge pull request #937 from Citadel-Station-13/upstream-merge-27148
[MIRROR] Buffs honey
|
2017-05-14 16:30:51 -04: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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
abc74c8b06
|
Fixes engraved messages
|
2017-05-14 14:50:49 -05:00 |
|
CitadelStationBot
|
c8c86a98da
|
Glowshrooms have a less saturated glow
|
2017-05-14 11:31:47 -05:00 |
|
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
|
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 |
|