LetterJay e7d9cd0698 Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

..

brain

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

carbon

Merge branch 'master' into upstream-merge-37597

2018-05-23 05:21:19 -05:00

silicon

Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00

simple_animal

Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00

blood.dm

Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code

2018-05-06 16:37:13 -05:00

bloodcrawl.dm

…

damage_procs.dm

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

death.dm

…

emote.dm

…

inhand_holder.dm

…

life.dm

Remove intent auto switch from pacifism (#37938)

2018-05-21 02:54:14 -05:00

living_defense.dm

Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00

living_defines.dm

Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code

2018-05-06 16:37:13 -05:00

living.dm

Merge pull request #6795 from Citadel-Station-13/upstream-merge-37911

2018-05-19 09:13:46 -05:00

login.dm

…

logout.dm

…

say.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

status_procs.dm

Fixes Adminorazine killing ash lizards (#37872)

2018-05-17 10:24:59 -05:00

taste.dm

…

ventcrawling.dm

…