fixes derps in merge

Browse Source

...

This commit is contained in:

VampyrBytes

2016-05-10 04:33:21 +01:00

parent 9e0d053143

commit 0633176893

3 changed files with 7 additions and 1 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/abdcutor.dm → code/modules/mob/living/carbon/human/species/abductor.dm