Commit Graph

8 Commits

Author SHA1 Message Date
CitadelStationBot
222274d108 [MIRROR] Using a soulstone on somebody now transfers your languages to the shade (#2911)
* Merge pull request #30939 from MoreRobustThanYou/patch-8

Using a soulstone on somebody now transfers your languages to the shade

* Using a soulstone on somebody now transfers your languages to the shade
2017-09-23 05:53:56 -05:00
CitadelStationBot
ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811)
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
2017-09-17 12:03:12 -05:00
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJay
24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
CitadelStationBot
5f3775388c Gives cult blades updated item and inhand sprites 2017-08-29 17:08:43 -05:00
kevinz000
5591afc9ce double wew 2017-08-29 09:53:11 -07:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
kevinz000
c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00