Fox-McCloud 6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm

2017-11-18 18:49:47 -05:00

..

area

adds more

2017-10-21 14:11:24 +09:00

dna

Merge remote-tracking branch 'upstream/master' into lungsss

2017-11-18 18:49:47 -05:00

gamemodes

Merge remote-tracking branch 'upstream/master' into lungsss

2017-11-18 18:49:47 -05:00

jobs

…

machinery

Merge remote-tracking branch 'upstream/master' into lungsss

2017-11-18 18:49:47 -05:00

magic

Sprites

2017-10-20 19:23:05 -04:00

mecha

512 Compilation & Travis

2017-11-11 09:50:21 -08:00

objects

Merge remote-tracking branch 'upstream/master' into lungsss

2017-11-18 18:49:47 -05:00

turfs

merge conflict fix

2017-10-28 18:38:20 -04:00

verbs

…

alternate_appearance.dm

…

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

…

data_huds.dm

…

response_team.dm

updates a comment

2017-10-24 00:11:44 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

…