LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
KorPhaeron
74c6e7e23f
Fixes godhand having no inhand sprite ( #31744 )
...
* Fixes godhand having no inhand
* Correct file paths
2017-10-16 14:34:11 -05:00
Armhulen
cf155736cf
New Chaplain Weapon: Hammer of Pride! ( #31454 )
...
* cool beans
* i think this works
* i'm only human after all
don't put the blame on me
* is this what you wanted??
* ya
* K
2017-10-13 23:44:39 -05:00
ExcessiveUseOfCobblestone
fe5b45dfeb
Fixes Carpsie nullrod from being invisible ( #31268 )
2017-10-04 11:00:34 -05:00
vuonojenmustaturska
11a3395690
Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-24 17:42:13 -05:00
LetterJay
e16d89d077
Merge pull request #2923 from jughu/hi-hello
...
Allows custom renaming for holy weapons
2017-09-24 15:49:19 -04:00
jughu
617eb4c889
The new hip
2017-09-24 01:04:39 +02:00
jughu
5b1b550c0e
Update holy_weapons.dm
2017-09-24 00:34:24 +02:00
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
