Revert "conflict fixes"

Browse Source

This reverts commit ba87398eea.

...

This commit is contained in:

Aurorablade

2016-01-15 07:59:14 -05:00

parent b691b71fef

commit 0fa96f21ae

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

+1045 -35

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