Kyep 28d915b26f fixes merge conflict

2020-09-15 08:40:03 -07:00

..

carbon

Merge pull request #12628 from SteelSlayer/IPC-buffs

2020-09-14 20:59:13 +01:00

silicon

fixes merge conflict

2020-09-15 08:40:03 -07:00

simple_animal

fixes merge conflict

2020-09-15 08:40:03 -07:00

autohiss.dm

…

damage_procs.dm

…

death.dm

…

default_language.dm

…

life.dm

Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor

2020-08-27 20:08:35 +01:00

living_defense.dm

Merge remote-tracking branch 'upstream/master' into pull-move-rework

2020-08-17 21:35:35 +02:00

living_defines.dm

Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor

2020-08-27 20:08:35 +01:00

living.dm

Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor

2020-08-27 20:08:35 +01:00

login.dm

moves proc to simple_animal/Login()

2020-07-16 17:44:05 -07:00

logout.dm

…

say.dm

Dead can't whisper. Dead say code consolidation

2020-09-06 15:45:22 +02:00

stat_states.dm

…

status_procs.dm

…

taste.dm

…

update_status.dm

…