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

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm

baystation12.dme

@@ -1309,6 +1309,7 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
+#include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
 #include "code\modules\mob\living\simple_animal\bees.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
 #include "code\modules\mob\living\simple_animal\parrot.dm"

code/_helpers/unsorted.dm

@@ -871,6 +871,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 	//       Movement based on lower left corner. Tiles that do not fit
 	//		 into the new area will not be moved.
 
+	// Does *not* affect gases etc; copied turfs will be changed via ChangeTurf, and the dir, icon, and icon_state copied. All other vars will remain default.
+
 	if(!A || !src) return 0
 
 	var/list/turfs_src = get_area_turfs(src.type)
@@ -924,7 +926,8 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 						if(istype(B, get_base_turf(B.z)))
 							continue moving
 
-					var/turf/X = new T.type(B)
+					var/turf/X = B
+					X.ChangeTurf(T.type)
 					X.set_dir(old_dir1)
 					X.icon_state = old_icon_state1
 					X.icon = old_icon1 //Shuttle floors are in shuttle.dmi while the defaults are floors.dmi
@@ -964,12 +967,6 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 					copiedobjs += newobjs
 					copiedobjs += newmobs
 
-
-
-					for(var/V in T.vars)
-						if(!(V in list("type","loc","locs","vars", "parent", "parent_type","verbs","ckey","key","x","y","z","contents", "luminosity")))
-							X.vars[V] = T.vars[V]
-
 //					var/area/AR = X.loc
 
 //					if(AR.lighting_use_dynamic)
@@ -985,22 +982,9 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
 
 
 
-	var/list/doors = new/list()
-
 	if(toupdate.len)
 		for(var/turf/simulated/T1 in toupdate)
-			for(var/obj/machinery/door/D2 in T1)
+			air_master.mark_for_update(T1)
-				doors += D2
-			/*if(T1.parent)
-				air_master.groups_to_rebuild += T1.parent
-			else
-				air_master.tiles_to_update += T1*/
-
-	for(var/obj/O in doors)
-		O:update_nearby_tiles(1)
-
-
-
 
 	return copiedobjs
 

code/datums/datacore.dm

@@ -138,9 +138,160 @@
 
 
 proc/get_id_photo(var/mob/living/carbon/human/H)
-	H.regenerate_icons()
+	var/icon/preview_icon = null
-	var/icon/preview_icon = icon(H.icon)
+
-	for(var/image/I in H.overlays_standing)
+	var/g = "m"
-		if(I && I.icon)
+	if (H.gender == FEMALE)
-			preview_icon.Blend(icon(I.icon, I.icon_state), ICON_OVERLAY)
+		g = "f"
+
+	var/icon/icobase = H.species.icobase
+
+	preview_icon = new /icon(icobase, "torso_[g]")
+	var/icon/temp
+	temp = new /icon(icobase, "groin_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
+	temp = new /icon(icobase, "head_[g]")
+	preview_icon.Blend(temp, ICON_OVERLAY)
+
+	for(var/obj/item/organ/external/E in H.organs)
+		preview_icon.Blend(E.get_icon(), ICON_OVERLAY)
+
+	//Tail
+	if(H.species.tail)
+		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
+		preview_icon.Blend(temp, ICON_OVERLAY)
+
+	// Skin tone
+	if(H.species.flags & HAS_SKIN_TONE)
+		if (H.s_tone >= 0)
+			preview_icon.Blend(rgb(H.s_tone, H.s_tone, H.s_tone), ICON_ADD)
+		else
+			preview_icon.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
+
+	// Skin color
+	if(H.species.flags & HAS_SKIN_TONE)
+		if(!H.species || H.species.flags & HAS_SKIN_COLOR)
+			preview_icon.Blend(rgb(H.r_skin, H.g_skin, H.b_skin), ICON_ADD)
+
+	var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
+
+	if (H.species.flags & HAS_EYE_COLOR)
+		eyes_s.Blend(rgb(H.r_eyes, H.g_eyes, H.b_eyes), ICON_ADD)
+
+	var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
+	if(hair_style)
+		var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+		hair_s.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
+		eyes_s.Blend(hair_s, ICON_OVERLAY)
+
+	var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
+	if(facial_hair_style)
+		var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+		facial_s.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
+		eyes_s.Blend(facial_s, ICON_OVERLAY)
+
+	var/icon/clothes_s = null
+	switch(H.mind.assigned_role)
+		if("Head of Personnel")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Bartender")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Gardener")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Chef")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Janitor")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Librarian")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Quartermaster")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Cargo Technician")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Shaft Miner")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Lawyer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Chaplain")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+		if("Research Director")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		if("Scientist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+		if("Chemist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+		if("Chief Medical Officer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+		if("Medical Doctor")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		if("Geneticist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+		if("Virologist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+		if("Captain")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+		if("Head of Security")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Warden")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Detective")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+		if("Security Officer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+		if("Chief Engineer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Station Engineer")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Atmospheric Technician")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+		if("Roboticist")
+			clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+		else
+			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+	preview_icon.Blend(eyes_s, ICON_OVERLAY)
+	if(clothes_s)
+		preview_icon.Blend(clothes_s, ICON_OVERLAY)
+	qdel(eyes_s)
+	qdel(clothes_s)
+
 	return preview_icon

code/game/machinery/computer/ai_core.dm

@@ -201,6 +201,7 @@
 	transfer.control_disabled = 0
 	transfer.aiRadio.disabledAi = 0
 	transfer.loc = get_turf(src)
+	transfer.create_eyeobj()
 	transfer.cancel_camera()
 	user << "<span class='notice'>Transfer successful:</span> [transfer.name] ([rand(1000,9999)].exe) downloaded to host terminal. Local copy wiped."
 	transfer << "You have been uploaded to a stationary terminal. Remote device connection restored."

code/game/objects/items/devices/aicard.dm

@@ -110,6 +110,7 @@
 
 	ai.loc = src
 	ai.cancel_camera()
+	ai.destroy_eyeobj(src)
 	ai.control_disabled = 1
 	ai.aiRestorePowerRoutine = 0
 	carded_ai = ai

code/modules/admin/verbs/debug.dm

@@ -64,6 +64,28 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 
 		var/procname = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
 		if(!procname)	return
+	
+		if(targetselected)
+			if(!target)
+				usr << "<span class='danger'>Your target no longer exists.</span>"
+				return
+			if(!hascall(target,procname))
+				usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
+				return
+		else
+			if(copytext(procname, 1, 7) == "/proc/")
+				// nothing
+			else if(copytext(procname, 1, 6) == "proc/")
+				procname = "/[procname]"
+			else if(copytext(procname, 1, 2) == "/")
+				procname = "/proc[procname]"
+			else
+				procname = "/proc/[procname]"
+			// Procs have the strange property that text2path will return non-null, but ispath() will return false.
+			var/path = text2path(procname)
+			if(!path || ispath(path))
+				usr << "<span class='danger'>Invalid proc [procname]</span>"
+				return
 
 		var/argnum = input("Number of arguments","Number:",0) as num|null
 		if(!argnum && (argnum!=0))	return
@@ -117,13 +139,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			if(!target)
 				usr << "<font color='red'>Error: callproc(): owner of proc no longer exists.</font>"
 				return
-			if(!hascall(target,procname))
-				usr << "<font color='red'>Error: callproc(): target has no such call [procname].</font>"
-				return
 			log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
 			returnval = call(target,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
 		else
-			//this currently has no hascall protection. wasn't able to get it working.
 			log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
 			returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc
 

code/modules/client/preferences.dm

@@ -85,7 +85,6 @@ datum/preferences
 	var/religion = "None"               //Religious association.
 
 		//Mob preview
-	var/mob/living/carbon/human/dummy //the mannequin
 	var/icon/preview_icon = null
 	var/icon/preview_icon_front = null
 	var/icon/preview_icon_side = null
@@ -1641,18 +1640,30 @@ datum/preferences
 	character.gen_record = gen_record
 	character.exploit_record = exploit_record
 
-	character.change_gender(gender)
+	character.gender = gender
 	character.age = age
 	character.b_type = b_type
 
-	character.change_eye_color(r_eyes,g_eyes,b_eyes)
+	character.r_eyes = r_eyes
-	character.change_hair_color(r_hair,g_hair,b_hair)
+	character.g_eyes = g_eyes
-	character.change_facial_hair_color(r_facial,g_facial,b_facial)
+	character.b_eyes = b_eyes
-	character.change_skin_color(r_skin,g_skin,b_skin)
-	character.change_skin_tone(s_tone)
 
-	character.change_hair(h_style)
+	character.r_hair = r_hair
-	character.change_facial_hair(f_style)
+	character.g_hair = g_hair
+	character.b_hair = b_hair
+
+	character.r_facial = r_facial
+	character.g_facial = g_facial
+	character.b_facial = b_facial
+
+	character.r_skin = r_skin
+	character.g_skin = g_skin
+	character.b_skin = b_skin
+
+	character.s_tone = s_tone
+
+	character.h_style = h_style
+	character.f_style = f_style
 
 	character.home_system = home_system
 	character.citizenship = citizenship

code/modules/clothing/spacesuits/rig/rig.dm

@@ -71,6 +71,7 @@
 	var/offline_slowdown = 3                                  // If the suit is deployed and unpowered, it sets slowdown to this.
 	var/vision_restriction
 	var/offline_vision_restriction = 1                        // 0 - none, 1 - welder vision, 2 - blind. Maybe move this to helmets.
+	var/airtight = 1 //If set, will adjust AIRTIGHT and STOPPRESSUREDAMAGE flags on components. Otherwise it should leave them untouched.
 
 	var/emp_protection = 0
 
@@ -178,8 +179,9 @@
 	for(var/obj/item/piece in list(helmet,boots,gloves,chest))
 		if(!piece) continue
 		piece.icon_state = "[initial(icon_state)]"
-		piece.flags &= ~STOPPRESSUREDAMAGE
+		if(airtight)
-		piece.flags &= ~AIRTIGHT
+			piece.flags &= ~STOPPRESSUREDAMAGE
+			piece.flags &= ~AIRTIGHT
 	update_icon(1)
 
 /obj/item/weapon/rig/proc/toggle_seals(var/mob/living/carbon/human/M,var/instant)
@@ -247,11 +249,6 @@
 							M << "<font color='blue'>\The [piece] hisses [!seal_target ? "closed" : "open"].</font>"
 							M.update_inv_head()
 							if(helmet)
-								if(!seal_target)
-									if(flags & AIRTIGHT)
-										helmet.flags |= AIRTIGHT
-								else
-									helmet.flags &= ~AIRTIGHT
 								helmet.update_light(wearer)
 
 					//sealed pieces become airtight, protecting against diseases
@@ -273,13 +270,8 @@
 			if(!piece) continue
 			piece.icon_state = "[initial(icon_state)][!seal_target ? "" : "_sealed"]"
 		canremove = !seal_target
-		if(helmet)
+		if(airtight)
-			if(canremove)
+			update_component_sealed()
-				if(flags & AIRTIGHT)
-					helmet.flags |= AIRTIGHT
-			else
-				if(flags & AIRTIGHT)
-					helmet.flags &= ~AIRTIGHT
 		update_icon(1)
 		return 0
 
@@ -290,15 +282,18 @@
 	if(canremove)
 		for(var/obj/item/rig_module/module in installed_modules)
 			module.deactivate()
+	if(airtight)
+		update_component_sealed()
+	update_icon(1)
+
+/obj/item/weapon/rig/proc/update_component_sealed()
 	for(var/obj/item/piece in list(helmet,boots,gloves,chest))
-		if(!piece) continue
 		if(canremove)
 			piece.flags &= ~STOPPRESSUREDAMAGE
 			piece.flags &= ~AIRTIGHT
 		else
 			piece.flags |=  STOPPRESSUREDAMAGE
 			piece.flags |=  AIRTIGHT
-	update_icon(1)
 
 /obj/item/weapon/rig/process()
 

code/modules/clothing/spacesuits/rig/rig_pieces.dm

@@ -24,6 +24,7 @@
 
 /obj/item/clothing/shoes/magboots/rig
 	name = "boots"
+	body_parts_covered = FEET
 	cold_protection = FEET
 	heat_protection = FEET
 	species_restricted = null
@@ -69,3 +70,38 @@
 				return 1
 
 	return 0
+
+//Rig pieces for non-spacesuit based rigs
+
+/obj/item/clothing/head/lightrig
+	name = "mask"
+	body_parts_covered = HEAD|FACE|EYES
+	heat_protection =    HEAD|FACE|EYES
+	cold_protection =    HEAD|FACE|EYES
+	flags =              THICKMATERIAL|AIRTIGHT
+
+/obj/item/clothing/suit/lightrig
+	name = "suit"
+	allowed = list(/obj/item/device/flashlight)
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	heat_protection =    UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	cold_protection =    UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+	flags_inv =          HIDEJUMPSUIT
+	flags =              THICKMATERIAL
+
+/obj/item/clothing/shoes/lightrig
+	name = "boots"
+	body_parts_covered = FEET
+	cold_protection = FEET
+	heat_protection = FEET
+	species_restricted = null
+	gender = PLURAL
+
+/obj/item/clothing/gloves/lightrig
+	name = "gloves"
+	flags = THICKMATERIAL
+	body_parts_covered = HANDS
+	heat_protection =    HANDS
+	cold_protection =    HANDS
+	species_restricted = null
+	gender = PLURAL

code/modules/clothing/spacesuits/rig/suits/light.dm

@@ -33,22 +33,43 @@
 /obj/item/weapon/rig/light/hacker
 	name = "cybersuit control module"
 	suit_type = "cyber"
-	desc = "An advanced powered armour suit with many cyberwarfare enhancements."
+	desc = "An advanced powered armour suit with many cyberwarfare enhancements. Comes with built-in insulated gloves for safely tampering with electronics."
 	icon_state = "hacker_rig"
 
 	req_access = list(access_syndicate)
 
-	helm_type = /obj/item/clothing/head/helmet/space/rig/mask
+	airtight = 0
+	seal_delay = 5 //not being vaccum-proof has an upside I guess
+	
+	helm_type = /obj/item/clothing/head/lightrig/hacker
+	chest_type = /obj/item/clothing/suit/lightrig/hacker
+	glove_type = /obj/item/clothing/gloves/lightrig/hacker
+	boot_type = /obj/item/clothing/shoes/lightrig/hacker
 
 	initial_modules = list(
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/power_sink,
-		/obj/item/rig_module/datajack
+		/obj/item/rig_module/datajack,
+		/obj/item/rig_module/electrowarfare_suite,
+		/obj/item/rig_module/voice,
+		/obj/item/rig_module/vision,
 		)
 
-/obj/item/clothing/head/helmet/space/rig/mask
+//The cybersuit is not space-proof. It does however, have good siemens_coefficient values
-	name = "mask"
+/obj/item/clothing/head/lightrig/hacker
-	flags = THICKMATERIAL
+	name = "HUD"
+	siemens_coefficient = 0.4
+	flags = 0
+
+/obj/item/clothing/suit/lightrig/hacker
+	siemens_coefficient = 0.4
+
+/obj/item/clothing/shoes/lightrig/hacker
+	siemens_coefficient = 0.4
+	flags = NOSLIP //All the other rigs have magboots anyways, hopefully gives the hacker suit something more going for it.
+
+/obj/item/clothing/gloves/lightrig/hacker
+	siemens_coefficient = 0
 
 /obj/item/weapon/rig/light/ninja
 	name = "ominous suit control module"
@@ -92,7 +113,7 @@
 	name = "stealth suit control module"
 	suit_type = "stealth"
 	desc = "A highly advanced and expensive suit designed for covert operations."
-	icon_state = "ninja_rig"
+	icon_state = "stealth_rig"
 
 	req_access = list(access_syndicate)
 

code/modules/mob/freelook/ai/eye.dm

@@ -27,23 +27,37 @@
 // The AI's "eye". Described on the top of the page.
 
 /mob/living/silicon/ai
-	eyeobj = new /mob/eye/aiEye()
 	var/obj/machinery/hologram/holopad/holo = null
 
+/mob/living/silicon/ai/proc/destroy_eyeobj(var/atom/new_eye)
+	if(!eyeobj) return
+	if(!new_eye)
+		new_eye = src
+	eyeobj.owner = null
+	qdel(eyeobj) // No AI, no Eye
+	eyeobj = null
+	if(client)
+		client.eye = new_eye
+
+/mob/living/silicon/ai/proc/create_eyeobj(var/newloc)
+	if(eyeobj) destroy_eyeobj()
+	if(!newloc) newloc = src.loc
+	eyeobj = PoolOrNew(/mob/eye/aiEye, newloc)
+	eyeobj.owner = src
+	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
+	if(client) client.eye = eyeobj
+	SetName(src.name)
+
 // Intiliaze the eye by assigning it's "ai" variable to us. Then set it's loc to us.
 /mob/living/silicon/ai/New()
 	..()
-	eyeobj.owner = src
+	create_eyeobj()
-	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 	spawn(5)
 		if(eyeobj)
 			eyeobj.loc = src.loc
 
 /mob/living/silicon/ai/Destroy()
-	if(eyeobj)
+	destroy_eyeobj()
-		eyeobj.owner = null
-		qdel(eyeobj) // No AI, no Eye
-		eyeobj = null
 	..()
 
 /atom/proc/move_camera_by_click()
@@ -53,23 +67,18 @@
 			AI.eyeobj.setLoc(src)
 
 // Return to the Core.
-
 /mob/living/silicon/ai/proc/core()
 	set category = "AI Commands"
 	set name = "AI Core"
 
 	view_core()
 
-
 /mob/living/silicon/ai/proc/view_core()
 	camera = null
 	unset_machine()
 
 	if(!src.eyeobj)
-		src << "ERROR: Eyeobj not found. Creating new eye..."
+		return
-		src.eyeobj = new(src.loc)
-		src.eyeobj.owner = src
-		src.SetName(src.name)
 
 	if(client && client.eye)
 		client.eye = src

code/modules/mob/language/generic.dm

@@ -25,7 +25,7 @@
 	speech_verb = "says"
 	whisper_verb = "whispers"
 	key = "0"
-	flags = RESTRICTED
+	flags = RESTRICTED | COMMON_VERBS
 	syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")
 
 //TODO flag certain languages to use the mob-type specific say_quote and then get rid of these.

code/modules/mob/living/say.dm

@@ -128,6 +128,7 @@ proc/get_radio_key_from_channel(var/channel)
 	return verb
 
 /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="")
+
 	if(client)
 		if(client.prefs.muted & MUTE_IC)
 			src << "\red You cannot speak in IC (Muted)."
@@ -165,7 +166,6 @@ proc/get_radio_key_from_channel(var/channel)
 	else
 		speaking = get_default_language()
 
-	var/ending = copytext(message, length(message))
 	if (speaking)
 		// This is broadcast to all mobs with the language,
 		// irrespective of distance or anything else.
@@ -173,9 +173,12 @@ proc/get_radio_key_from_channel(var/channel)
 			speaking.broadcast(src,trim(message))
 			return
 		//If we've gotten this far, keep going!
-		verb = speaking.get_spoken_verb(ending)
+		if(speaking.flags & COMMON_VERBS)
+			verb = say_quote(message)
+		else
+			verb = speaking.get_spoken_verb(copytext(message, length(message)))
 	else
-		verb = get_speech_ending(verb, ending)
+		verb = say_quote(message)
 
 	message = trim_left(message)
 

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

@@ -257,7 +257,7 @@
 	src << "<b>You are a maintenance drone, a tiny-brained robotic repair machine</b>."
 	src << "You have no individual will, no personality, and no drives or urges other than your laws."
 	src << "Remember,  you are <b>lawed against interference with the crew</b>. Also remember, <b>you DO NOT take orders from the AI.</b>"
-	src << "Use <b>:d</b> to talk to other drones and <b>say</b> to speak silently to your nearby fellows."
+	src << "Use <b>say ;Hello</b> to talk to other drones and <b>say Hello</b> to speak silently to your nearby fellows."
 
 /mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM)
 

code/modules/mob/living/silicon/robot/drone/drone_say.dm

@@ -0,0 +1,40 @@
+/mob/living/silicon/robot/drone/say(var/message)
+	if(local_transmit)
+		if (src.client)
+			if(client.prefs.muted & MUTE_IC)
+				src << "You cannot send IC messages (muted)."
+				return 0
+			if (src.client.handle_spam_prevention(message,MUTE_IC))
+				return 0
+
+		message = sanitize(message)
+
+		if (stat == 2)
+			return say_dead(message)
+
+		if(copytext(message,1,2) == "*")
+			return emote(copytext(message,2))
+
+		if(copytext(message,1,2) == ";")
+			var/datum/language/L = all_languages["Drone Talk"]
+			if(istype(L))
+				return L.broadcast(src,trim(copytext(message,2)))
+
+		//Must be concious to speak
+		if (stat)
+			return 0
+
+		var/list/listeners = hearers(5,src)
+		listeners |= src
+
+		for(var/mob/living/silicon/D in listeners)
+			if(D.client && D.local_transmit)
+				D << "<b>[src]</b> transmits, \"[message]\""
+
+		for (var/mob/M in player_list)
+			if (istype(M, /mob/new_player))
+				continue
+			else if(M.stat == 2 &&  M.client.prefs.toggles & CHAT_GHOSTEARS)
+				if(M.client) M << "<b>[src]</b> transmits, \"[message]\""
+		return 1
+	..(message)

code/modules/mob/living/silicon/say.dm

@@ -1,3 +1,35 @@
+/mob/living/silicon/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
+	log_say("[key_name(src)] : [message]")
+
+/mob/living/silicon/robot/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
+	..()
+	if(message_mode)
+		if(!is_component_functioning("radio"))
+			src << "<span class='warning'>Your radio isn't functional at this time.</span>"
+			return 0
+		if(message_mode == "general")
+			message_mode = null
+		return radio.talk_into(src,message,message_mode,verb,speaking)
+
+/mob/living/silicon/ai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
+	..()
+	if(message_mode == "department")
+		return holopad_talk(message, verb, speaking)
+	else if(message_mode)
+		if (aiRadio.disabledAi || aiRestorePowerRoutine || stat)
+			src << "<span class='danger'>System Error - Transceiver Disabled.</span>"
+			return 0
+		if(message_mode == "general")
+			message_mode = null
+		return aiRadio.talk_into(src,message,message_mode,verb,speaking)
+
+/mob/living/silicon/pai/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
+	..()
+	if(message_mode)
+		if(message_mode == "general")
+			message_mode = null
+		return radio.talk_into(src,message,message_mode,verb,speaking)
+
 /mob/living/silicon/say_quote(var/text)
 	var/ending = copytext(text, length(text))
 
@@ -23,131 +55,6 @@
 			return 1
 	return ..()
 
-/mob/living/silicon/say(var/message)
-	if (!message)
-		return 0
-
-	if (src.client)
-		if(client.prefs.muted & MUTE_IC)
-			src << "You cannot send IC messages (muted)."
-			return 0
-		if (src.client.handle_spam_prevention(message,MUTE_IC))
-			return 0
-
-	message = sanitize(message)
-
-	if (stat == 2)
-		return say_dead(message)
-
-	if(copytext(message,1,2) == "*")
-		return emote(copytext(message,2))
-
-	var/bot_type = 0			//Let's not do a fuck ton of type checks, thanks.
-	if(istype(src, /mob/living/silicon/ai))
-		bot_type = IS_AI
-	else if(istype(src, /mob/living/silicon/robot))
-		bot_type = IS_ROBOT
-	else if(istype(src, /mob/living/silicon/pai))
-		bot_type = IS_PAI
-
-	var/mob/living/silicon/ai/AI = src		//and let's not declare vars over and over and over for these guys.
-	var/mob/living/silicon/robot/R = src
-	var/mob/living/silicon/pai/P = src
-
-	//Must be concious to speak
-	if (stat)
-		return 0
-
-	var/verb = say_quote(message)
-
-	//parse radio key and consume it
-	var/message_mode = parse_message_mode(message, "general")
-	if (message_mode)
-		if (message_mode == "general")
-			message = trim(copytext(message,2))
-		else
-			message = trim(copytext(message,3))
-
-	//parse language key and consume it
-	var/datum/language/speaking = parse_language(message)
-	if (speaking)
-		verb = speaking.speech_verb
-		message = trim(copytext(message,2+length(speaking.key)))
-
-		if(speaking.flags & HIVEMIND)
-			speaking.broadcast(src,trim(message))
-			return 1
-
-	// Currently used by drones.
-	if(local_transmit)
-		var/list/listeners = hearers(5,src)
-		listeners |= src
-
-		for(var/mob/living/silicon/D in listeners)
-			if(D.client && istype(D,src.type))
-				D << "<b>[src]</b> transmits, \"[message]\""
-
-		for (var/mob/M in player_list)
-			if (istype(M, /mob/new_player))
-				continue
-			else if(M.stat == 2 &&  M.client.prefs.toggles & CHAT_GHOSTEARS)
-				if(M.client) M << "<b>[src]</b> transmits, \"[message]\""
-		return 1
-
-	if(message_mode && bot_type == IS_ROBOT && !R.is_component_functioning("radio"))
-		src << "\red Your radio isn't functional at this time."
-		return 0
-
-	switch(message_mode)
-		if("department")
-			switch(bot_type)
-				if(IS_AI)
-					return AI.holopad_talk(message, verb, speaking)
-				if(IS_ROBOT)
-					log_say("[key_name(src)] : [message]")
-					return R.radio.talk_into(src,message,message_mode,verb,speaking)
-				if(IS_PAI)
-					log_say("[key_name(src)] : [message]")
-					return P.radio.talk_into(src,message,message_mode,verb,speaking)
-			return 0
-
-		if("general")
-			switch(bot_type)
-				if(IS_AI)
-					if (AI.aiRadio.disabledAi || AI.aiRestorePowerRoutine || AI.stat)
-						src << "\red System Error - Transceiver Disabled"
-						return 0
-					else
-						log_say("[key_name(src)] : [message]")
-						return AI.aiRadio.talk_into(src,message,null,verb,speaking)
-				if(IS_ROBOT)
-					log_say("[key_name(src)] : [message]")
-					return R.radio.talk_into(src,message,null,verb,speaking)
-				if(IS_PAI)
-					log_say("[key_name(src)] : [message]")
-					return P.radio.talk_into(src,message,null,verb,speaking)
-			return 0
-
-		else
-			if(message_mode)
-				switch(bot_type)
-					if(IS_AI)
-						if (AI.aiRadio.disabledAi || AI.aiRestorePowerRoutine || AI.stat)
-							src << "\red System Error - Transceiver Disabled"
-							return 0
-						else
-							log_say("[key_name(src)] : [message]")
-							return AI.aiRadio.talk_into(src,message,message_mode,verb,speaking)
-					if(IS_ROBOT)
-						log_say("[key_name(src)] : [message]")
-						return R.radio.talk_into(src,message,message_mode,verb,speaking)
-					if(IS_PAI)
-						log_say("[key_name(src)] : [message]")
-						return P.radio.talk_into(src,message,message_mode,verb,speaking)
-				return 0
-
-	return ..(message,speaking,verb)
-
 //For holopads only. Usable by AI.
 /mob/living/silicon/ai/proc/holopad_talk(var/message, verb, datum/language/speaking)
 

code/modules/mob/new_player/new_player.dm

@@ -5,7 +5,6 @@
 	var/spawning = 0//Referenced when you want to delete the new_player later on in the code.
 	var/totalPlayers = 0		 //Player counts for the Lobby tab
 	var/totalPlayersReady = 0
-
 	universal_speak = 1
 
 	invisibility = 101
@@ -134,8 +133,6 @@
 
 				if(client.prefs.be_random_name)
 					client.prefs.real_name = random_name(client.prefs.gender)
-				if(client.prefs.dummy)
-					qdel(client.prefs.dummy)
 				observer.real_name = client.prefs.real_name
 				observer.name = observer.real_name
 				if(!client.holder && !config.antag_hud_allowed)           // For new ghosts we remove the verb from even showing up if it's not allowed.
@@ -455,8 +452,7 @@
 			client.prefs.randomize_appearance_for(new_character)
 		else
 			client.prefs.copy_to(new_character)
-		if(client.prefs.dummy)
+
-			qdel(client.prefs.dummy)
 		src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
 
 		if(mind)

code/modules/mob/new_player/preferences_setup.dm

@@ -178,46 +178,519 @@ datum/preferences
 		b_skin = blue
 
 
-	proc/update_preview_icon()		//seriously. This is horrendous. //less so now
+	proc/update_preview_icon()		//seriously. This is horrendous.
-		if(!dummy)
+		qdel(preview_icon_front)
-			dummy = new(null, species)
+		qdel(preview_icon_side)
-		dummy.set_species(species)
+		qdel(preview_icon)
-		dummy.flags |= GODMODE
+
-		copy_to(dummy)
+		var/g = "m"
-		for (var/obj/item/I in dummy)
+		if(gender == FEMALE)	g = "f"
-			dummy.drop_from_inventory(I)
+
-			if(I.loc != dummy)
+		var/icon/icobase
-				qdel(I)
+		var/datum/species/current_species = all_species[species]
-		var/jobflag
+
-		var/dept
+		if(current_species)
-		if (job_civilian_low & ASSISTANT)
+			icobase = current_species.icobase
-			jobflag = job_civilian_low
+		else
-			dept = CIVILIAN
+			icobase = 'icons/mob/human_races/r_human.dmi'
-		else if(job_civilian_high)
+
-			jobflag = job_civilian_high
+		preview_icon = new /icon(icobase, "torso_[g]")
-			dept = CIVILIAN
+		preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
-		else if (job_medsci_high)
+		preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
-			jobflag = job_medsci_high
+
-			dept = MEDSCI
+		for(var/name in list("r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","l_arm","l_hand"))
-		else if (job_engsec_high)
+			if(organ_data[name] == "amputated") continue
-			jobflag = job_engsec_high
+			if(organ_data[name] == "cyborg")
-			dept = ENGSEC
+				var/datum/robolimb/R
-		if(jobflag && dept && job_master)
+				if(rlimb_data[name]) R = all_robolimbs[rlimb_data[name]]
-			for (var/datum/job/J in job_master.occupations)
+				if(!R) R = basic_robolimb
-				if((J.department_flag & dept) && (J.flag & jobflag))
+				preview_icon.Blend(icon(R.icon, "[name]"), ICON_OVERLAY) // This doesn't check gendered_icon. Not an issue while only limbs can be robotic.
-					var/alt = GetPlayerAltTitle(J)
+				continue
-					if(alt)	//more hacks
+			preview_icon.Blend(new /icon(icobase, "[name]"), ICON_OVERLAY)
-						if(!dummy.mind)
+
-							dummy.mind = new
+		//Tail
-						dummy.mind.role_alt_title = alt
+		if(current_species && (current_species.tail))
-					J.equip_preview(dummy)
+			var/icon/temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[current_species.tail]_s")
-					break
+			preview_icon.Blend(temp, ICON_OVERLAY)
-		dummy.update_eyes()
+
-		dummy.force_update_limbs()
+		// Skin color
-		dummy.regenerate_icons()
+		if(current_species && (current_species.flags & HAS_SKIN_COLOR))
-		preview_icon = icon(dummy.icon)
+			preview_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
-		for(var/image/I in dummy.overlays_standing)
+
-			if(I && I.icon)
+		// Skin tone
-				preview_icon.Blend(icon(I.icon, I.icon_state), ICON_OVERLAY)
+		if(current_species && (current_species.flags & HAS_SKIN_TONE))
+			if (s_tone >= 0)
+				preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
+			else
+				preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
+
+		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
+		if ((current_species && (current_species.flags & HAS_EYE_COLOR)))
+			eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+
+		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
+		if(hair_style)
+			var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
+			hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+			eyes_s.Blend(hair_s, ICON_OVERLAY)
+
+		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
+		if(facial_hair_style)
+			var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+			eyes_s.Blend(facial_s, ICON_OVERLAY)
+
+		var/icon/underwear_s = null
+		if(underwear && current_species.flags & HAS_UNDERWEAR)
+			underwear_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = underwear)
+
+		var/icon/undershirt_s = null
+		if(undershirt && current_species.flags & HAS_UNDERWEAR)
+			undershirt_s = new/icon("icon" = 'icons/mob/human.dmi', "icon_state" = undershirt)
+
+		var/icon/clothes_s = null
+		if(job_civilian_low & ASSISTANT)//This gives the preview icon clothes depending on which job(if any) is set to 'high'
+			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+			if(backbag == 2)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+			else if(backbag == 3 || backbag == 4)
+				clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_civilian_high)//I hate how this looks, but there's no reason to go through this switch if it's empty
+			switch(job_civilian_high)
+				if(HOP)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hop_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "ianshirt"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BARTENDER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "ba_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "tophat"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(BOTANIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hydroponics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "ggloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apron"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "nymph"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-hyd"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEF)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chef_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "chefhat"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "apronchef"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(JANITOR)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "janitor_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_janitor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LIBRARIAN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "red_suit_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hairflower"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(QUARTERMASTER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "qm_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "poncho"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CARGOTECH)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "cargotech_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "flat_cap"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(MINER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "miner_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "bearpelt"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(LAWYER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "internalaffairs_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "briefcase"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suitjacket_blue"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHAPLAIN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chapblack_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "imperium_monk"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CLOWN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "clown_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "clown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "clown"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/back.dmi', "clownpack"), ICON_OVERLAY)
+				if(MIME)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "mime_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "lgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "mime"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "beret"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "suspenders"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_medsci_high)
+			switch(job_medsci_high)
+				if(RD)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "director_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "petehat"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(SCIENTIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(XENOBIOLOGIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "sciencewhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_tox_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "metroid"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-tox"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHEMIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chemistrywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labgreen"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_chem_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-chem"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CMO)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "cmo_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "bio_cmo"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_cmo_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DOCTOR)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "medical_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "surgeon"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(GENETICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "monkeysuit"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_gen_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-gen"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(VIROLOGIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/mask.dmi', "sterile"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "plaguedoctor"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "medicalpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-vir"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ROBOTICIST)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "robotics_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_open"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "toolbox_blue"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		else if(job_engsec_high)
+			switch(job_engsec_high)
+				if(CAPTAIN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "centcomcaptain"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "captain"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-cap"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(HOS)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "hosred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "hosberet"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(WARDEN)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "warden_s")
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "slippers_worn"), ICON_OVERLAY)
+					else
+						clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(DETECTIVE)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "detective_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/mask.dmi', "cigaron"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "detective"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "detective"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(OFFICER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "secred_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/head.dmi', "officerberet"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "securitypack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-sec"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CHIEF)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "chief_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_white"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon(INV_R_HAND_DEF_ICON, "blueprints"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ENGINEER)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "engine_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "orange"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "hardhat0_yellow"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "hazard"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "engiepack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-eng"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(ATMOSTECH)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "atmos_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/hands.dmi', "bgloves"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/belt.dmi', "utility"), ICON_OVERLAY)
+					if(prob(1))
+						clothes_s.Blend(new /icon('icons/mob/suit.dmi', "firesuit"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+				if(AI)//Gives AI and borgs assistant-wear, so they can still customize their character
+					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "straight_jacket"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(CYBORG)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "cardborg"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/head.dmi', "cardborg_h"), ICON_OVERLAY)
+					if(backbag == 2)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY)
+					else if(backbag == 3 || backbag == 4)
+						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+
+		if(disabilities & NEARSIGHTED)
+			preview_icon.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
+
+		preview_icon.Blend(eyes_s, ICON_OVERLAY)
+		if(underwear_s)
+			preview_icon.Blend(underwear_s, ICON_OVERLAY)
+		if(undershirt_s)
+			preview_icon.Blend(undershirt_s, ICON_OVERLAY)
+		if(clothes_s)
+			preview_icon.Blend(clothes_s, ICON_OVERLAY)
 		preview_icon_front = new(preview_icon, dir = SOUTH)
-		preview_icon_side = new(preview_icon, dir = WEST)
+		preview_icon_side = new(preview_icon, dir = WEST)
+
+		qdel(eyes_s)
+		qdel(underwear_s)
+		qdel(undershirt_s)
+		qdel(clothes_s)