Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms

Conflicts:
	code/__HELPERS/lists.dm

code/modules/admin/admin_verbs.dm

@@ -66,7 +66,9 @@ var/list/admin_verbs_admin = list(
 	/client/proc/freeze,
 	/client/proc/freezemecha,
 	/client/proc/alt_check,
-	/client/proc/secrets
+	/client/proc/secrets,
+	/client/proc/change_human_appearance_admin,	/* Allows an admin to change the basic appearance of human-based mobs */
+	/client/proc/change_human_appearance_self	/* Allows the human-based mob itself change its basic appearance */
 )
 var/list/admin_verbs_ban = list(
 	/client/proc/unban_panel,
@@ -543,6 +545,41 @@ var/list/admin_verbs_mentor = list(
 	if(holder)
 		src.holder.output_ai_laws()
 
+/client/proc/change_human_appearance_admin(mob/living/carbon/human/H in world)
+	set name = "Change Mob Appearance - Admin"
+	set desc = "Allows you to change the mob appearance"
+	set category = "Admin"
+
+	if(!istype(H))
+		return
+
+	if(holder)
+		admin_log_and_message_admins("is altering the appearance of [H].")
+		H.change_appearance(APPEARANCE_ALL, usr, usr, check_species_whitelist = 0)
+	feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/change_human_appearance_self(mob/living/carbon/human/H in world)
+	set name = "Change Mob Appearance - Self"
+	set desc = "Allows the mob to change its appearance"
+	set category = "Admin"
+
+	if(!istype(H))
+		return
+
+	if(!H.client)
+		usr << "Only mobs with clients can alter their own appearance."
+		return
+
+	if(holder)
+		switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel"))
+			if("Yes")
+				admin_log_and_message_admins("has allowed [H] to change \his appearance, without whitelisting of races.")
+				H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 0)
+			if("No")
+				admin_log_and_message_admins("has allowed [H] to change \his appearance, with whitelisting of races.")
+				H.change_appearance(APPEARANCE_ALL, H.loc, check_species_whitelist = 1)
+	feedback_add_details("admin_verb","CMAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 
 //---- bs12 verbs ----
 

code/modules/admin/buildmode.dm

@@ -179,7 +179,7 @@
 					if("turf-reference")
 						master.buildmode.valueholder = input(usr,"Enter variable value:" ,"Value") as turf in world
 			if(AREA_BUILDMODE)
-				var/list/gen_paths = typesof(/datum/mapGenerator) - /datum/mapGenerator
+				var/list/gen_paths = subtypesof(/datum/mapGenerator)
 
 				var/type = input(usr,"Select Generator Type","Type") as null|anything in gen_paths
 				if(!type)	return

code/modules/admin/verbs/debug.dm

@@ -395,8 +395,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set name = "Del-All"
 
 	// to prevent REALLY stupid deletions
-	var/blocked = list(/obj, /mob, /mob/living, /mob/living/carbon, /mob/living/carbon/human, /mob/dead, /mob/dead/observer, /mob/living/silicon, /mob/living/silicon/robot, /mob/living/silicon/ai)
-	var/hsbitem = input(usr, "Choose an object to delete.", "Delete:") as null|anything in typesof(/obj) + typesof(/mob) - blocked
+	var/blocked = list(/mob/living, /mob/living/carbon, /mob/living/carbon/human, /mob/dead, /mob/dead/observer, /mob/living/silicon, /mob/living/silicon/robot, /mob/living/silicon/ai)
+	var/hsbitem = input(usr, "Choose an object to delete.", "Delete:") as null|anything in subtypesof(/obj) + subtypesof(/mob) - blocked
 	if(hsbitem)
 		for(var/atom/O in world)
 			if(istype(O, hsbitem))

code/modules/atmos_automation/statements.dm

@@ -1,4 +1,4 @@
-var/global/automation_types=typesof(/datum/automation) - /datum/automation
+var/global/automation_types = subtypesof(/datum/automation)
 
 #define AUTOM_RT_NULL    0
 #define AUTOM_RT_NUM     1

code/modules/client/preferences_spawnpoints.dm

@@ -2,7 +2,7 @@ var/list/spawntypes = list()
 
 /proc/populate_spawn_points()
 	spawntypes = list()
-	for(var/type in typesof(/datum/spawnpoint)-/datum/spawnpoint)
+	for(var/type in subtypesof(/datum/spawnpoint))
 		var/datum/spawnpoint/S = new type()
 		spawntypes[S.display_name] = S
 

code/modules/clothing/under/chameleon.dm

@@ -11,11 +11,11 @@
 
 	New()
 		..()
-		for(var/U in typesof(/obj/item/clothing/under/color)-(/obj/item/clothing/under/color))
+		for(var/U in subtypesof(/obj/item/clothing/under/color))
 			var/obj/item/clothing/under/V = new U
 			src.clothing_choices += V
 
-		for(var/U in typesof(/obj/item/clothing/under/rank)-(/obj/item/clothing/under/rank))
+		for(var/U in subtypesof(/obj/item/clothing/under/rank))
 			var/obj/item/clothing/under/V = new U
 			src.clothing_choices += V
 		return

code/modules/clothing/under/color.dm

@@ -3,8 +3,8 @@
 
 /obj/item/clothing/under/color/random/New()
 	..()
-	var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball, /obj/item/clothing/under/color/red/jersey, /obj/item/clothing/under/color/blue/jersey)
-	var/obj/item/clothing/under/color/C = pick(typesof(/obj/item/clothing/under/color) - excluded)
+	var/list/excluded = list(/obj/item/clothing/under/color/random, /obj/item/clothing/under/color/blackf, /obj/item/clothing/under/color/blue/dodgeball, /obj/item/clothing/under/color/orange/prison, /obj/item/clothing/under/color/red/dodgeball, /obj/item/clothing/under/color/red/jersey, /obj/item/clothing/under/color/blue/jersey)
+	var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - excluded)
 	name = initial(C.name)
 	icon_state = initial(C.icon_state)
 	item_state = initial(C.item_state)

code/modules/computer3/test_machines.dm

@@ -82,5 +82,5 @@
 /obj/item/weapon/storage/box/testing_disks
 	New()
 		..()
-		for(var/typekey in typesof(/obj/item/weapon/disk/file) - /obj/item/weapon/disk/file)
+		for(var/typekey in subtypesof(/obj/item/weapon/disk/file))
 			new typekey(src)

code/modules/economy/Economy.dm

@@ -89,7 +89,7 @@ var/setup_economy = 0
 	newChannel.is_admin_channel = 1
 	news_network.network_channels += newChannel
 
-	for(var/loc_type in typesof(/datum/trade_destination) - /datum/trade_destination)
+	for(var/loc_type in subtypesof(/datum/trade_destination))
 		var/datum/trade_destination/D = new loc_type
 		weighted_randomevent_locations[D] = D.viable_random_events.len
 		weighted_mundaneevent_locations[D] = D.viable_mundane_events.len

code/modules/events/event_manager.dm

@@ -22,7 +22,7 @@
 	var/datum/event_meta/new_event = new
 
 /datum/event_manager/New()
-	allEvents = typesof(/datum/event) - /datum/event
+	allEvents = subtypesof(/datum/event)
 
 /datum/event_manager/proc/process()
 	for(var/datum/event/E in event_manager.active_events)

code/modules/food/oven.dm

@@ -58,7 +58,7 @@
 /obj/machinery/cooking/oven/updatefood()
 	for(var/U in food_choices)
 		food_choices.Remove(U)
-	for(var/U in typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook)-(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook))
+	for(var/U in subtypesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook))
 		var/obj/item/weapon/reagent_containers/food/snacks/customizable/cook/V = new U
 		src.food_choices += V
 	return
@@ -73,7 +73,7 @@
 /obj/machinery/cooking/candy/updatefood()
 	for(var/U in food_choices)
 		food_choices.Remove(U)
-	for(var/U in typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/candy)-(/obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
+	for(var/U in subtypesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
 		var/obj/item/weapon/reagent_containers/food/snacks/customizable/candy/V = new U
 		src.food_choices += V
 	return

code/modules/genetics/side_effects.dm

@@ -77,7 +77,7 @@
 proc/trigger_side_effect(mob/living/carbon/human/H)
 	spawn
 		if(!istype(H)) return
-		var/tp = pick(typesof(/datum/genetics/side_effect) - /datum/genetics/side_effect)
+		var/tp = pick(subtypesof(/datum/genetics/side_effect))
 		var/datum/genetics/side_effect/S = new tp
 
 		S.start(H)

code/modules/genetics2/genetree.dm

@@ -9,7 +9,7 @@
 /datum/genetree/New(var/obj/machinery/networked/biomass_controller/holder)
 	biomass = holder
 	// Build list of all sectors
-	for(var/typepath in typesof(/datum/genetic_sector) - /datum/genetic_sector)
+	for(var/typepath in subtypesof(/datum/genetic_sector))
 		var/datum/genetic_sector/sector = new typepath
 		sectors[sector.id]=sector
 

code/modules/holiday/holiday.dm

@@ -328,7 +328,7 @@
 	if(!check_rights(R_SERVER))	return
 
 	var/list/choice = list()
-	for(var/H in typesof(/datum/holiday) - /datum/holiday)
+	for(var/H in subtypesof(/datum/holiday))
 		choice += "[H]"
 
 	choice += "--CANCEL--"

code/modules/hydroponics/seed_controller.dm

@@ -71,7 +71,7 @@ var/global/datum/controller/plants/plant_controller // Set in New().
 			plant_product_sprites |= copytext(icostate,1,split)
 
 	// Populate the global seed datum list.
-	for(var/type in typesof(/datum/seed)-/datum/seed)
+	for(var/type in subtypesof(/datum/seed))
 		var/datum/seed/S = new type
 		seeds[S.name] = S
 		S.uid = "[seeds.len]"

code/modules/jungle/jungle_animals.dm

@@ -8,7 +8,7 @@
 
 /obj/effect/landmark/animal_spawner/New()
 	if(!spawn_type)
-		var/new_type = pick(typesof(/obj/effect/landmark/animal_spawner) - /obj/effect/landmark/animal_spawner)
+		var/new_type = pick(subtypesof(/obj/effect/landmark/animal_spawner))
 		new new_type(get_turf(src))
 		qdel(src)
 

code/modules/jungle/jungle_temple.dm

@@ -95,7 +95,7 @@
 					var/amount = rand(2,6)
 					var/quantity = rand(10,50)
 					var/list/possible_spawns = list()
-					for(var/bar_type in typesof(/obj/item/stack/sheet/mineral) - /obj/item/stack/sheet/mineral - /obj/item/stack/sheet/mineral/enruranium)
+					for(var/bar_type in subtypesof(/obj/item/stack/sheet/mineral) - /obj/item/stack/sheet/mineral/enruranium)
 						possible_spawns += bar_type
 
 					var/bar_type = pick(possible_spawns)

code/modules/mining/materials.dm

@@ -13,7 +13,7 @@
 	var/list/datum/material/storage[0]
 
 /datum/materials/New()
-	for(var/matdata in typesof(/datum/material) - /datum/material)
+	for(var/matdata in subtypesof(/datum/material))
 		var/datum/material/mat = new matdata
 		storage[mat.id]=mat
 

code/modules/mining/minerals.dm

@@ -2,7 +2,7 @@ var/list/name_to_mineral
 
 proc/SetupMinerals()
 	name_to_mineral = list()
-	for(var/type in typesof(/mineral) - /mineral)
+	for(var/type in subtypesof(/mineral))
 		var/mineral/new_mineral = new type
 		if(!new_mineral.name)
 			continue

code/modules/mining/surprise.dm

@@ -3,7 +3,7 @@
 
 #define TURF_FLOOR 0
 #define TURF_WALL 1
-var/global/list/mining_surprises = typesof(/mining_surprise)-/mining_surprise
+var/global/list/mining_surprises = subtypesof(/mining_surprise)
 
 /surprise_turf_info
 	var/list/types[0]

code/modules/mob/living/carbon/human/appearance.dm

@@ -0,0 +1,185 @@
+/mob/living/carbon/human/proc/change_appearance(var/flags = APPEARANCE_ALL_HAIR, var/location = src, var/mob/user = src, var/check_species_whitelist = 1, var/list/species_whitelist = list(), var/list/species_blacklist = list(), var/datum/topic_state/state = default_state)
+	var/datum/nano_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist)
+	AC.flags = flags
+	AC.ui_interact(user, state = state)
+
+/mob/living/carbon/human/proc/change_species(var/new_species)
+	if(!new_species)
+		return
+
+	if(species == new_species)
+		return
+
+	if(!(new_species in all_species))
+		return
+
+	set_species(new_species)
+	reset_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_gender(var/gender)
+	if(src.gender == gender)
+		return
+
+	src.gender = gender
+	reset_hair()
+	update_body()
+	update_dna()
+	return 1
+
+/mob/living/carbon/human/proc/change_hair(var/hair_style)
+	if(!hair_style)
+		return
+
+	if(h_style == hair_style)
+		return
+
+	if(!(hair_style in hair_styles_list))
+		return
+
+	h_style = hair_style
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_facial_hair(var/facial_hair_style)
+	if(!facial_hair_style)
+		return
+
+	if(f_style == facial_hair_style)
+		return
+
+	if(!(facial_hair_style in facial_hair_styles_list))
+		return
+
+	f_style = facial_hair_style
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/reset_hair()
+	var/list/valid_hairstyles = generate_valid_hairstyles()
+	var/list/valid_facial_hairstyles = generate_valid_facial_hairstyles()
+
+	if(valid_hairstyles.len)
+		h_style = pick(valid_hairstyles)
+	else
+		//this shouldn't happen
+		h_style = "Bald"
+
+	if(valid_facial_hairstyles.len)
+		f_style = pick(valid_facial_hairstyles)
+	else
+		//this shouldn't happen
+		f_style = "Shaved"
+
+	update_hair()
+
+/mob/living/carbon/human/proc/change_eye_color(var/red, var/green, var/blue)
+	if(red == r_eyes && green == g_eyes && blue == b_eyes)
+		return
+
+	r_eyes = red
+	g_eyes = green
+	b_eyes = blue
+
+	update_eyes()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/change_hair_color(var/red, var/green, var/blue)
+	if(red == r_eyes && green == g_eyes && blue == b_eyes)
+		return
+
+	r_hair = red
+	g_hair = green
+	b_hair = blue
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_facial_hair_color(var/red, var/green, var/blue)
+	if(red == r_facial && green == g_facial && blue == b_facial)
+		return
+
+	r_facial = red
+	g_facial = green
+	b_facial = blue
+
+	update_hair()
+	return 1
+
+/mob/living/carbon/human/proc/change_skin_color(var/red, var/green, var/blue)
+	if(red == r_skin && green == g_skin && blue == b_skin || !(species.flags & HAS_SKIN_COLOR))
+		return
+
+	r_skin = red
+	g_skin = green
+	b_skin = blue
+
+	force_update_limbs()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/change_skin_tone(var/tone)
+	if(s_tone == tone || !(species.flags & HAS_SKIN_TONE))
+		return
+
+	s_tone = tone
+
+	force_update_limbs()
+	update_body()
+	return 1
+
+/mob/living/carbon/human/proc/update_dna()
+	check_dna()
+	dna.ready_dna(src)
+
+/mob/living/carbon/human/proc/generate_valid_species(var/check_whitelist = 1, var/list/whitelist = list(), var/list/blacklist = list())
+	var/list/valid_species = new()
+	for(var/current_species_name in all_species)
+		var/datum/species/current_species = all_species[current_species_name]
+
+		if(check_whitelist && config.usealienwhitelist && !check_rights(R_ADMIN, 0, src)) //If we're using the whitelist, make sure to check it!
+			if(whitelist.len && !(current_species_name in whitelist))
+				continue
+			if(blacklist.len && (current_species_name in blacklist))
+				continue
+			if((current_species.flags & IS_WHITELISTED) && !is_alien_whitelisted(src, current_species_name))
+				continue
+
+		valid_species += current_species_name
+
+	return valid_species
+
+/mob/living/carbon/human/proc/generate_valid_hairstyles()
+	var/list/valid_hairstyles = new()
+	for(var/hairstyle in hair_styles_list)
+		var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
+
+		if(gender == MALE && S.gender == FEMALE)
+			continue
+		if(gender == FEMALE && S.gender == MALE)
+			continue
+		if(!(species.name in S.species_allowed))
+			continue
+		valid_hairstyles += hairstyle
+
+	return valid_hairstyles
+
+/mob/living/carbon/human/proc/generate_valid_facial_hairstyles()
+	var/list/valid_facial_hairstyles = new()
+	for(var/facialhairstyle in facial_hair_styles_list)
+		var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
+
+		if(gender == MALE && S.gender == FEMALE)
+			continue
+		if(gender == FEMALE && S.gender == MALE)
+			continue
+		if(!(species.name in S.species_allowed))
+			continue
+
+		valid_facial_hairstyles += facialhairstyle
+
+	return valid_facial_hairstyles
+	

code/modules/mob/living/silicon/pai/software.dm

@@ -15,7 +15,7 @@ var/global/list/pai_software_by_key = list()
 var/global/list/default_pai_software = list()
 /hook/startup/proc/populate_pai_software_list()
 	var/r = 1 // I would use ., but it'd sacrifice runtime detection
-	for(var/type in typesof(/datum/pai_software) - /datum/pai_software)
+	for(var/type in subtypesof(/datum/pai_software))
 		var/datum/pai_software/P = new type()
 		if(pai_software_by_key[P.id])
 			var/datum/pai_software/O = pai_software_by_key[P.id]

code/modules/mob/living/silicon/robot/laws.dm

@@ -110,8 +110,8 @@
 		if(0)  laws = new /datum/ai_laws/asimov()
 		if(1)  laws = new /datum/ai_laws/custom()
 		if(2)
-			var/datum/ai_laws/lawtype = pick(typesof(/datum/ai_laws/default) - /datum/ai_laws/default)
-			laws = new lawtype()
+			var/datum/ai_laws/lawtype = pick(subtypesof(/datum/ai_laws/default))
+			laws = new lawtype()
 
 /mob/living/silicon/robot/proc/statelaws() // -- TLE
 //	set category = "AI Commands"
@@ -200,4 +200,4 @@
 
 	list += {"<br><br><A href='byond://?src=\ref[src];laws=1'>State Laws</A>"}
 
-	usr << browse(list, "window=laws")			
+	usr << browse(list, "window=laws")

code/modules/nano/modules/human_appearance.dm

@@ -0,0 +1,159 @@
+/datum/nano_module/appearance_changer
+	name = "Appearance Editor"
+	var/flags = APPEARANCE_ALL_HAIR
+	var/mob/living/carbon/human/owner = null
+	var/list/valid_species = list()
+	var/list/valid_hairstyles = list()
+	var/list/valid_facial_hairstyles = list()
+
+	var/check_whitelist
+	var/list/whitelist
+	var/list/blacklist
+
+/datum/nano_module/appearance_changer/New(var/location, var/mob/living/carbon/human/H, var/check_species_whitelist = 1, var/list/species_whitelist = list(), var/list/species_blacklist = list())
+	..()
+	owner = H
+	src.check_whitelist = check_species_whitelist
+	src.whitelist = species_whitelist
+	src.blacklist = species_blacklist
+
+/datum/nano_module/appearance_changer/Topic(ref, href_list, var/nowindow, var/datum/topic_state/state = default_state)
+	if(..())
+		return 1
+
+	if(href_list["race"])
+		if(can_change(APPEARANCE_RACE) && (href_list["race"] in valid_species))
+			if(owner.change_species(href_list["race"]))
+				cut_and_generate_data()
+				return 1
+	if(href_list["gender"])
+		if(can_change(APPEARANCE_GENDER))
+			if(owner.change_gender(href_list["gender"]))
+				cut_and_generate_data()
+				return 1
+	if(href_list["skin_tone"])
+		if(can_change_skin_tone())
+			var/new_s_tone = input(usr, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Skin Tone", owner.s_tone) as num|null
+			if(isnum(new_s_tone) && can_still_topic(state))
+				new_s_tone = 35 - max(min( round(new_s_tone), 220),1)
+				return owner.change_skin_tone(new_s_tone)
+	if(href_list["skin_color"])
+		if(can_change_skin_color())
+			var/new_skin = input(usr, "Choose your character's skin colour: ", "Skin Color", rgb(owner.r_skin, owner.g_skin, owner.b_skin)) as color|null
+			if(new_skin && can_still_topic(state))
+				var/r_skin = hex2num(copytext(new_skin, 2, 4))
+				var/g_skin = hex2num(copytext(new_skin, 4, 6))
+				var/b_skin = hex2num(copytext(new_skin, 6, 8))
+				if(owner.change_skin_color(r_skin, g_skin, b_skin))
+					update_dna()
+					return 1
+	if(href_list["hair"])
+		if(can_change(APPEARANCE_HAIR) && (href_list["hair"] in valid_hairstyles))
+			if(owner.change_hair(href_list["hair"]))
+				update_dna()
+				return 1
+	if(href_list["hair_color"])
+		if(can_change(APPEARANCE_HAIR_COLOR))
+			var/new_hair = input("Please select hair color.", "Hair Color", rgb(owner.r_hair, owner.g_hair, owner.b_hair)) as color|null
+			if(new_hair && can_still_topic(state))
+				var/r_hair = hex2num(copytext(new_hair, 2, 4))
+				var/g_hair = hex2num(copytext(new_hair, 4, 6))
+				var/b_hair = hex2num(copytext(new_hair, 6, 8))
+				if(owner.change_hair_color(r_hair, g_hair, b_hair))
+					update_dna()
+					return 1
+	if(href_list["facial_hair"])
+		if(can_change(APPEARANCE_FACIAL_HAIR) && (href_list["facial_hair"] in valid_facial_hairstyles))
+			if(owner.change_facial_hair(href_list["facial_hair"]))
+				update_dna()
+				return 1
+	if(href_list["facial_hair_color"])
+		if(can_change(APPEARANCE_FACIAL_HAIR_COLOR))
+			var/new_facial = input("Please select facial hair color.", "Facial Hair Color", rgb(owner.r_facial, owner.g_facial, owner.b_facial)) as color|null
+			if(new_facial && can_still_topic(state))
+				var/r_facial = hex2num(copytext(new_facial, 2, 4))
+				var/g_facial = hex2num(copytext(new_facial, 4, 6))
+				var/b_facial = hex2num(copytext(new_facial, 6, 8))
+				if(owner.change_facial_hair_color(r_facial, g_facial, b_facial))
+					update_dna()
+					return 1
+	if(href_list["eye_color"])
+		if(can_change(APPEARANCE_EYE_COLOR))
+			var/new_eyes = input("Please select eye color.", "Eye Color", rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes)) as color|null
+			if(new_eyes && can_still_topic(state))
+				var/r_eyes = hex2num(copytext(new_eyes, 2, 4))
+				var/g_eyes = hex2num(copytext(new_eyes, 4, 6))
+				var/b_eyes = hex2num(copytext(new_eyes, 6, 8))
+				if(owner.change_eye_color(r_eyes, g_eyes, b_eyes))
+					update_dna()
+					return 1
+
+	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)
+	generate_data(check_whitelist, whitelist, blacklist)
+	var/data[0]
+
+	data["specimen"] = owner.species.name
+	data["gender"] = owner.gender
+	data["change_race"] = can_change(APPEARANCE_RACE)
+	if(data["change_race"])
+		var/species[0]
+		for(var/specimen in valid_species)
+			species[++species.len] =  list("specimen" = specimen)
+		data["species"] = species
+
+	data["change_gender"] = can_change(APPEARANCE_GENDER)
+	data["change_skin_tone"] = can_change_skin_tone()
+	data["change_skin_color"] = can_change_skin_color()
+	data["change_eye_color"] = can_change(APPEARANCE_EYE_COLOR)
+	data["change_hair"] = can_change(APPEARANCE_HAIR)
+	if(data["change_hair"])
+		var/hair_styles[0]
+		for(var/hair_style in valid_hairstyles)
+			hair_styles[++hair_styles.len] = list("hairstyle" = hair_style)
+		data["hair_styles"] = hair_styles
+		data["hair_style"] = owner.h_style
+
+	data["change_facial_hair"] = can_change(APPEARANCE_FACIAL_HAIR)
+	if(data["change_facial_hair"])
+		var/facial_hair_styles[0]
+		for(var/facial_hair_style in valid_facial_hairstyles)
+			facial_hair_styles[++facial_hair_styles.len] = list("facialhairstyle" = facial_hair_style)
+		data["facial_hair_styles"] = facial_hair_styles
+		data["facial_hair_style"] = owner.f_style
+
+	data["change_hair_color"] = can_change(APPEARANCE_HAIR_COLOR)
+	data["change_facial_hair_color"] = can_change(APPEARANCE_FACIAL_HAIR_COLOR)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "appearance_changer.tmpl", "[src]", 800, 450, state = state)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+/datum/nano_module/appearance_changer/proc/update_dna()
+	if(owner && (flags & APPEARANCE_UPDATE_DNA))
+		owner.update_dna()
+
+/datum/nano_module/appearance_changer/proc/can_change(var/flag)
+	return owner && (flags & flag)
+
+/datum/nano_module/appearance_changer/proc/can_change_skin_tone()
+	return owner && (flags & APPEARANCE_SKIN) && owner.species.flags & HAS_SKIN_TONE
+
+/datum/nano_module/appearance_changer/proc/can_change_skin_color()
+	return owner && (flags & APPEARANCE_SKIN) && owner.species.flags & HAS_SKIN_COLOR
+
+/datum/nano_module/appearance_changer/proc/cut_and_generate_data()
+	// Making the assumption that the available species remain constant
+	valid_facial_hairstyles.Cut()
+	valid_facial_hairstyles.Cut()
+	generate_data()
+
+/datum/nano_module/appearance_changer/proc/generate_data()
+	if(!valid_species.len)
+		valid_species = owner.generate_valid_species(check_whitelist, whitelist, blacklist)
+	if(!valid_hairstyles.len || !valid_facial_hairstyles.len)
+		valid_hairstyles = owner.generate_valid_hairstyles()
+		valid_facial_hairstyles = owner.generate_valid_facial_hairstyles()

code/modules/power/cable.dm

@@ -560,14 +560,14 @@ obj/structure/cable/proc/cableColor(var/colorC)
 	if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
 		if(!istype(usr.loc,/turf)) return
 		if(src.amount <= 14)
-			usr << "\red You need at least 15 lengths to make restraints!"
+			usr << "<span class='warning'>You need at least 15 lengths to make restraints!</span>"
 			return
 		var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
-		B.icon_state = "cuff_[color]"
-		usr << "\blue You wind some cable together to make some restraints."
+		B.color = color
+		usr << "<span class='notice'>You wind some cable together to make some restraints.</span>"
 		src.use(15)
 	else
-		usr << "\blue You cannot do that."
+		usr << "<span class='warning'>You cannot do that.</span>"
 	..()
 
 // Items usable on a cable coil :

code/modules/power/solar.dm

@@ -303,11 +303,13 @@
 	..()
 	if(!powernet) 
 		return
+	connect_to_network()
+	set_panels(cdir)
 	if(autostart)
 		src.search_for_connected()
 		if(connected_tracker && track == 2)
 			connected_tracker.set_angle(sun.angle)
-	set_panels(cdir)
+		set_panels(cdir)
 
 /obj/machinery/power/solar_control/Destroy()
 	for(var/obj/machinery/power/solar/M in connected_panels)

code/modules/projectiles/projectile.dm

@@ -297,7 +297,7 @@
 			return //cannot shoot yourself
 		if(istype(A, /obj/item/projectile))
 			return
-		if(istype(A, /mob/living))
+		if(istype(A, /mob/living) || istype(A, /obj/mecha) || istype(A, /obj/spacepod) || istype(A, /obj/vehicle))
 			result = 2 //We hit someone, return 1!
 			return
 		result = 1

code/modules/reagents/Chemistry-Holder.dm

@@ -18,7 +18,7 @@ datum
 			//I dislike having these here but map-objects are initialised before world/New() is called. >_>
 			if(!chemical_reagents_list)
 				//Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id
-				var/paths = typesof(/datum/reagent) - /datum/reagent
+				var/paths = subtypesof(/datum/reagent)
 				chemical_reagents_list = list()
 				for(var/path in paths)
 					var/datum/reagent/D = new path()
@@ -29,7 +29,7 @@ datum
 				// For example:
 				// chemical_reaction_list["plasma"] is a list of all reactions relating to plasma
 
-				var/paths = typesof(/datum/chemical_reaction) - /datum/chemical_reaction
+				var/paths = subtypesof(/datum/chemical_reaction)
 				chemical_reactions_list = list()
 
 				for(var/path in paths)

code/modules/reagents/Chemistry-Recipes.dm

@@ -555,7 +555,7 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 
-				var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
+				var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/snacks)
 				// BORK BORK BORK
 
 				playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -582,7 +582,7 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 
-				var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/drinks) - /obj/item/weapon/reagent_containers/food/drinks
+				var/list/borks = subtypesof(/obj/item/weapon/reagent_containers/food/drinks)
 				// BORK BORK BORK
 
 				playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -888,7 +888,7 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 				feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-				var/list/paints = typesof(/obj/item/weapon/reagent_containers/glass/paint) - /obj/item/weapon/reagent_containers/glass/paint
+				var/list/paints = subtypesof(/obj/item/weapon/reagent_containers/glass/paint)
 				var/chosen = pick(paints)
 				var/obj/P = new chosen
 				if(P)

code/modules/research/rdconsole.dm

@@ -57,7 +57,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 /obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
 	var/datum/tech/check_tech
 	var/return_name = null
-	for(var/T in typesof(/datum/tech) - /datum/tech)
+	for(var/T in subtypesof(/datum/tech))
 		check_tech = null
 		check_tech = new T()
 		if(check_tech.id == ID)
@@ -91,7 +91,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if("clown")
 				return_name = "Bananium"
 	else
-		for(var/R in typesof(/datum/reagent) - /datum/reagent)
+		for(var/R in subtypesof(/datum/reagent))
 			temp_reagent = null
 			temp_reagent = new R()
 			if(temp_reagent.id == ID)

code/modules/research/research.dm

@@ -53,9 +53,9 @@ research holder datum.
 	var/list/known_designs = list()			//List of available designs (at base reliability).
 
 /datum/research/New()		//Insert techs into possible_tech here. Known_tech automatically updated.
-	for(var/T in typesof(/datum/tech) - /datum/tech)
+	for(var/T in subtypesof(/datum/tech))
 		possible_tech += new T(src)
-	for(var/D in typesof(/datum/design) - /datum/design)
+	for(var/D in subtypesof(/datum/design))
 		possible_designs += new D(src)
 	RefreshResearch()
 
@@ -140,7 +140,7 @@ research holder datum.
 						D.reliability = min(100, D.reliability + rand(1,3))
 						if(I.crit_fail)
 							D.reliability = min(100, D.reliability + rand(3, 5))
-							
+
 /datum/research/proc/FindDesignByID(var/id)
 	for(var/datum/design/D in known_designs)
 		if(D.id == id)
@@ -148,9 +148,9 @@ research holder datum.
 
 //Autolathe files
 /datum/research/autolathe/New()
-	for(var/T in (typesof(/datum/tech) - /datum/tech))
+	for(var/T in subtypesof(/datum/tech))
 		possible_tech += new T(src)
-	for(var/path in typesof(/datum/design) - /datum/design)
+	for(var/path in subtypesof(/datum/design))
 		var/datum/design/D = new path(src)
 		possible_designs += D
 		if((D.build_type & AUTOLATHE) && ("initial" in D.category))  //autolathe starts without hacked designs
@@ -278,7 +278,7 @@ datum/tech/robotics
 /obj/item/weapon/disk/tech_disk/New()
 	src.pixel_x = rand(-5.0, 5)
 	src.pixel_y = rand(-5.0, 5)
-	
+
 /obj/item/weapon/disk/design_disk
 	name = "Component Design Disk"
 	desc = "A disk for storing device design data for construction in lathes."

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -72,12 +72,12 @@ var/list/valid_secondary_effect_types = list(\
 	..()
 
 	//setup primary effect - these are the main ones (mixed)
-	var/effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
+	var/effecttype = pick(subtypesof(/datum/artifact_effect))
 	my_effect = new effecttype(src)
 
 	//75% chance to have a secondary stealthy (and mostly bad) effect
 	if(prob(75))
-		effecttype = pick(typesof(/datum/artifact_effect) - /datum/artifact_effect)
+		effecttype = pick(subtypesof(/datum/artifact_effect))
 		secondary_effect = new effecttype(src)
 		if(prob(75))
 			secondary_effect.ToggleActivate(0)

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -324,8 +324,7 @@
 			apply_image_decorations = 0
 			apply_material_decorations = 0
 		if(24)
-			var/list/possible_spawns = typesof(/obj/item/weapon/stock_parts)
-			possible_spawns -= /obj/item/weapon/stock_parts
+			var/list/possible_spawns = subtypesof(/obj/item/weapon/stock_parts)
 			possible_spawns -= /obj/item/weapon/stock_parts/subspace
 
 			var/new_type = pick(possible_spawns)

code/modules/store/store.dm

@@ -25,7 +25,7 @@ var/global/datum/store/centcomm_store=new
 	var/obj/machinery/account_database/linked_db
 
 /datum/store/New()
-	for(var/itempath in typesof(/datum/storeitem) - /datum/storeitem/)
+	for(var/itempath in subtypesof(/datum/storeitem))
 		items += new itempath()
 
 /datum/store/proc/charge(var/datum/mind/mind,var/amount,var/datum/storeitem/item)

code/modules/virus2/effect.dm

@@ -15,7 +15,7 @@
 
 /datum/disease2/effectholder/proc/getrandomeffect(var/badness = 1)
 	var/list/datum/disease2/effect/list = list()
-	for(var/e in (typesof(/datum/disease2/effect) - /datum/disease2/effect))
+	for(var/e in subtypesof(/datum/disease2/effect))
 		var/datum/disease2/effect/f = new e
 		if (f.badness > badness)	//we don't want such strong effects
 			continue