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

Life refactor (#13471)

2020-06-03 19:43:30 -06:00

death.dm

Life refactor (#13471)

2020-06-03 19:43:30 -06:00

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

File standardisation (#13131)

2020-03-17 18:08:51 -04:00

say.dm

Dead can't whisper. Dead say code consolidation

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

stat_states.dm

Life refactor (#13471)

2020-06-03 19:43:30 -06:00

status_procs.dm

TG Flying+Floating Refactor

2020-06-26 21:53:38 -04:00

taste.dm

File standardisation (#13131)

2020-03-17 18:08:51 -04:00

update_status.dm

Life refactor (#13471)

2020-06-03 19:43:30 -06:00