LetterJay
|
fe582cad7c
|
Merge pull request #989 from Citadel-Station-13/upstream-merge-27214
[MIRROR] Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
|
2017-05-17 10:50:20 -04:00 |
|
LetterJay
|
d82f9bf152
|
Merge pull request #974 from Citadel-Station-13/upstream-merge-27246
[MIRROR] Fixes Graviton Typo
|
2017-05-17 10:48:40 -04:00 |
|
LetterJay
|
d8c07bed4d
|
Merge pull request #966 from Citadel-Station-13/upstream-merge-27221
[MIRROR] Fixes the ore redemption machine's sheet amount upgrade
|
2017-05-17 10:48:23 -04:00 |
|
LetterJay
|
6d8aa16c45
|
Merge pull request #917 from Citadel-Station-13/upstream-merge-27119
[MIRROR] Wraiths now refund part of Phase Shift's cooldown by attacking
|
2017-05-17 10:47:06 -04:00 |
|
LetterJay
|
5730df22d0
|
Merge pull request #1022 from Citadel-Station-13/upstream-merge-27321
[MIRROR] Fixes spelling on the EM Pulse action
|
2017-05-17 10:45:27 -04:00 |
|
LetterJay
|
1948b007d1
|
fix roundstart/rej cleanup
|
2017-05-17 05:08:51 -05:00 |
|
CitadelStationBot
|
013101bd48
|
Fixes spelling on the EM Pulse action
|
2017-05-17 05:01:25 -05:00 |
|
LetterJay
|
bdbedd33f4
|
Merge branch 'master' into upstream-merge-26776
|
2017-05-17 05:14:18 -04:00 |
|
LetterJay
|
e121ad79c9
|
commit
|
2017-05-17 04:03:54 -05:00 |
|
LetterJay
|
ff21afdcbd
|
Merge pull request #744 from Citadel-Station-13/upstream-merge-26828
[MIRROR] Moves tongues to `mutanttongue` var
|
2017-05-17 04:50:52 -04:00 |
|
LetterJay
|
f978e3d56e
|
rej cleanup
|
2017-05-17 03:50:34 -05:00 |
|
LetterJay
|
fe62f7b737
|
Merge pull request #734 from Citadel-Station-13/upstream-merge-26780
[MIRROR] Draconic language, for lizards
|
2017-05-17 04:49:13 -04:00 |
|
LetterJay
|
a3cc3087b3
|
warrghhlbrarrggll
|
2017-05-16 23:55:38 -05:00 |
|
LetterJay
|
e03b4b7905
|
ooga booga lizard
|
2017-05-16 23:46:37 -05:00 |
|
LetterJay
|
46f5c4bb1b
|
commit
|
2017-05-16 23:35:54 -05:00 |
|
LetterJay
|
45c283a935
|
applies the previous fixes for cult on a closed PR
|
2017-05-16 22:59:41 -05:00 |
|
LetterJay
|
4710beca0e
|
Merge pull request #807 from Citadel-Station-13/upstream-merge-26631
[MIRROR] 2017 Cult Overhaul P1: Cult Master and Datum Cult
|
2017-05-16 17:13:30 -04:00 |
|
LetterJay
|
296ae25734
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-05-16 15:27:46 -05:00 |
|
LetterJay
|
42d354f9c8
|
cryo pod icon fix
|
2017-05-16 15:27:30 -05:00 |
|
CitadelStationBot
|
1f66249428
|
Updates starthistle plant description & stats, adds a seed return harvest, fixes sprites & adds starthistle seeds to the botany vendor contraband
|
2017-05-15 17:04:23 -05:00 |
|
CitadelStationBot
|
db47433f40
|
Fixes Graviton Typo
|
2017-05-14 23:51:13 -05:00 |
|
cebutris
|
fc628bcb89
|
adds the holoparasite box, and adds it to traitor uplinks (#913)
|
2017-05-14 20:36:22 -07: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
|
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
|
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
|
230b2e6fc8
|
Fixes the ore redemption machine's sheet amount upgrade
|
2017-05-14 18:43:32 -05: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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|