Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'

# Conflicts:
#	code/modules/client/preferences.dm
This commit is contained in:
TalkingCactus
2016-08-15 16:13:36 -04:00
5 changed files with 27 additions and 803 deletions
@@ -303,6 +303,9 @@
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing
H.apply_overlay(BODY_LAYER)
/datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour)