ThalpyandGitHub 9c7b1dee97 Merge branch 'master' into master

2019-07-15 21:23:04 +01:00

..

alien

Ports "Refactors NODROP flag into TRAIT_NODROP"

2019-07-13 10:27:39 +02:00

human

Merge branch 'master' into master

2019-07-15 21:23:04 +01:00

monkey

Ports "Refactors NODROP flag into TRAIT_NODROP"

2019-07-13 10:27:39 +02:00

carbon_defense.dm

Merge pull request #8570 from Trilbyspaceclone/patch-170

2019-06-16 19:40:01 -07:00

carbon_defines.dm

carbon Oxygen toxicity

2019-03-21 15:05:58 -05:00

carbon_movement.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

carbon.dm

Merge branch 'master' into master

2019-07-15 21:23:04 +01:00

damage_procs.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

death.dm

…

emote.dm

…

examine.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00

give.dm

…

inventory.dm

…

life.dm

Merge branch 'master' into master

2019-07-09 05:33:09 +01:00

say.dm

Merge pull request #8869 from Ghommie/Ghommie-cit129

2019-07-14 14:49:11 -07:00

status_procs.dm

…

update_icons.dm

forgot to pull from upstream. One second.

2019-06-06 15:20:27 +02:00