Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm

code/modules/mob/dead/observer/say.dm

@@ -18,7 +18,7 @@
 
 
 /mob/dead/observer/emote(var/act, var/type, var/message)
-	message = sanitize(message)
+	//message = sanitize(message) - already sanitized in verb/me_verb()
 
 	if(!message)
 		return

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

@@ -2,8 +2,6 @@
 //
 // The datum containing all the chunks.
 
-var/datum/visualnet/camera/cameranet = new()
-
 /datum/visualnet/camera
 	// The cameras on the map, no matter if they work or not. Updated in obj/machinery/camera.dm by New() and Del().
 	var/list/cameras = list()

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

@@ -36,11 +36,13 @@
 	eyeobj.owner = src
 	eyeobj.name = "[src.name] (AI Eye)" // Give it a name
 	spawn(5)
-		eyeobj.loc = src.loc
+		if(eyeobj)
+			eyeobj.loc = src.loc
 
 /mob/living/silicon/ai/Del()
-	eyeobj.owner = null
-	del(eyeobj) // No AI, no Eye
+	if(eyeobj)
+		eyeobj.owner = null
+		del(eyeobj) // No AI, no Eye
 	..()
 
 /atom/proc/move_camera_by_click()

code/modules/mob/freelook/chunk.dm

@@ -101,7 +101,7 @@
 		var/turf/t = turf
 		if(obscuredTurfs[t])
 			if(!t.obfuscations[obfuscation.type])
-				t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, 15)
+				t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER)
 
 			obscured += t.obfuscations[obfuscation.type]
 			for(var/eye in seenby)
@@ -140,7 +140,7 @@
 	for(var/turf in obscuredTurfs)
 		var/turf/t = turf
 		if(!t.obfuscations[obfuscation.type])
-			t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, 15)
+			t.obfuscations[obfuscation.type] = image(obfuscation.icon, t, obfuscation.icon_state, OBFUSCATION_LAYER)
 		obscured += t.obfuscations[obfuscation.type]
 
 #undef UPDATE_BUFFER

code/modules/mob/freelook/eye.dm

@@ -12,6 +12,7 @@
 	var/sprint = 10
 	var/cooldown = 0
 	var/acceleration = 1
+	var/owner_follows_eye = 0
 
 	see_in_dark = 7
 	status_flags = GODMODE
@@ -35,12 +36,14 @@ mob/eye/Del()
 		ghost_darkness_images -= ghostimage
 		ghost_sightless_images -= ghostimage
 		del(ghostimage)
-		ghostimage = null;
+		ghostimage = null
 		updateallghostimages()
 	..()
 
 // Movement code. Returns 0 to stop air movement from moving it.
-/mob/eye/Move()
+/mob/eye/Move(n, direct)
+	if(owner == src)
+		EyeMove(n, direct)
 	return 0
 
 /mob/eye/examinate()
@@ -60,15 +63,35 @@ mob/eye/Del()
 /mob/eye/proc/setLoc(var/T)
 	if(owner)
 		T = get_turf(T)
-		loc = T
+		if(T != loc)
+			loc = T
 
-		if(owner.client)
-			owner.client.eye = src
+			if(owner.client)
+				owner.client.eye = src
 
-		visualnet.visibility(src)
-		return 1
+			if(owner_follows_eye)
+				visualnet.updateVisibility(owner, 0)
+				owner.loc = loc
+				visualnet.updateVisibility(owner, 0)
+
+			visualnet.visibility(src)
+			return 1
 	return 0
 
+/mob/eye/proc/getLoc()
+	if(owner)
+		if(!isturf(owner.loc) || !owner.client)
+			return
+		return loc
+/mob
+	var/mob/eye/eyeobj
+
+/mob/proc/EyeMove(n, direct)
+	if(!eyeobj)
+		return
+
+	return eyeobj.EyeMove(n, direct)
+
 /mob/eye/EyeMove(n, direct)
 	var/initial = initial(sprint)
 	var/max_sprint = 50
@@ -86,18 +109,3 @@ mob/eye/Del()
 		sprint = min(sprint + 0.5, max_sprint)
 	else
 		sprint = initial
-
-/mob/eye/proc/getLoc()
-	if(owner)
-		if(!isturf(owner.loc) || !owner.client)
-			return
-		return loc
-
-/mob
-	var/mob/eye/eyeobj
-
-/mob/proc/EyeMove(n, direct)
-	if(!eyeobj)
-		return
-
-	return eyeobj.EyeMove(n, direct)

code/modules/mob/freelook/life.dm

@@ -0,0 +1,7 @@
+/mob/eye/Life()
+	..()
+	// If we lost our client, reset the list of visible chunks so they update properly on return
+	if(owner == src && !client)
+		visibleChunks.Cut()
+	/*else if(owner && !owner.client)
+		visibleChunks.Cut()*/

code/modules/mob/freelook/mask/chunk.dm

@@ -0,0 +1,39 @@
+// CULT CHUNK
+//
+// A 16x16 grid of the map with a list of turfs that can be seen, are visible and are dimmed.
+// Allows the Eye to stream these chunks and know what it can and cannot see.
+
+/datum/obfuscation/cult
+	icon_state = "white"
+
+/datum/chunk/cult
+	obfuscation = new /datum/obfuscation/cult()
+
+/datum/chunk/cult/acquireVisibleTurfs(var/list/visible)
+	for(var/mob/living/L in living_mob_list)
+		for(var/turf/t in L.seen_turfs())
+			visible[t] = t
+
+/mob/living/proc/seen_turfs()
+	return seen_turfs_in_range(src, 3)
+
+/mob/living/carbon/human/seen_turfs()
+	/*if(src.isSynthetic())
+		return list()*/
+
+	if(mind in cult.current_antagonists)
+		return seen_turfs_in_range(src, client ? client.view : 7)
+	return ..()
+
+/mob/living/silicon/seen_turfs()
+	return list()
+
+/mob/living/simple_animal/seen_turfs()
+	return seen_turfs_in_range(src, 1)
+
+/mob/living/simple_animal/shade/narsie/seen_turfs()
+	return view(2, src)
+
+/proc/seen_turfs_in_range(var/source, var/range)
+	var/turf/pos = get_turf(source)
+	return hear(range, pos)

code/modules/mob/freelook/mask/cultnet.dm

@@ -0,0 +1,15 @@
+// CULT NET
+//
+// The datum containing all the chunks.
+
+/datum/visualnet/cult
+	chunk_type = /datum/chunk/cult
+
+/datum/visualnet/cult/proc/provides_vision(var/mob/living/L)
+	return L.provides_cult_vision()
+
+/mob/living/proc/provides_cult_vision()
+	return 1
+
+/mob/living/silicon/provides_cult_vision()
+	return 0

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

@@ -0,0 +1,13 @@
+// MASK EYE
+//
+// A mob that a cultists controls to look around the station with.
+// It streams chunks as it moves around, which will show it what the cultist can and cannot see.
+
+/mob/eye/maskEye
+	name = "Eye of Nar-Sie"
+	acceleration = 0
+	owner_follows_eye = 1
+
+/mob/eye/maskEye/New()
+	..()
+	visualnet = cultnet

code/modules/mob/freelook/mask/update_triggers.dm

@@ -0,0 +1,50 @@
+//UPDATE TRIGGERS, when the chunk (and the surrounding chunks) should update.
+
+#define CULT_UPDATE_BUFFER 30
+
+/mob/living/var/updating_cult_vision = 0
+
+/mob/living/Move()
+	var/oldLoc = src.loc
+	. = ..()
+	if(.)
+		if(cultnet.provides_vision(src))
+			if(!updating_cult_vision)
+				updating_cult_vision = 1
+				spawn(CULT_UPDATE_BUFFER)
+					if(oldLoc != src.loc)
+						cultnet.updateVisibility(oldLoc, 0)
+						cultnet.updateVisibility(loc, 0)
+					updating_cult_vision = 0
+
+#undef CULT_UPDATE_BUFFER
+
+/mob/living/New()
+	..()
+	cultnet.updateVisibility(src, 0)
+
+/mob/living/Del()
+	cultnet.updateVisibility(src, 0)
+	..()
+
+/mob/living/rejuvenate()
+	var/was_dead = stat == DEAD
+	..()
+	if(was_dead && stat != DEAD)
+		// Arise!
+		cultnet.updateVisibility(src, 0)
+
+/mob/living/death()
+	if(..())
+		// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
+		cultnet.updateVisibility(src)
+
+/datum/antagonist/add_antagonist(var/datum/mind/player)
+	..()
+	if(src == cult)
+		cultnet.updateVisibility(player.current, 0)
+
+/datum/antagonist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
+	..()
+	if(src == cult)
+		cultnet.updateVisibility(player.current, 0)

code/modules/mob/freelook/visualnet.dm

@@ -2,8 +2,6 @@
 //
 // The datum containing all the chunks.
 
-var/global/list/visual_nets = new()
-
 /datum/visualnet
 	// The chunks of the map, mapping the areas that an object can see.
 	var/list/chunks = list()

code/modules/mob/language/language.dm

@@ -134,6 +134,12 @@
 	. = (L in languages)
 	languages.Remove(L)
 
+/mob/living/remove_language(rem_language)
+	var/datum/language/L = all_languages[rem_language]
+	if(default_language == L)
+		default_language = null
+	return ..()
+
 // Can we speak this language, as opposed to just understanding it?
 /mob/proc/can_speak(datum/language/speaking)
 
@@ -154,4 +160,32 @@
 	src << browse(dat, "window=checklanguage")
 	return
 
+/mob/living/check_languages()
+	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
+
+	if(default_language)
+		dat += "Current default language: [default_language] - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/><br/>"
+
+	for(var/datum/language/L in languages)
+		if(!(L.flags & NONGLOBAL))
+			if(L == default_language)
+				dat += "<b>[L.name] (:[L.key])</b> - default - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/>[L.desc]<br/><br/>"
+			else
+				dat += "<b>[L.name] (:[L.key])</b> - <a href='byond://?src=\ref[src];default_lang=[L]'>set default</a><br/>[L.desc]<br/><br/>"
+
+	src << browse(dat, "window=checklanguage")
+
+/mob/living/Topic(href, href_list)
+	if(href_list["default_lang"])
+		if(href_list["default_lang"] == "reset")
+			set_default_language(null)
+		else
+			var/datum/language/L = all_languages[href_list["default_lang"]]
+			if(L)
+				set_default_language(L)
+		check_languages()
+		return 1
+	else
+		return ..()
+
 #undef SCRAMBLE_CACHE_LEN

code/modules/mob/living/carbon/brain/say.dm

@@ -3,6 +3,8 @@
 	if (silent)
 		return
 
+	message = sanitize(message)
+
 	if(!(container && istype(container, /obj/item/device/mmi)))
 		return //No MMI, can't speak, bucko./N
 	else

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

@@ -456,6 +456,9 @@
 	return 1
 
 /mob/living/carbon/get_default_language()
+	if(default_language)
+		return default_language
+
 	if(!species)
 		return null
 	return species.default_language ? all_languages[species.default_language] : null

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

@@ -1,7 +1,7 @@
-/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())
+/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/obj/nano_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist)
 	AC.flags = flags
-	AC.ui_interact(user)
+	AC.ui_interact(user, state = state)
 
 /mob/living/carbon/human/proc/change_species(var/new_species)
 	if(!new_species)

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

@@ -74,7 +74,7 @@
 
 	mutations.Add(HUSK)
 	status_flags |= DISFIGURED	//makes them unknown without fucking up other stuff like admintools
-	update_body(0)
+	update_body(1)
 	return
 
 /mob/living/carbon/human/proc/Drain()

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

@@ -21,7 +21,10 @@
 			set_species()
 
 	if(species)
-		name = species.get_random_name(gender)
+		real_name = species.get_random_name(gender)
+		name = real_name
+		if(mind)
+			mind.name = real_name
 
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
@@ -863,11 +866,11 @@
 	var/list/creatures = list()
 	for(var/mob/living/carbon/h in world)
 		creatures += h
-	var/mob/target = input ("Who do you want to project your mind to ?") as null|anything in creatures
+	var/mob/target = input("Who do you want to project your mind to ?") as null|anything in creatures
 	if (isnull(target))
 		return
 
-	var/say = input ("What do you wish to say")
+	var/say = sanitize(input("What do you wish to say"))
 	if(mRemotetalk in target.mutations)
 		target.show_message("\blue You hear [src.real_name]'s voice: [say]")
 	else
@@ -926,23 +929,12 @@
 		germ_level += n
 
 /mob/living/carbon/human/revive()
-	for (var/obj/item/organ/external/O in organs)
-		O.status &= ~ORGAN_BROKEN
-		O.status &= ~ORGAN_BLEEDING
-		O.status &= ~ORGAN_SPLINTED
-		O.status &= ~ORGAN_CUT_AWAY
-		O.status &= ~ORGAN_ATTACHABLE
-		O.wounds.Cut()
-		O.heal_damage(1000,1000,1,1)
-
-	var/obj/item/organ/external/head/h = organs_by_name["head"]
-	h.disfigured = 0
 
 	if(species && !(species.flags & NO_BLOOD))
 		vessel.add_reagent("blood",560-vessel.total_volume)
 		fixblood()
 
-	// Fix up any missing organs.
+	// Fix up all organs.
 	// This will ignore any prosthetics in the prefs currently.
 	species.create_organs(src)
 
@@ -954,11 +946,9 @@
 						H.brainmob.mind.transfer_to(src)
 						del(H)
 
-	for(var/obj/item/organ/I in internal_organs)
-		I.damage = 0
-
 	for (var/datum/disease/virus in viruses)
 		virus.cure()
+
 	for (var/ID in virus2)
 		var/datum/disease2/disease/V = virus2[ID]
 		V.cure(src)
@@ -1368,4 +1358,4 @@
 /mob/living/carbon/human/drop_from_inventory(var/obj/item/W, var/atom/Target = null)
 	if(W in organs)
 		return
-	..()
+	..()

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

@@ -100,9 +100,9 @@
 			var/hit_zone = H.zone_sel.selecting
 			var/obj/item/organ/external/affecting = get_organ(hit_zone)
 
-			if(!affecting || affecting.status & ORGAN_DESTROYED)
+			if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED))
 				M << "<span class='danger'>They are missing that limb!</span>"
-				return
+				return 1
 
 			switch(src.a_intent)
 				if(I_HELP)
@@ -218,7 +218,7 @@
 
 			//See if they have any guns that might go off
 			for(var/obj/item/weapon/gun/W in holding)
-				if(W && prob(holding[W]))
+				if(W && prob(holding[W]))
 					var/list/turfs = list()
 					for(var/turf/T in view())
 						turfs += T
@@ -289,7 +289,7 @@
 	if(!target_zone)
 		return null
 	var/obj/item/organ/external/organ = get_organ(check_zone(target_zone))
-	if(!organ || organ.is_dislocated() || organ.dislocated == -1)
+	if(!organ || (organ.dislocated == 2) || (organ.dislocated == -1))
 		return null
 	var/dislocation_str
 	if(prob(W.force))

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

@@ -1,7 +1,7 @@
 /mob/living/carbon/human/proc/update_eyes()
-	if(internal_organs_by_name["eyes"])
-		var/obj/item/organ/eyes/eyes = internal_organs_by_name["eyes"]
-		eyes.eye_colour = list(r_eyes,g_eyes,b_eyes)
+	var/obj/item/organ/eyes/eyes = internal_organs_by_name["eyes"]
+	if(eyes)
+		eyes.update_colour()
 		regenerate_icons()
 
 /mob/living/carbon/var/list/internal_organs = list()
@@ -70,12 +70,12 @@
 
 	for(var/limb_tag in list("l_leg","r_leg","l_foot","r_foot"))
 		var/obj/item/organ/external/E = organs_by_name[limb_tag]
-		if(!E)
-			stance_damage += 2
-		else if (E.status & ORGAN_DESTROYED)
+		if(!E || (E.status & (ORGAN_DESTROYED|ORGAN_DEAD)))
 			stance_damage += 2 // let it fail even if just foot&leg
 		else if (E.is_malfunctioning() || E.is_broken() || !E.is_usable())
 			stance_damage += 1
+		else if (E.is_dislocated())
+			stance_damage += 0.5
 
 	// Canes and crutches help you stand (if the latter is ever added)
 	// One cane mitigates a broken leg+foot, or a missing foot.
@@ -102,10 +102,14 @@
 		if(!E || !E.can_grasp || (E.status & ORGAN_SPLINTED))
 			continue
 
-		if(E.is_broken())
+		if(E.is_broken() || E.is_dislocated())
 			if(E.body_part == HAND_LEFT)
+				if(!l_hand)
+					continue
 				drop_from_inventory(l_hand)
 			else
+				if(!r_hand)
+					continue
 				drop_from_inventory(r_hand)
 
 			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")

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

@@ -389,7 +389,7 @@
 		// Lung damage increases the minimum safe pressure.
 		if(species.has_organ["lungs"])
 			var/obj/item/organ/lungs/L = internal_organs_by_name["lungs"]
-			if(!L)
+			if(isnull(L))
 				safe_pressure_min = INFINITY //No lungs, how are you breathing?
 			else if(L.is_broken())
 				safe_pressure_min *= 1.5

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -30,7 +30,7 @@
 	poison_type = "oxygen"
 	siemens_coefficient = 0.2
 
-	flags = IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
+	flags = CAN_JOIN | IS_WHITELISTED | NO_SCAN | HAS_EYE_COLOR
 
 	blood_color = "#2299FC"
 	flesh_color = "#808D11"
@@ -47,8 +47,7 @@
 		"liver" =    /obj/item/organ/liver,
 		"kidneys" =  /obj/item/organ/kidneys,
 		"brain" =    /obj/item/organ/brain,
-		"eyes" =     /obj/item/organ/eyes,
-		"stack" =    /obj/item/organ/stack/vox
+		"eyes" =     /obj/item/organ/eyes
 		)
 
 /datum/species/vox/get_random_name(var/gender)

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

@@ -168,6 +168,10 @@
 
 /datum/species/proc/get_random_name(var/gender)
 	var/datum/language/species_language = all_languages[language]
+	if(!species_language)
+		species_language = all_languages[default_language]
+	if(!species_language)
+		return "unknown"
 	return species_language.get_random_name(gender)
 
 /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.

code/modules/mob/living/carbon/human/species/station/monkey.dm

@@ -45,11 +45,8 @@
 	if(prob(1))
 		H.emote(pick("scratch","jump","roll","tail"))
 
-/datum/species/monkey/handle_post_spawn(var/mob/living/carbon/human/H)
-	H.real_name = "[lowertext(name)] ([rand(100,999)])"
-	H.name = H.real_name
-
-	..()
+/datum/species/monkey/get_random_name()
+	return "[lowertext(name)] ([rand(100,999)])"
 
 /datum/species/monkey/tajaran
 	name = "Farwa"

code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm

@@ -61,6 +61,9 @@
 	var/weeds_heal_rate = 1     // Health regen on weeds.
 	var/weeds_plasma_rate = 5   // Plasma regen on weeds.
 
+/datum/species/xenos/get_random_name()
+	return "alien [caste_name] ([alien_number])"
+
 /datum/species/xenos/can_understand(var/mob/other)
 
 	if(istype(other,/mob/living/carbon/alien/larva))

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

@@ -41,12 +41,12 @@
 				if (target.l_hand)
 					// Disarm left hand
 					//Urist McAssistant dropped the macguffin with a scream just sounds odd. Plus it doesn't work with NO_PAIN
-					target.visible_message("<span class='danger'>\The [target.l_hand] was knocked right out of [src]'s grasp!</span>")
+					target.visible_message("<span class='danger'>\The [target.l_hand] was knocked right out of [target]'s grasp!</span>")
 					target.drop_l_hand()
 			if("r_arm", "r_hand")
 				if (target.r_hand)
 					// Disarm right hand
-					target.visible_message("<span class='danger'>\The [target.r_hand] was knocked right out of [src]'s grasp!</span>")
+					target.visible_message("<span class='danger'>\The [target.r_hand] was knocked right out of [target]'s grasp!</span>")
 					target.drop_r_hand()
 			if("chest")
 				if(!target.lying)

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

@@ -237,24 +237,30 @@ var/global/list/damage_icon_parts = list()
 
 	//CACHING: Generate an index key from visible bodyparts.
 	//0 = destroyed, 1 = normal, 2 = robotic, 3 = necrotic.
-
 	//Create a new, blank icon for our mob to use.
 	if(stand_icon)
 		del(stand_icon)
 	stand_icon = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi',"blank")
+	var/icon_key = "[species.race_key][g][s_tone][r_skin][g_skin][b_skin]"
+	var/obj/item/organ/eyes/eyes = internal_organs_by_name["eyes"]
 
-	var/icon_key = "[species.race_key][g][s_tone]"
-	for(var/obj/item/organ/external/part in organs)
-		if(part.is_stump() || (part.status & ORGAN_DESTROYED))
-			icon_key = "[icon_key]0"
+	if(eyes)
+		icon_key += "[rgb(eyes.eye_colour[1], eyes.eye_colour[2], eyes.eye_colour[3])]"
+	else
+		icon_key += "#000000"
+
+	for(var/organ_tag in species.has_limbs)
+		var/obj/item/organ/external/part = organs_by_name[organ_tag]
+		if(isnull(part) || part.is_stump() || (part.status & ORGAN_DESTROYED))
+			icon_key += "0"
 		else if(part.status & ORGAN_ROBOT)
-			icon_key = "[icon_key]2[part.model ? "-[part.model]": ""]"
+			icon_key += "2[part.model ? "-[part.model]": ""]"
 		else if(part.status & ORGAN_DEAD)
-			icon_key = "[icon_key]3"
+			icon_key += "3"
 		else
-			icon_key = "[icon_key]1"
+			icon_key += "1"
 
-	icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0][s_tone]"
+	icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]"
 
 	var/icon/base_icon
 	if(human_icon_cache[icon_key])
@@ -784,11 +790,11 @@ var/global/list/damage_icon_parts = list()
 /mob/living/carbon/human/update_inv_r_hand(var/update_icons=1)
 	if(r_hand)
 		r_hand.screen_loc = ui_rhand	//TODO
-		
+
 		var/t_icon = INV_R_HAND_DEF_ICON
 		if(r_hand.item_icons && (icon_r_hand in r_hand.item_icons))
 			t_icon = r_hand.item_icons[icon_r_hand]
-		
+
 		var/t_state = r_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand
 		if(!t_state)	t_state = r_hand.icon_state
 		if(r_hand.icon_override)
@@ -800,18 +806,18 @@ var/global/list/damage_icon_parts = list()
 		if (handcuffed) drop_r_hand()
 	else
 		overlays_standing[R_HAND_LAYER] = null
-	
+
 	if(update_icons) update_icons()
 
 
 /mob/living/carbon/human/update_inv_l_hand(var/update_icons=1)
 	if(l_hand)
 		l_hand.screen_loc = ui_lhand	//TODO
-		
+
 		var/t_icon = INV_L_HAND_DEF_ICON
 		if(l_hand.item_icons && (icon_l_hand in l_hand.item_icons))
 			t_icon = l_hand.item_icons[icon_l_hand]
-		
+
 		var/t_state = l_hand.item_state //useful for clothing that changes icon_state but retains the same sprite on the mob when held in hand
 		if(!t_state)	t_state = l_hand.icon_state
 		if(l_hand.icon_override)
@@ -823,7 +829,7 @@ var/global/list/damage_icon_parts = list()
 		if (handcuffed) drop_l_hand()
 	else
 		overlays_standing[L_HAND_LAYER] = null
-	
+
 	if(update_icons) update_icons()
 
 /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1)

code/modules/mob/living/carbon/metroid/death.dm

@@ -10,14 +10,13 @@
 		is_adult = 0
 		maxHealth = 150
 		revive()
-		regenerate_icons()
 		if (!client) rabid = 1
 		number = rand(1, 1000)
 		name = "[colour] [is_adult ? "adult" : "baby"] slime ([number])"
 		return
 
 	. = ..(gibbed, "seizes up and falls limp...")
-
+	mood = null
 	regenerate_icons()
 
 	return

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -71,6 +71,7 @@
 	mutation_chance = rand(25, 35)
 	var/sanitizedcolour = replacetext(colour, " ", "")
 	coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
+	regenerate_icons()
 	..(location)
 
 /mob/living/carbon/slime/movement_delay()

code/modules/mob/living/carbon/metroid/say.dm

@@ -1,4 +1,7 @@
 /mob/living/carbon/slime/say(var/message)
+
+	message = sanitize(message)
+
 	var/verb = say_quote(message)
 
 	if(copytext(message,1,2) == "*")

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -1,141 +0,0 @@
-//Monkey Overlays Indexes////////
-#define M_MASK_LAYER			1
-#define M_BACK_LAYER			2
-#define M_HANDCUFF_LAYER		3
-#define M_L_HAND_LAYER			4
-#define M_R_HAND_LAYER			5
-#define TARGETED_LAYER			6
-#define M_FIRE_LAYER			6
-#define M_TOTAL_LAYERS			7
-/////////////////////////////////
-
-/mob/living/carbon/monkey
-	var/list/overlays_lying[M_TOTAL_LAYERS]
-	var/list/overlays_standing[M_TOTAL_LAYERS]
-
-/mob/living/carbon/monkey/regenerate_icons()
-	..()
-	update_inv_wear_mask(0)
-	update_inv_back(0)
-	update_inv_r_hand(0)
-	update_inv_l_hand(0)
-	update_inv_handcuffed(0)
-	update_fire(0)
-	update_icons()
-	//Hud Stuff
-	update_hud()
-	return
-
-/mob/living/carbon/monkey/update_icons()
-	update_hud()
-	lying_prev = lying	//so we don't update overlays for lying/standing unless our stance changes again
-	overlays.Cut()
-	for(var/image/I in overlays_standing)
-		overlays += I
-
-	if(lying)
-		var/matrix/M = matrix()
-		M.Turn(90)
-		M.Translate(1,-6)
-		src.transform = M
-	else
-		var/matrix/M = matrix()
-		src.transform = M
-
-
-////////
-/mob/living/carbon/monkey/update_inv_wear_mask(var/update_icons=1)
-	if( wear_mask && istype(wear_mask, /obj/item/clothing/mask) )
-		overlays_standing[M_MASK_LAYER]	= image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "[wear_mask.icon_state]")
-		wear_mask.screen_loc = ui_monkey_mask
-	else
-		overlays_standing[M_MASK_LAYER]	= null
-	if(update_icons)		update_icons()
-
-
-/mob/living/carbon/monkey/update_inv_r_hand(var/update_icons=1)
-	if(r_hand)
-		var/t_icon = INV_R_HAND_DEF_ICON
-		if(r_hand.item_icons && (icon_r_hand in r_hand.item_icons))
-			t_icon = r_hand.item_icons[icon_r_hand]
-		
-		var/t_state = r_hand.item_state
-		if(!t_state)	t_state = r_hand.icon_state
-		
-		overlays_standing[M_R_HAND_LAYER]	= image("icon" = t_icon, "icon_state" = t_state)
-		r_hand.screen_loc = ui_rhand
-		if (handcuffed) drop_r_hand()
-	else
-		overlays_standing[M_R_HAND_LAYER]	= null
-	
-	if(update_icons) update_icons()
-
-
-/mob/living/carbon/monkey/update_inv_l_hand(var/update_icons=1)
-	if(l_hand)
-		var/t_icon = INV_L_HAND_DEF_ICON
-		if(l_hand.item_icons && (icon_l_hand in l_hand.item_icons))
-			t_icon = l_hand.item_icons[icon_l_hand]
-		
-		var/t_state = l_hand.item_state
-		if(!t_state)	 t_state = l_hand.icon_state
-		
-		overlays_standing[M_L_HAND_LAYER]	= image("icon" = t_icon, "icon_state" = t_state)
-		l_hand.screen_loc = ui_lhand
-		if (handcuffed) drop_l_hand()
-	else
-		overlays_standing[M_L_HAND_LAYER]	= null
-	
-	if(update_icons) update_icons()
-
-
-/mob/living/carbon/monkey/update_inv_back(var/update_icons=1)
-	if(back)
-		overlays_standing[M_BACK_LAYER]	= image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]")
-		back.screen_loc = ui_monkey_back
-	else
-		overlays_standing[M_BACK_LAYER]	= null
-	if(update_icons)		update_icons()
-
-
-/mob/living/carbon/monkey/update_inv_handcuffed(var/update_icons=1)
-	if(handcuffed)
-		drop_r_hand()
-		drop_l_hand()
-		stop_pulling()
-		overlays_standing[M_HANDCUFF_LAYER]	= image("icon" = 'icons/mob/monkey.dmi', "icon_state" = "handcuff1")
-	else
-		overlays_standing[M_HANDCUFF_LAYER]	= null
-	if(update_icons)		update_icons()
-
-
-/mob/living/carbon/monkey/update_hud()
-	if (client)
-		client.screen |= contents
-
-//Call when target overlay should be added/removed
-/mob/living/carbon/monkey/update_targeted(var/update_icons=1)
-	if (targeted_by && target_locked)
-		overlays_standing[TARGETED_LAYER]	= target_locked
-	else if (!targeted_by && target_locked)
-		del(target_locked)
-	if (!targeted_by)
-		overlays_standing[TARGETED_LAYER]	= null
-	if(update_icons)		update_icons()
-
-/mob/living/carbon/monkey/update_fire(var/update_icons=1)
-	if(on_fire)
-		overlays_standing[M_FIRE_LAYER] = image("icon"='icons/mob/OnFire.dmi', "icon_state"="Standing", "layer"= -M_FIRE_LAYER)
-	else
-		overlays_standing[M_FIRE_LAYER] = null
-	if(update_icons)		update_icons()
-//Monkey Overlays Indexes////////
-#undef M_MASK_LAYER
-#undef M_BACK_LAYER
-#undef M_HANDCUFF_LAYER
-#undef M_L_HAND_LAYER
-#undef M_R_HAND_LAYER
-#undef TARGETED_LAYER
-#undef M_FIRE_LAYER
-#undef M_TOTAL_LAYERS
-

code/modules/mob/living/default_language.dm

@@ -0,0 +1,25 @@
+/mob/living
+	var/datum/language/default_language
+
+/mob/living/verb/set_default_language(language as null|anything in languages)
+	set name = "Set Default Language"
+	set category = "IC"
+
+	if(language)
+		src << "<span class='notice'>You will now speak [language] if you do not specify a language when speaking.</span>"
+	else
+		src << "<span class='notice'>You will now speak whatever your standard default language is if you do not specify one when speaking.</span>"
+	default_language = language
+
+// Silicons can't neccessarily speak everything in their languages list
+/mob/living/silicon/set_default_language(language as null|anything in speech_synthesizer_langs)
+	..()
+
+/mob/living/verb/check_default_language()
+	set name = "Check Default Language"
+	set category = "IC"
+
+	if(default_language)
+		src << "<span class='notice'>You are currently speaking [default_language] by default.</span>"
+	else
+		src << "<span class='notice'>Your current default language is your species or mob type default.</span>"

code/modules/mob/living/living.dm

@@ -376,7 +376,8 @@ default behaviour is:
 
 /mob/living/proc/revive()
 	rejuvenate()
-	buckled = initial(src.buckled)
+	if(buckled)
+		buckled.unbuckle_mob()
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 

code/modules/mob/living/say.dm

@@ -80,7 +80,7 @@ proc/get_radio_key_from_channel(var/channel)
 		if(dongle.translate_binary) return 1
 
 /mob/living/proc/get_default_language()
-	return null
+	return default_language
 
 /mob/living/proc/handle_speech_problems(var/message, var/verb)
 	var/list/returns[3]

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

@@ -6,6 +6,7 @@ var/list/ai_verbs_default = list(
 	/mob/living/silicon/ai/proc/ai_announcement,
 	/mob/living/silicon/ai/proc/ai_call_shuttle,
 	// /mob/living/silicon/ai/proc/ai_recall_shuttle,
+	/mob/living/silicon/ai/proc/ai_emergency_message,
 	/mob/living/silicon/ai/proc/ai_camera_track,
 	/mob/living/silicon/ai/proc/ai_camera_list,
 	/mob/living/silicon/ai/proc/ai_goto_location,
@@ -380,6 +381,30 @@ var/list/ai_verbs_default = list(
 	if(confirm == "Yes")
 		cancel_call_proc(src)
 
+/mob/living/silicon/ai/var/emergency_message_cooldown = 0
+/mob/living/silicon/ai/proc/ai_emergency_message()
+	set category = "AI Commands"
+	set name = "Send Emergency Message"
+
+	if(check_unable(AI_CHECK_WIRELESS))
+		return
+	if(!is_relay_online())
+		usr <<"<span class='warning'>No Emergency Bluespace Relay detected. Unable to transmit message.</span>"
+		return
+	if(emergency_message_cooldown)
+		usr << "<span class='warning'>Arrays recycling. Please stand by.</span>"
+		return
+	var/input = input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")
+	if(!input)
+		return
+	Centcomm_announce(input, usr)
+	usr << "<span class='notice'>Message transmitted.</span>"
+	log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]")
+	emergency_message_cooldown = 1
+	spawn(300)
+		emergency_message_cooldown = 0
+
+
 /mob/living/silicon/ai/check_eye(var/mob/user as mob)
 	if (!camera)
 		return null
@@ -478,41 +503,39 @@ var/list/ai_verbs_default = list(
 //Replaces /mob/living/silicon/ai/verb/change_network() in ai.dm & camera.dm
 //Adds in /mob/living/silicon/ai/proc/ai_network_change() instead
 //Addition by Mord_Sith to define AI's network change ability
-/mob/living/silicon/ai/proc/ai_network_change()
-	set category = "AI Commands"
-	set name = "Jump To Network"
-	unset_machine()
-	var/cameralist[0]
-
+/mob/living/silicon/ai/proc/get_camera_network_list()
 	if(check_unable())
 		return
 
-	var/mob/living/silicon/ai/U = usr
-
+	var/list/cameralist = new()
 	for (var/obj/machinery/camera/C in cameranet.cameras)
 		if(!C.can_use())
 			continue
-
 		var/list/tempnetwork = difflist(C.network,restricted_camera_networks,1)
-		if(tempnetwork.len)
-			for(var/i in tempnetwork)
-				cameralist[i] = i
-	var/old_network = network
-	network = input(U, "Which network would you like to view?") as null|anything in cameralist
+		for(var/i in tempnetwork)
+			cameralist[i] = i
 
-	if(!U.eyeobj)
-		U.view_core()
+	cameralist = sortAssoc(cameralist)
+	return cameralist
+
+/mob/living/silicon/ai/proc/ai_network_change(var/network in get_camera_network_list())
+	set category = "AI Commands"
+	set name = "Jump To Network"
+	unset_machine()
+
+	if(!network)
 		return
 
-	if(isnull(network))
-		network = old_network // If nothing is selected
-	else
-		for(var/obj/machinery/camera/C in cameranet.cameras)
-			if(!C.can_use())
-				continue
-			if(network in C.network)
-				U.eyeobj.setLoc(get_turf(C))
-				break
+	if(!eyeobj)
+		view_core()
+		return
+
+	for(var/obj/machinery/camera/C in cameranet.cameras)
+		if(!C.can_use())
+			continue
+		if(network in C.network)
+			eyeobj.setLoc(get_turf(C))
+			break
 	src << "\blue Switched to [network] camera network."
 //End of code by Mord_Sith
 
@@ -668,14 +691,14 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/proc/check_unable(var/flags = 0)
 	if(stat == DEAD)
-		usr << "\red You are dead!"
+		src << "<span class='warning'>You are dead!</span>"
 		return 1
 
 	if((flags & AI_CHECK_WIRELESS) && src.control_disabled)
-		usr << "\red Wireless control is disabled!"
+		src << "<span class='warning'>Wireless control is disabled!</span>"
 		return 1
 	if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi)
-		src << "\red System Error - Transceiver Disabled!"
+		src << "<span class='warning'>System Error - Transceiver Disabled!</span>"
 		return 1
 	return 0
 

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

@@ -117,10 +117,6 @@
 	if (src.client.statpanel == "Status")
 		show_silenced()
 
-	if (proc_holder_list.len)//Generic list for proc_holder objects.
-		for(var/obj/effect/proc_holder/P in proc_holder_list)
-			statpanel("[P.panel]","",P)
-
 /mob/living/silicon/pai/check_eye(var/mob/user as mob)
 	if (!src.current)
 		return null

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

@@ -55,9 +55,9 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 
 		switch(option)
 			if("name")
-				t = input("Enter a name for your pAI", "pAI Name", candidate.name) as text
+				t = sanitizeSafe(input("Enter a name for your pAI", "pAI Name", candidate.name) as text, MAX_NAME_LEN)
 				if(t)
-					candidate.name = sanitizeSafe(t, MAX_NAME_LEN)
+					candidate.name = t
 			if("desc")
 				t = input("Enter a description for your pAI", "pAI Description", candidate.description) as message
 				if(t)

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

@@ -14,7 +14,7 @@
 	lawupdate = 0
 	density = 1
 	req_access = list(access_engine, access_robotics)
-	integrated_light_power = 2
+	integrated_light_power = 3
 	local_transmit = 1
 
 	mob_bump_flag = SIMPLE_ANIMAL
@@ -24,6 +24,11 @@
 
 	//Used for self-mailing.
 	var/mail_destination = ""
+	var/obj/machinery/drone_fabricator/master_fabricator
+	var/law_type = /datum/ai_laws/drone
+	var/module_type = /obj/item/weapon/robot_module/drone
+	var/can_pull_size = 2
+	var/can_pull_mobs
 
 	holder_type = /obj/item/weapon/holder/drone
 
@@ -36,9 +41,6 @@
 	add_language("Robot Talk", 0)
 	add_language("Drone Talk", 1)
 
-	if(camera && "Robots" in camera.network)
-		camera.add_network("Engineering")
-
 	//They are unable to be upgraded, so let's give them a bit of a better battery.
 	cell.maxcharge = 10000
 	cell.charge = 10000
@@ -52,16 +54,18 @@
 		C.max_damage = 10
 
 	verbs -= /mob/living/silicon/robot/verb/Namepick
-	module = new /obj/item/weapon/robot_module/drone(src)
-
-	//Some tidying-up.
-	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
 	updateicon()
 
 /mob/living/silicon/robot/drone/init()
-	laws = new /datum/ai_laws/drone()
+	if(!laws) laws = new law_type
+	if(!module) module = new module_type(src)
+
 	aiCamera = new/obj/item/device/camera/siliconcam/drone_camera(src)
+	flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'NanoTrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
 	playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+	spawn(1)
+		if(camera && ("Robots" in camera.network))
+			camera.add_network("Engineering")
 
 //Redefining some robot procs...
 /mob/living/silicon/robot/drone/SetName(pickedName as text)
@@ -91,26 +95,26 @@
 /mob/living/silicon/robot/drone/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 	if(istype(W, /obj/item/borg/upgrade/))
-		user << "\red The maintenance drone chassis not compatible with \the [W]."
+		user << "<span class='danger'>\The [src] is not compatible with \the [W].</span>"
 		return
 
 	else if (istype(W, /obj/item/weapon/crowbar))
-		user << "The machine is hermetically sealed. You can't open the case."
+		user << "<span class='danger'>\The [src] is hermetically sealed. You can't open the case.</span>"
 		return
 
 	else if (istype(W, /obj/item/weapon/card/emag))
 
 		if(!client || stat == 2)
-			user << "\red There's not much point subverting this heap of junk."
+			user << "<span class='danger'>There's not much point subverting this heap of junk.</span>"
 			return
 
 		if(emagged)
-			src << "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt."
-			user << "\red You attempt to subvert [src], but the sequencer has no effect."
+			src << "<span class='danger'>\The [user] attempts to load subversive software into you, but your hacked subroutines ignore the attempt.</span>"
+			user << "<span class='danger'>You attempt to subvert [src], but the sequencer has no effect.</span>"
 			return
 
-		user << "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker."
-		src << "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script."
+		user << "<span class='danger'>You swipe the sequencer across [src]'s interface and watch its eyes flicker.</span>"
+		src << "<span class='danger'>You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.</span>"
 
 		var/obj/item/weapon/card/emag/emag = W
 		emag.uses--
@@ -130,7 +134,7 @@
 
 		src << "<b>Obey these laws:</b>"
 		laws.show_laws(src)
-		src << "\red \b ALERT: [user.real_name] is your new master. Obey your new laws and his commands."
+		src << "<span class='danger'>ALERT: [user.real_name] is your new master. Obey your new laws and his commands.</span>"
 		return
 
 	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
@@ -138,14 +142,14 @@
 		if(stat == 2)
 
 			if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave.
-				user << "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one."
+				user << "<span class='danger'>The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.</span>"
 				return
 
 			if(!allowed(usr))
-				user << "\red Access denied."
+				user << "<span class='danger'>Access denied.</span>"
 				return
 
-			user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to reboot it.", "\red You swipe your ID card through \the [src], attempting to reboot it.")
+			user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], attempting to reboot it.</span>", "<span class='danger'>>You swipe your ID card through \the [src], attempting to reboot it.</span>")
 			var/drones = 0
 			for(var/mob/living/silicon/robot/drone/D in world)
 				if(D.key && D.client)
@@ -155,7 +159,7 @@
 			return
 
 		else
-			user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to shut it down.", "\red You swipe your ID card through \the [src], attempting to shut it down.")
+			user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], attempting to shut it down.</span>", "<span class='danger'>You swipe your ID card through \the [src], attempting to shut it down.</span>")
 
 			if(emagged)
 				return
@@ -163,7 +167,7 @@
 			if(allowed(usr))
 				shut_down()
 			else
-				user << "\red Access denied."
+				user << "<span class='danger'>Access denied.</span>"
 
 		return
 
@@ -185,7 +189,7 @@
 //Drones killed by damage will gib.
 /mob/living/silicon/robot/drone/handle_regular_status_updates()
 
-	if(health <= -35 && src.stat != 2)
+	if((health <= -35 || (master_fabricator && src.z != master_fabricator.z)) && src.stat != 2)
 		timeofdeath = world.time
 		death() //Possibly redundant, having trouble making death() cooperate.
 		gib()
@@ -194,32 +198,31 @@
 
 //DRONE MOVEMENT.
 /mob/living/silicon/robot/drone/Process_Spaceslipping(var/prob_slip)
-	//TODO: Consider making a magboot item for drones to equip. ~Z
 	return 0
 
 //CONSOLE PROCS
 /mob/living/silicon/robot/drone/proc/law_resync()
 	if(stat != 2)
 		if(emagged)
-			src << "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected."
+			src << "<span class='danger'>You feel something attempting to modify your programming, but your hacked subroutines are unaffected.</span>"
 		else
-			src << "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it."
+			src << "<span class='danger'>A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.</span>"
 			full_law_reset()
 			show_laws()
 
 /mob/living/silicon/robot/drone/proc/shut_down()
 	if(stat != 2)
 		if(emagged)
-			src << "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you."
+			src << "<span class='danger'>You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.</span>"
 		else
-			src << "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself."
+			src << "<span class='danger'>You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.</span>"
 			death()
 
 /mob/living/silicon/robot/drone/proc/full_law_reset()
 	clear_supplied_laws()
 	clear_inherent_laws()
 	clear_ion_laws()
-	laws = new /datum/ai_laws/drone
+	laws = new law_type
 
 //Reboot procs.
 
@@ -267,17 +270,32 @@
 		..()
 	else if(istype(AM,/obj/item))
 		var/obj/item/O = AM
-		if(O.w_class > 2)
+		if(O.w_class > can_pull_size)
 			src << "<span class='warning'>You are too small to pull that.</span>"
 			return
 		else
 			..()
 	else
-		src << "<span class='warning'>You are too small to pull that.</span>"
-		return
+		if(!can_pull_mobs)
+			src << "<span class='warning'>You are too small to pull that.</span>"
+			return
 
 /mob/living/silicon/robot/drone/add_robot_verbs()
 	src.verbs |= silicon_verbs_subsystems
 
 /mob/living/silicon/robot/drone/remove_robot_verbs()
 	src.verbs -= silicon_verbs_subsystems
+
+/mob/living/silicon/robot/drone/construction
+	law_type = /datum/ai_laws/construction_drone
+	module_type = /obj/item/weapon/robot_module/drone/construction
+	can_pull_size = 5
+	can_pull_mobs = 1
+
+/mob/living/silicon/robot/drone/construction/init()
+	..()
+	flavor_text = "It's a bulky construction drone stamped with a Sol Central glyph."
+
+/mob/living/silicon/robot/drone/construction/updatename()
+	real_name = "construction drone ([rand(100,999)])"
+	name = real_name

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

@@ -19,7 +19,7 @@
 		return
 
 	if(!allowed(user))
-		user << "\red Access denied."
+		user << "<span class='danger'>Access denied.</span>"
 		return
 
 	user.set_machine(src)
@@ -27,6 +27,8 @@
 	dat += "<B>Maintenance Units</B><BR>"
 
 	for(var/mob/living/silicon/robot/drone/D in world)
+		if(D.z != src.z)
+			continue
 		dat += "<BR>[D.real_name] ([D.stat == 2 ? "<font color='red'>INACTIVE" : "<font color='green'>ACTIVE"]</FONT>)"
 		dat += "<font dize = 9><BR>Cell charge: [D.cell.charge]/[D.cell.maxcharge]."
 		dat += "<BR>Currently located in: [get_area(D)]."
@@ -46,7 +48,7 @@
 		return
 
 	if(!allowed(usr))
-		usr << "\red Access denied."
+		usr << "<span class='danger'>Access denied.</span>"
 		return
 
 	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
@@ -61,11 +63,11 @@
 			return
 
 		drone_call_area = t_area
-		usr << "\blue You set the area selector to [drone_call_area]."
+		usr << "<span class='notice'>You set the area selector to [drone_call_area].</span>"
 
 	else if (href_list["ping"])
 
-		usr << "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area]."
+		usr << "<span class='notice'>You issue a maintenance request for all active drones, highlighting [drone_call_area].</span>"
 		for(var/mob/living/silicon/robot/drone/D in world)
 			if(D.client && D.stat == 0)
 				D << "-- Maintenance drone presence requested in: [drone_call_area]."
@@ -75,7 +77,7 @@
 		var/mob/living/silicon/robot/drone/D = locate(href_list["resync"])
 
 		if(D.stat != 2)
-			usr << "\red You issue a law synchronization directive for the drone."
+			usr << "<span class='danger'>You issue a law synchronization directive for the drone.</span>"
 			D.law_resync()
 
 	else if (href_list["shutdown"])
@@ -83,7 +85,7 @@
 		var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"])
 
 		if(D.stat != 2)
-			usr << "\red You issue a kill command for the unfortunate drone."
+			usr << "<span class='danger'>You issue a kill command for the unfortunate drone.</span>"
 			message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
 			log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
 			D.shut_down()
@@ -98,10 +100,10 @@
 				continue
 
 			dronefab = fab
-			usr << "\blue Drone fabricator located."
+			usr << "<span class='notice'>Drone fabricator located.</span>"
 			return
 
-		usr << "\red Unable to locate drone fabricator."
+		usr << "<span class='danger'>Unable to locate drone fabricator.</span>"
 
 	else if (href_list["toggle_fab"])
 
@@ -110,10 +112,10 @@
 
 		if(get_dist(src,dronefab) > 3)
 			dronefab = null
-			usr << "\red Unable to locate drone fabricator."
+			usr << "<span class='danger'>Unable to locate drone fabricator.</span>"
 			return
 
 		dronefab.produce_drones = !dronefab.produce_drones
-		usr << "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator."
+		usr << "<span class='notice'>You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.</span>"
 
 	src.updateUsrDialog()

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

@@ -2,10 +2,12 @@
 //Limited use.
 /obj/item/weapon/gripper
 	name = "magnetic gripper"
-	desc = "A simple grasping tool for synthetic assets."
+	desc = "A simple grasping tool specialized in construction and engineering work."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "gripper"
 
+	flags = NOBLUDGEON
+
 	//Has a list of items that it can hold.
 	var/list/can_hold = list(
 		/obj/item/weapon/cell,
@@ -28,8 +30,14 @@
 
 	var/obj/item/wrapped = null // Item currently being held.
 
+	var/force_holder = null //
+
 // VEEEEERY limited version for mining borgs. Basically only for swapping cells and upgrading the drills.
 /obj/item/weapon/gripper/miner
+	name = "drill maintenance gripper"
+	desc = "A simple grasping tool for the maintenance of heavy drilling machines."
+	icon_state = "gripper-mining"
+
 	can_hold = list(
 	/obj/item/weapon/cell,
 	/obj/item/weapon/stock_parts
@@ -38,14 +46,58 @@
 /obj/item/weapon/gripper/paperwork
 	name = "paperwork gripper"
 	desc = "A simple grasping tool for clerical work."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "gripper"
 
 	can_hold = list(
 		/obj/item/weapon/clipboard,
 		/obj/item/weapon/paper,
 		/obj/item/weapon/paper_bundle,
-		/obj/item/weapon/card/id
+		/obj/item/weapon/card/id,
+		/obj/item/weapon/book,
+		/obj/item/weapon/newspaper
+		)
+
+/obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc
+	name = "scientific gripper"
+	icon_state = "gripper-sci"
+	desc = "A simple grasping tool suited to assist in a wide array of research applications."
+
+	can_hold = list(
+		/obj/item/weapon/cell,
+		/obj/item/weapon/stock_parts,
+		/obj/item/device/mmi,
+		/obj/item/robot_parts,
+		/obj/item/borg/upgrade,
+		/obj/item/device/flash, //to build borgs
+		/obj/item/organ/brain, //to insert into MMIs.
+		/obj/item/stack/cable_coil, //again, for borg building
+		/obj/item/weapon/circuitboard,
+		/obj/item/slime_extract,
+		/obj/item/weapon/reagent_containers/glass,
+		/obj/item/weapon/reagent_containers/food/snacks/monkeycube
+
+		)
+
+/obj/item/weapon/gripper/service //Used to handle food, drinks, and seeds.
+	name = "service gripper"
+	icon_state = "gripper"
+	desc = "A simple grasping tool used to perform tasks in the service sector, such as handling food, drinks, and seeds."
+
+	can_hold = list(
+		/obj/item/weapon/reagent_containers/glass,
+		/obj/item/weapon/reagent_containers/food,
+		/obj/item/seeds,
+		/obj/item/weapon/grown
+		)
+
+/obj/item/weapon/gripper/no_use //Used when you want to hold and put items in other things, but not able to 'use' the item
+
+/obj/item/weapon/gripper/no_use/loader //This is used to disallow building with metal.
+	name = "sheet loader"
+	desc = "A specialized loading device, designed to pick up and insert sheets of materials inside machines."
+	icon_state = "gripper-sheet"
+
+	can_hold = list(
+		/obj/item/stack/sheet
 		)
 
 /obj/item/weapon/gripper/attack_self(mob/user as mob)
@@ -53,6 +105,9 @@
 		return wrapped.attack_self(user)
 	return ..()
 
+/obj/item/weapon/gripper/no_use/attack_self(mob/user as mob)
+	return
+
 /obj/item/weapon/gripper/verb/drop_item()
 
 	set name = "Drop Item"
@@ -75,7 +130,12 @@
 	//update_icon()
 
 /obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	return (wrapped ? wrapped.attack(M,user) : 0)
+	if(wrapped) 	//The force of the wrapped obj gets set to zero during the attack() and afterattack().
+		force_holder = wrapped.force
+		wrapped.force = 0.0
+		wrapped.attack(M,user)
+		return 1
+	return 0
 
 /obj/item/weapon/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params)
 
@@ -97,6 +157,9 @@
 		if(!resolved && wrapped && target)
 			wrapped.afterattack(target,user,1)
 
+		//wrapped's force was set to zero.  This resets it to the value it had before.
+		wrapped.force = force_holder
+		force_holder = null
 		//If wrapped was neither deleted nor put into target, put it back into the gripper.
 		if(wrapped && user && (wrapped.loc == user))
 			wrapped.loc = src
@@ -145,6 +208,21 @@
 
 				user.visible_message("<span class='danger'>[user] removes the power cell from [A]!</span>", "You remove the power cell.")
 
+	else if(istype(target,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/A = target
+		if(A.opened)
+			if(A.cell)
+
+				wrapped = A.cell
+
+				A.cell.add_fingerprint(user)
+				A.cell.updateicon()
+				A.updateicon()
+				A.cell.loc = src
+				A.cell = null
+
+				user.visible_message("<span class='danger'>[user] removes the power cell from [A]!</span>", "You remove the power cell.")
+
 //TODO: Matter decompiler.
 /obj/item/weapon/matter_decompiler
 

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

@@ -1,3 +1,10 @@
+/proc/count_drones()
+	var/drones = 0
+	for(var/mob/living/silicon/robot/drone/D in world)
+		if(D.key && D.client)
+			drones++
+	return drones
+
 /obj/machinery/drone_fabricator
 	name = "drone fabricator"
 	desc = "A large automated factory for producing maintenance drones."
@@ -8,13 +15,20 @@
 	idle_power_usage = 20
 	active_power_usage = 5000
 
+	var/fabricator_tag = "Exodus"
 	var/drone_progress = 0
 	var/produce_drones = 1
 	var/time_last_drone = 500
+	var/drone_type = /mob/living/silicon/robot/drone
 
 	icon = 'icons/obj/machines/drone_fab.dmi'
 	icon_state = "drone_fab_idle"
 
+/obj/machinery/drone_fabricator/derelict
+	name = "construction drone fabricator"
+	fabricator_tag = "Derelict"
+	drone_type = /mob/living/silicon/robot/drone/construction
+
 /obj/machinery/drone_fabricator/New()
 	..()
 
@@ -48,13 +62,6 @@
 	if(produce_drones && drone_progress >= 100 && istype(user,/mob/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones)
 		user << "<BR><B>A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone.</B>"
 
-/obj/machinery/drone_fabricator/proc/count_drones()
-	var/drones = 0
-	for(var/mob/living/silicon/robot/drone/D in world)
-		if(D.key && D.client)
-			drones++
-	return drones
-
 /obj/machinery/drone_fabricator/proc/create_drone(var/client/player)
 
 	if(stat & NOPOWER)
@@ -71,13 +78,12 @@
 	flick("h_lathe_leave",src)
 
 	time_last_drone = world.time
-	var/mob/living/silicon/robot/drone/new_drone = new(get_turf(src))
+	var/mob/living/silicon/robot/drone/new_drone = new drone_type(get_turf(src))
 	new_drone.transfer_personality(player)
+	new_drone.master_fabricator = src
 
 	drone_progress = 0
 
-
-
 /mob/dead/verb/join_as_drone()
 
 	set category = "Ghost"
@@ -86,11 +92,11 @@
 
 
 	if(ticker.current_state < GAME_STATE_PLAYING)
-		src << "\red The game hasn't started yet!"
+		src << "<span class='danger'>The game hasn't started yet!</span>"
 		return
 
 	if(!(config.allow_drone_spawn))
-		src << "\red That verb is not currently permitted."
+		src << "<span class='danger'>That verb is not currently permitted.</span>"
 		return
 
 	if (!src.stat)
@@ -100,14 +106,14 @@
 		return 0 //something is terribly wrong
 
 	if(jobban_isbanned(src,"Cyborg"))
-		usr << "\red You are banned from playing synthetics and cannot spawn as a drone."
+		usr << "<span class='danger'>You are banned from playing synthetics and cannot spawn as a drone.</span>"
 		return
 
 	var/deathtime = world.time - src.timeofdeath
 	if(istype(src,/mob/dead/observer))
 		var/mob/dead/observer/G = src
 		if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
-			usr << "\blue <B>Upon using the antagHUD you forfeighted the ability to join the round.</B>"
+			usr << "<span class='notice'>Upon using the antagHUD you forfeighted the ability to join the round.</span>"
 			return
 
 	var/deathtimeminutes = round(deathtime / 600)
@@ -125,16 +131,18 @@
 		usr << "You must wait 10 minutes to respawn as a drone!"
 		return
 
+	var/list/all_fabricators = list()
 	for(var/obj/machinery/drone_fabricator/DF in world)
 		if(DF.stat & NOPOWER || !DF.produce_drones)
 			continue
-
-		if(DF.count_drones() >= config.max_maint_drones)
-			src << "\red There are too many active drones in the world for you to spawn."
-			return
-
 		if(DF.drone_progress >= 100)
-			DF.create_drone(src.client)
-			return
+			all_fabricators[DF.fabricator_tag] = DF
 
-	src << "\red There are no available drone spawn points, sorry."
+	if(!all_fabricators.len)
+		src << "<span class='danger'>There are no available drone spawn points, sorry.</span>"
+		return
+
+	var/choice = input(src,"Which fabricator do you wish to use?") as null|anything in all_fabricators
+	if(choice)
+		var/obj/machinery/drone_fabricator/chosen_fabricator = all_fabricators[choice]
+		chosen_fabricator.create_drone(src.client)

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

@@ -130,10 +130,11 @@
 	if (src.stat != 0)
 		uneq_all()
 
-	if(!is_component_functioning("radio"))
-		radio.on = 0
-	else
-		radio.on = 1
+	if(radio)
+		if(!is_component_functioning("radio"))
+			radio.on = 0
+		else
+			radio.on = 1
 
 	if(is_component_functioning("camera"))
 		src.blinded = 0

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

@@ -265,7 +265,8 @@
 			module_sprites["Bro"] = "Brobot"
 			module_sprites["Rich"] = "maximillion"
 			module_sprites["Default"] = "Service2"
-			module_sprites["Drone"] = "drone-service" // How does this even work...? Oh well.
+			module_sprites["Drone - Service"] = "drone-service"
+			module_sprites["Drone - Hydro"] = "drone-hydro"
 
 		if("Clerical")
 			module = new /obj/item/weapon/robot_module/clerical(src)
@@ -277,6 +278,12 @@
 			module_sprites["Default"] = "Service2"
 			module_sprites["Drone"] = "drone-service"
 
+		if("Research")
+			module = new /obj/item/weapon/robot_module/research(src)
+			module.channels = list("Science" = 1)
+			module_sprites["Droid"] = "droid-science"
+			module_sprites["Drone"] = "drone-science"
+
 		if("Miner")
 			module = new /obj/item/weapon/robot_module/miner(src)
 			module.channels = list("Supply" = 1)
@@ -296,7 +303,8 @@
 			module_sprites["Standard"] = "surgeon"
 			module_sprites["Advanced Droid"] = "droid-medical"
 			module_sprites["Needles"] = "medicalrobot"
-			module_sprites["Drone" ] = "drone-medical"
+			module_sprites["Drone - Medical" ] = "drone-medical"
+			module_sprites["Drone - Chemistry" ] = "drone-chemistry"
 
 		if("Surgeon")
 			module = new /obj/item/weapon/robot_module/surgeon(src)
@@ -731,7 +739,7 @@
 		else
 			user << "Unable to locate a radio."
 
-	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))			// trying to unlock the interface with an ID card
+	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)||istype(W, /obj/item/weapon/card/robot))			// trying to unlock the interface with an ID card
 		if(emagged)//still allow them to open the cover
 			user << "The interface seems slightly damaged"
 		if(opened)
@@ -868,6 +876,10 @@
 		//if they are holding or wearing a card that has access, that works
 		if(check_access(H.get_active_hand()) || check_access(H.wear_id))
 			return 1
+	else if(istype(M, /mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = M
+		if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/weapon/card/robot))
+			return 1
 	return 0
 
 /mob/living/silicon/robot/proc/check_access(obj/item/weapon/card/id/I)

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

@@ -1,3 +1,138 @@
+//A portable analyzer, for research borgs.  This is better then giving them a gripper which can hold anything and letting them use the normal analyzer.
+/obj/item/weapon/portable_destructive_analyzer
+	name = "Portable Destructive Analyzer"
+	icon = 'icons/obj/items.dmi'
+	icon_state = "portable_analyzer"
+	desc = "Similar to the stationary version, this rather unwieldy device allows you to break down objects in the name of science."
+
+	var/min_reliability = 90 //Can't upgrade, call it laziness or a drawback
+
+	var/datum/research/techonly/files 	//The device uses the same datum structure as the R&D computer/server.
+										//This analyzer can only store tech levels, however.
+
+	var/obj/item/weapon/loaded_item	//What is currently inside the analyzer.
+
+/obj/item/weapon/portable_destructive_analyzer/New()
+	..()
+	files = new /datum/research/techonly(src) //Setup the research data holder.
+
+/obj/item/weapon/portable_destructive_analyzer/attack_self(user as mob)
+	var/response = alert(user, 	"Analyzing the item inside will *DESTROY* the item for good.\n\
+							Syncing to the research server will send the data that is stored inside to research.\n\
+							Ejecting will place the loaded item onto the floor.",
+							"What would you like to do?", "Analyze", "Sync", "Eject")
+	if(response == "Analyze")
+		if(loaded_item)
+			var/confirm = alert(user, "This will destroy the item inside forever.  Are you sure?","Confirm Analyze","Yes","No")
+			if(confirm == "Yes") //This is pretty copypasta-y
+				user << "You activate the analyzer's microlaser, analyzing \the [loaded_item] and breaking it down."
+				flick("portable_analyzer_scan", src)
+				playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
+				if(loaded_item.reliability >= min_reliability)
+					var/list/temp_tech = ConvertReqString2List(loaded_item.origin_tech)
+					for(var/T in temp_tech)
+						files.UpdateTech(T, temp_tech[T])
+						user << "\The [loaded_item] had level [temp_tech[T]] in [T]."
+					loaded_item = null
+				for(var/obj/I in contents)
+					for(var/mob/M in I.contents)
+						M.death()
+					if(istype(I,/obj/item/stack/sheet))//Only deconsturcts one sheet at a time instead of the entire stack
+						var/obj/item/stack/sheet/S = I
+						if(S.get_amount() > 1)
+							S.use(1)
+							loaded_item = S
+						else
+							del(S)
+							desc = initial(desc)
+							icon_state = initial(icon_state)
+					else
+						del(I)
+						desc = initial(desc)
+						icon_state = initial(icon_state)
+			else
+				return
+		else
+			user << "The [src] is empty.  Put something inside it first."
+	if(response == "Sync")
+		var/success = 0
+		for(var/obj/machinery/r_n_d/server/S in machines)
+			if(S.disabled)
+				continue
+			for(var/datum/tech/T in files.known_tech) //Uploading
+				S.files.AddTech2Known(T)
+			for(var/datum/tech/T in S.files.known_tech) //Downloading
+				files.AddTech2Known(T)
+			success = 1
+			files.RefreshResearch()
+		if(success)
+			user << "You connect to the research server, push your data upstream to it, then pull the resulting merged data from the master branch."
+			playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1)
+		else
+			user << "Reserch server ping response timed out.  Unable to connect.  Please contact the system administrator."
+			playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1)
+	if(response == "Eject")
+		if(loaded_item)
+			loaded_item.loc = get_turf(src)
+			desc = initial(desc)
+			icon_state = initial(icon_state)
+			loaded_item = null
+		else
+			user << "The [src] is already empty."
+
+
+/obj/item/weapon/portable_destructive_analyzer/afterattack(var/atom/target, var/mob/living/user, proximity)
+	if(!target)
+		return
+	if(!proximity)
+		return
+	if(!isturf(target.loc)) // Don't load up stuff if it's inside a container or mob!
+		return
+	if(istype(target,/obj/item))
+		if(loaded_item)
+			user << "Your [src] already has something inside.  Analyze or eject it first."
+			return
+		var/obj/item/I = target
+		I.loc = src
+		loaded_item = I
+		for(var/mob/M in viewers())
+			M.show_message(text("<span class='notice'>[user] adds the [I] to the [src].</span>"), 1)
+		desc = initial(desc) + "<br>It is holding \the [loaded_item]."
+		flick("portable_analyzer_load", src)
+		icon_state = "portable_analyzer_full"
+
+//This is used to unlock other borg covers.
+/obj/item/weapon/card/robot //This is not a child of id cards, as to avoid dumb typechecks on computers.
+	name = "access code transmission device"
+	icon_state = "id-robot"
+	desc = "A circuit grafted onto the bottom of an ID card.  It is used to transmit access codes into other robot chassis, \
+	allowing you to lock and unlock other robots' panels."
+
+/obj/item/weapon/card/id/robot/attack_self() //override so borgs can't flash their IDs.
+	return
+
+/obj/item/weapon/card/id/robot/read()
+	usr << "The ID card does not appear to have any writing on it."
+	return
+
+//A harvest item for serviceborgs.
+/obj/item/weapon/robot_harvester
+	name = "auto harvester"
+	desc = "A hand-held harvest tool that resembles a sickle.  It uses energy to cut plant matter very efficently."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "autoharvester"
+
+/obj/item/weapon/robot_harvester/afterattack(var/atom/target, var/mob/living/user, proximity)
+	if(!target)
+		return
+	if(!proximity)
+		return
+	if(istype(target,/obj/machinery/portable_atmospherics/hydroponics))
+		var/obj/machinery/portable_atmospherics/hydroponics/T = target
+		T.harvest(user)
+	else
+		user << "Harvesting \a [target] is not the purpose of this tool.  The [src] is for plants being grown."
+
 // A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally
 // Click on table to unload, click on item to load. Otherwise works identically to a tray.
 // Unlike the base item "tray", robotrays ONLY pick up food, drinks and condiments.

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

@@ -191,7 +191,7 @@
 	src.modules += R
 
 	var/obj/item/stack/sheet/plasteel/cyborg/S = new /obj/item/stack/sheet/plasteel/cyborg(src)
-	S.synths = list(metal)
+	S.synths = list(plasteel)
 	src.modules += S
 
 	var/obj/item/stack/sheet/glass/reinforced/cyborg/RG = new /obj/item/stack/sheet/glass/reinforced/cyborg(src)
@@ -314,8 +314,13 @@
 /obj/item/weapon/robot_module/butler/New()
 	..()
 	src.modules += new /obj/item/device/flash(src)
-	src.modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
-	src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
+	src.modules += new /obj/item/weapon/gripper/service(src)
+	src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src)
+	src.modules += new /obj/item/weapon/minihoe(src)
+	src.modules += new /obj/item/weapon/hatchet(src)
+	src.modules += new /obj/item/device/analyzer/plant_analyzer(src)
+	src.modules += new /obj/item/weapon/storage/bag/plants(src)
+	src.modules += new /obj/item/weapon/robot_harvester(src)
 
 	var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
 	M.stored_matter = 30
@@ -358,6 +363,7 @@
 	src.modules += new /obj/item/weapon/pen/robopen(src)
 	src.modules += new /obj/item/weapon/form_printer(src)
 	src.modules += new /obj/item/weapon/gripper/paperwork(src)
+	src.modules += new /obj/item/weapon/hand_labeler(src)
 	src.emag = new /obj/item/weapon/stamp/denied(src)
 
 /obj/item/weapon/robot_module/clerical/add_languages(var/mob/living/silicon/robot/R)
@@ -395,6 +401,38 @@
 	src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
 	return
 
+/obj/item/weapon/robot_module/research
+	name = "research module"
+
+/obj/item/weapon/robot_module/research/New()
+	..()
+	src.modules += new /obj/item/device/flash(src)
+	src.modules += new /obj/item/weapon/portable_destructive_analyzer(src)
+	src.modules += new /obj/item/weapon/gripper/research(src)
+	src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
+	src.modules += new /obj/item/device/robotanalyzer(src)
+	src.modules += new /obj/item/weapon/card/robot(src)
+	src.modules += new /obj/item/weapon/wrench(src)
+	src.modules += new /obj/item/weapon/screwdriver(src)
+	src.modules += new /obj/item/weapon/crowbar(src)
+	src.modules += new /obj/item/weapon/scalpel(src)
+	src.modules += new /obj/item/weapon/circular_saw(src)
+	src.modules += new /obj/item/weapon/extinguisher/mini(src)
+	src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
+	src.modules += new /obj/item/weapon/reagent_containers/glass/beaker/large(src)
+	src.emag = new /obj/item/weapon/hand_tele(src)
+
+	var/datum/matter_synth/nanite = new /datum/matter_synth/nanite(10000)
+	synths += nanite
+
+	var/obj/item/stack/nanopaste/N = new /obj/item/stack/nanopaste(src)
+	N.uses_charge = 1
+	N.charge_costs = list(1000)
+	N.synths = list(nanite)
+	src.modules += N
+
+	return
+
 /obj/item/weapon/robot_module/syndicate
 	name = "illegal robot module"
 
@@ -446,7 +484,7 @@
 	src.modules += new /obj/item/device/multitool(src)
 	src.modules += new /obj/item/device/lightreplacer(src)
 	src.modules += new /obj/item/weapon/gripper(src)
-	src.modules += new /obj/item/weapon/reagent_containers/spray/cleaner/drone(src)
+	src.modules += new /obj/item/weapon/soap(src)
 	src.emag = new /obj/item/weapon/pickaxe/plasmacutter(src)
 	src.emag.name = "Plasma Cutter"
 
@@ -504,16 +542,19 @@
 	P.synths = list(plastic)
 	src.modules += P
 
+/obj/item/weapon/robot_module/drone/construction
+	name = "construction drone module"
+
+/obj/item/weapon/robot_module/drone/construction/New()
+	..()
+	src.modules += new /obj/item/weapon/rcd/borg(src)
+
 /obj/item/weapon/robot_module/drone/add_languages(var/mob/living/silicon/robot/R)
 	return	//not much ROM to spare in that tiny microprocessor!
 
 /obj/item/weapon/robot_module/drone/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
-	var/obj/item/weapon/reagent_containers/spray/cleaner/C = locate() in src.modules
-	C.reagents.add_reagent("cleaner", 3 * amount)
-
 	var/obj/item/device/lightreplacer/LR = locate() in src.modules
 	LR.Charge(R, amount)
-
 	..()
 	return
 
@@ -521,7 +562,5 @@
 /obj/item/proc/is_robot_module()
 	if (!istype(src.loc, /mob/living/silicon/robot))
 		return 0
-
 	var/mob/living/silicon/robot/R = src.loc
-
 	return (src in R.module.modules)

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

@@ -210,9 +210,19 @@
 
 	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
 
+	if(default_language)
+		dat += "Current default language: [default_language] - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/><br/>"
+
 	for(var/datum/language/L in languages)
 		if(!(L.flags & NONGLOBAL))
-			dat += "<b>[L.name] (:[L.key])</b><br/>Speech Synthesizer: <i>[(L in speech_synthesizer_langs)? "YES":"NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
+			var/default_str
+			if(L == default_language)
+				default_str = " - default - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a>"
+			else
+				default_str = " - <a href='byond://?src=\ref[src];default_lang=[L]'>set default</a>"
+
+			var/synth = (L in speech_synthesizer_langs)
+			dat += "<b>[L.name] (:[L.key])</b>[synth ? default_str : null]<br/>Speech Synthesizer: <i>[synth ? "YES" : "NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
 
 	src << browse(dat, "window=checklanguage")
 	return

code/modules/mob/living/simple_animal/constructs/constructs.dm

@@ -100,7 +100,7 @@
 	attack_sound = 'sound/weapons/punch3.ogg'
 	status_flags = 0
 	resistance = 10
-	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall)
+	construct_spells = list(/spell/aoe_turf/conjure/forcewall/lesser)
 
 /mob/living/simple_animal/construct/armoured/Life()
 	weakened = 0
@@ -149,7 +149,7 @@
 	environment_smash = 1
 	see_in_dark = 7
 	attack_sound = 'sound/weapons/bladeslice.ogg'
-	construct_spells = list(/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift)
+	construct_spells = list(/spell/targeted/ethereal_jaunt/shift)
 
 
 /////////////////////////////Artificer/////////////////////////
@@ -173,10 +173,12 @@
 	speed = 0
 	environment_smash = 2
 	attack_sound = 'sound/weapons/punch2.ogg'
-	construct_spells = list(/obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser,
-							/obj/effect/proc_holder/spell/aoe_turf/conjure/wall,
-							/obj/effect/proc_holder/spell/aoe_turf/conjure/floor,
-							/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone,)
+	construct_spells = list(/spell/aoe_turf/conjure/construct/lesser,
+							/spell/aoe_turf/conjure/wall,
+							/spell/aoe_turf/conjure/floor,
+							/spell/aoe_turf/conjure/soulstone,
+							/spell/aoe_turf/conjure/pylon
+							)
 
 
 /////////////////////////////Behemoth/////////////////////////
@@ -203,6 +205,7 @@
 	resistance = 10
 	var/energy = 0
 	var/max_energy = 1000
+	construct_spells = list(/spell/aoe_turf/conjure/forcewall/lesser)
 
 ////////////////////////Harvester////////////////////////////////
 
@@ -226,7 +229,7 @@
 	attack_sound = 'sound/weapons/pierce.ogg'
 
 	construct_spells = list(
-			//spell/targeted/harvest,
-			//spell/aoe_turf/knock/harvester,
-			//spell/rune_write
+			/spell/targeted/harvest,
+			/spell/aoe_turf/knock/harvester,
+			/spell/rune_write
 		)

code/modules/mob/living/simple_animal/constructs/soulstone.dm

@@ -86,7 +86,14 @@
 	name = "empty shell"
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "construct"
-	desc = "A wicked machine used by those skilled in magical arts. It is inactive"
+	desc = "A wicked machine used by those skilled in magical arts. It is inactive."
+
+/obj/structure/constructshell/cultify()
+	return
+
+/obj/structure/constructshell/cult
+	icon_state = "construct-cult"
+	desc = "This eerie contraption looks like it would come alive if supplied with a missing ingredient."
 
 /obj/structure/constructshell/attackby(obj/item/O as obj, mob/user as mob)
 	if(istype(O, /obj/item/device/soulstone))

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -46,4 +46,4 @@
 	if(istype(L))
 		if(prob(12))
 			L.Weaken(3)
-			L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
+			L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")

code/modules/mob/living/simple_animal/parrot.dm

@@ -714,7 +714,7 @@
 	if(message_mode)
 		if(message_mode in radiochannels)
 			if(ears && istype(ears,/obj/item/device/radio))
-				ears.talk_into(src,message, message_mode, verb, null)
+				ears.talk_into(src,sanitize(message), message_mode, verb, null)
 
 
 	..(message)

code/modules/mob/living/simple_animal/shade.dm

@@ -30,6 +30,14 @@
 
 /mob/living/simple_animal/shade/Life()
 	..()
+	OnDeathInLife()
+
+/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+	if(istype(O, /obj/item/device/soulstone))
+		O.transfer_soul("SHADE", src, user)
+		return
+
+/mob/living/simple_animal/shade/proc/OnDeathInLife()
 	if(stat == 2)
 		new /obj/item/weapon/ectoplasm (src.loc)
 		for(var/mob/M in viewers(src, null))
@@ -38,10 +46,3 @@
 				ghostize()
 		del src
 		return
-
-
-/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
-	if(istype(O, /obj/item/device/soulstone))
-		O.transfer_soul("SHADE", src, user)
-		return
-	return ..()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -350,7 +350,7 @@
 		var/obj/machinery/bot/B = target_mob
 		if(B.health > 0)
 			return (0)
-	return (1)
+	return 1
 
 //Call when target overlay should be added/removed
 /mob/living/simple_animal/update_targeted()

code/modules/mob/mob.dm

@@ -263,7 +263,6 @@
 	set name = "Add Note"
 	set category = "IC"
 
-	msg = copytext(msg, 1, MAX_MESSAGE_LEN)
 	msg = sanitize(msg)
 
 	if(mind)
@@ -732,25 +731,31 @@ note dizziness decrements automatically in the mob's Life() proc.
 		if(statpanel("Status") && processScheduler && processScheduler.getIsRunning())
 			var/datum/controller/process/process
 
-			process = processScheduler.getProcess("ticker")
-			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 			process = processScheduler.getProcess("air")
 			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-			process = processScheduler.getProcess("lighting")
-			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 			process = processScheduler.getProcess("alarm")
 			var/list/alarms = alarm_manager.active_alarms()
 			stat(null, "[getStatName(process)]([alarms.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-			process = processScheduler.getProcess("mob")
-			stat(null, "[getStatName(process)]([mob_list.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+			process = processScheduler.getProcess("disease")
+			stat(null, "[getStatName(process)]([active_diseases.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+			process = processScheduler.getProcess("garbage")
+			stat(null, "[getStatName(process)]([garbage_collector.destroyed.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
 			process = processScheduler.getProcess("machinery")
 			stat(null, "[getStatName(process)]([machines.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
+			process = processScheduler.getProcess("mob")
+			stat(null, "[getStatName(process)]([mob_list.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+			process = processScheduler.getProcess("nanoui")
+			stat(null, "[getStatName(process)]([nanomanager.processing_uis.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
+			process = processScheduler.getProcess("lighting")
+			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
 			process = processScheduler.getProcess("obj")
 			stat(null, "[getStatName(process)]([processing_objects.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
@@ -760,15 +765,12 @@ note dizziness decrements automatically in the mob's Life() proc.
 			process = processScheduler.getProcess("powernet")
 			stat(null, "[getStatName(process)]([powernets.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
-			process = processScheduler.getProcess("nanoui")
-			stat(null, "[getStatName(process)]([nanomanager.processing_uis.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
-			process = processScheduler.getProcess("disease")
-			stat(null, "[getStatName(process)]([active_diseases.len])\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
-
 			process = processScheduler.getProcess("sun")
 			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
 
+			process = processScheduler.getProcess("ticker")
+			stat(null, "[getStatName(process)]\t - #[process.getTicks()]\t - [process.getLastRunTime()]")
+
 		else
 			stat(null, "processScheduler is not running.")
 
@@ -785,19 +787,6 @@ note dizziness decrements automatically in the mob's Life() proc.
 					continue
 				statpanel(listed_turf.name, null, A)
 
-	if(spell_list && spell_list.len)
-		for(var/obj/effect/proc_holder/spell/S in spell_list)
-			switch(S.charge_type)
-				if("recharge")
-					statpanel("Spells","[S.charge_counter/10.0]/[S.charge_max/10]",S)
-				if("charges")
-					statpanel("Spells","[S.charge_counter]/[S.charge_max]",S)
-				if("holdervar")
-					statpanel("Spells","[S.holder_var_type] [S.holder_var_amount]",S)
-
-
-
-
 // facing verbs
 /mob/proc/canface()
 	if(!canmove)						return 0

code/modules/mob/mob_defines.dm

@@ -29,10 +29,14 @@
 	var/obj/screen/damageoverlay = null
 	var/obj/screen/pain = null
 	var/obj/screen/gun/item/item_use_icon = null
+	var/obj/screen/gun/radio/radio_use_icon = null
 	var/obj/screen/gun/move/gun_move_icon = null
 	var/obj/screen/gun/run/gun_run_icon = null
 	var/obj/screen/gun/mode/gun_setting_icon = null
 
+	//spells hud icons - this interacts with add_spell and remove_spell
+	var/list/obj/screen/movable/spell_master/spell_masters = null
+
 	/*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob.
 	A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such.
 	The current method unnecessarily clusters up the variable list, especially for humans (although rearranging won't really clean it up a lot but the difference will be noticable for other mobs).
@@ -182,7 +186,7 @@
 	var/mob/living/carbon/LAssailant = null
 
 //Wizard mode, but can be used in other modes thanks to the brand new "Give Spell" badmin button
-	var/obj/effect/proc_holder/spell/list/spell_list = list()
+	var/spell/list/spell_list = list()
 
 //Changlings, but can be used in other modes
 //	var/obj/effect/proc_holder/changpower/list/power_list = list()

code/modules/mob/mob_helpers.dm

@@ -92,8 +92,8 @@
 
 /mob/living/silicon/ai/isAI()
 	return 1
-
-/mob/proc/isRobot()
+
+/mob/proc/isRobot()
 	return 0
 
 /mob/living/silicon/robot/isRobot()
@@ -108,6 +108,15 @@
 /mob/living/silicon/isSynthetic()
 	return 1
 
+/mob/living/carbon/human/isMonkey()
+	return istype(species, /datum/species/monkey)
+
+/mob/proc/isMonkey()
+	return 0
+
+/mob/living/carbon/human/isMonkey()
+	return istype(species, /datum/species/monkey)
+
 /proc/ispAI(A)
 	if(istype(A, /mob/living/silicon/pai))
 		return 1

code/modules/mob/new_player/new_player.dm

@@ -474,6 +474,7 @@
 
 		// Do the initial caching of the player's body icons.
 		new_character.force_update_limbs()
+		new_character.update_eyes()
 		new_character.regenerate_icons()
 
 		new_character.key = key		//Manually transfer the key to log them in