Carlen White bb81a0850b Merge branch 'master' into batch-check-injuries ...

# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm

2019-07-14 20:49:52 -04:00

..

camera

Applying upstream fixes.

2019-06-17 00:27:07 +02:00

dead

randomizing colors.

2019-07-11 08:08:07 +02:00

living

Merge branch 'master' into batch-check-injuries

2019-07-14 20:49:52 -04:00

death.dm

…

emote.dm

…

inventory.dm

Ports "Refactors NODROP flag into TRAIT_NODROP"

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

login.dm

…

logout.dm

…

mob_defines.dm

…

mob_helpers.dm

…

mob_movement.dm

Applying upstream fixes.

2019-06-17 00:27:07 +02:00

mob_movespeed.dm

…

mob_transformation_simple.dm

…

mob.dm

Merge pull request #8692 from Ghommie/Ghommie-cit69

2019-06-23 06:56:17 -07:00

say_readme.dm

Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"

2019-07-09 07:58:22 +02:00

say_vr.dm

clarifies a few things

2019-06-06 18:56:26 -05:00

say.dm

Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"

2019-07-09 07:58:22 +02:00

status_procs.dm

should be ready.

2019-06-06 19:24:20 +02:00

transform_procs.dm

…

update_icons.dm

…