LetterJay 388c17664f Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938 ...

[MIRROR] Fixes some issues with pacifism by disabling intent auto-switch

2018-05-21 08:28:47 -05:00

..

brain

…

carbon

Merge pull request #6820 from Citadel-Station-13/upstream-merge-37938

2018-05-21 08:28:47 -05:00

silicon

…

simple_animal

…

blood.dm

…

bloodcrawl.dm

…

damage_procs.dm

…

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

…

living_defines.dm

…

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

…

status_procs.dm

Fixes Adminorazine killing ash lizards (#37872)

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

taste.dm

…

ventcrawling.dm

…