Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
This commit is contained in:
PsiOmegaDelta
2015-09-08 07:58:25 +02:00
6 changed files with 28 additions and 15 deletions
@@ -91,6 +91,10 @@
return 0
/datum/nano_module/appearance_changer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
if(!owner || !owner.species)
return
generate_data(check_whitelist, whitelist, blacklist)
var/data[0]