Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

2017-08-05 19:03:52 -04:00

..

area

Sound Update/Refactor

2017-07-25 20:35:38 -04:00

dna

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

2017-08-05 19:03:52 -04:00

gamemodes

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

2017-08-05 19:03:52 -04:00

jobs

Removes All Comments about auto-correction and Finddeclaration.exe

2017-07-22 02:54:45 -04:00

machinery

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

2017-08-05 19:03:52 -04:00

magic

…

mecha

New fix method: delete thrower=chassis arg

2017-07-14 02:34:24 -07:00

objects

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

2017-08-05 19:03:52 -04:00

turfs

Refactors slipping to be completely general for items

2017-07-16 19:20:55 -07:00

verbs

Refactors Species Flags into Species Traits List

2017-07-13 18:55:45 -04:00

alternate_appearance.dm

…

asteroid.dm

…

atoms_movable.dm

New fix method: delete thrower=chassis arg

2017-07-14 02:34:24 -07:00

atoms.dm

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

data_huds.dm

Makes has_brain_worms cheaper

2017-08-04 23:37:17 -04:00

response_team.dm

Tweaks boots

2017-07-01 17:40:22 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

eh

2017-07-26 16:29:05 -04:00