LetterJay 1471b6cac6 Merge branch 'master' into upstream-merge-30297

2017-09-13 06:41:37 -05:00

..

brain

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

carbon

Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00

silicon

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00

simple_animal

Merge branch 'master' into upstream-merge-30297

2017-09-12 23:36:35 -05:00

blood.dm

Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

2017-07-31 23:41:22 -07:00

bloodcrawl.dm

Adds missing span-endings

2017-09-11 07:10:09 -05:00

damage_procs.dm

Update damage_procs.dm

2017-07-31 06:24:52 -05:00

death.dm

ok this is going to be a pain in the ass ain't it (#2458)

2017-08-22 05:01:38 -07:00

emote.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

life.dm

Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

2017-07-31 23:41:22 -07:00

living_defense.dm

soft sync

2017-08-29 20:20:11 -07:00

living_defines.dm

Add logging of deathgasp last words and suicide stats to the death table

2017-08-20 19:41:58 -05:00

living.dm

Merge branch 'master' into upstream-merge-30056

2017-09-13 06:08:59 -05:00

login.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

logout.dm

Spellchecking

2017-08-01 08:46:20 -05:00

say.dm

Fixes ventriloquist dummy (#30584)

2017-09-11 12:32:49 -05:00

status_procs.dm

Makes shiny versions of lavaland monsters slightly more distinct (#30502)

2017-09-11 20:54:55 -05:00

taste.dm

…

ventcrawling.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00