conflict fixes

Browse Source

...

This commit is contained in:

Aurorablade

2016-01-15 07:11:28 -05:00

parent 678a2e9f4e

commit ba87398eea

2 changed files with 35 additions and 1045 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/update_icons.dm

+35 -1045

File diff suppressed because it is too large Load Diff

icons/mob/human_face.dmi

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 77 KiB After Width:  |  Height:  |  Size: 77 KiB