well hopefully last conflict fix with shuttle merger

Browse Source

...

This commit is contained in:

Aurorablade

2016-12-29 10:33:48 -05:00

parent 6b2b1b770d

commit dd75048969

6 changed files with 7973 additions and 3136 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

code/modules/mob/living/carbon/human/species/species.dm

+3472 -677

File diff suppressed because it is too large Load Diff