Ling 035b2999d8 fix conflict

2019-06-20 13:50:58 +02:00

..

brain_trauma.dm

[READY] Cleans up saycode by removing random hook stubs and using a signal where relevant

2019-06-06 07:33:20 +01:00

creepy_trauma.dm

Merge branch 'master' into upstream-merge-44320

2019-06-13 14:32:14 -04:00

hypnosis.dm

[MIRROR] Hypnosis code improvements (#4591)

2019-02-26 16:47:56 -06:00

imaginary_friend.dm

[MIRROR] Adds "Never for this round" to a few more ghost rolls. (#5632)

2019-06-01 18:47:41 -05:00

magic.dm

REGEX REPLACE! /([\w\.]+)\.remove_trait\(/ -> /REMOVE_TRAIT(\1, /

2019-06-01 20:54:11 -05:00

mild.dm

Merge branch 'master' into upstream-merge-44320

2019-06-13 14:32:14 -04:00

phobia.dm

Merge branch 'master' into upstream-merge-44320

2019-06-13 14:32:14 -04:00

severe.dm

REGEX REPLACE! /([\w\.]+)\.has_trait\(/ -> /HAS_TRAIT(\1, /

2019-06-01 20:55:36 -05:00

special.dm

fix conflict

2019-06-20 13:50:58 +02:00

split_personality.dm

[READY] Cleans up saycode by removing random hook stubs and using a signal where relevant

2019-06-06 07:33:20 +01:00