Merge pull request #4913 from Zuhayr/master

Changeling, nymph and robot fixes.

code/game/gamemodes/changeling/changeling.dm

@@ -215,6 +215,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"
 
 /datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind)
 	var/list/absorbed_dna = list()
+	var/list/absorbed_species = list()
+	var/list/absorbed_languages = list()
 	var/absorbedcount = 0
 	var/chem_charges = 20
 	var/chem_recharge_rate = 0.5

code/game/gamemodes/changeling/changeling_powers.dm

@@ -1,5 +1,6 @@
 //Restores our verbs. It will only restore verbs allowed during lesser (monkey) form if we are not human
 /mob/proc/make_changeling()
+
 	if(!mind)				return
 	if(!mind.changeling)	mind.changeling = new /datum/changeling(gender)
 	verbs += /datum/changeling/proc/EvolutionMenu
@@ -23,6 +24,15 @@
 				src.verbs += P.verbpath
 
 	mind.changeling.absorbed_dna |= dna
+
+	var/mob/living/carbon/human/H = src
+	if(istype(H))
+		mind.changeling.absorbed_species += H.species.name
+
+	for(var/language in languages)
+		if(!(language in mind.changeling.absorbed_languages))
+			mind.changeling.absorbed_languages += language
+
 	return 1
 
 //removes our changeling verbs
@@ -63,6 +73,54 @@
 	return changeling
 
 
+//Used to dump the languages from the changeling datum into the actual mob.
+/mob/proc/changeling_update_languages(var/updated_languages)
+
+	languages = list()
+	for(var/language in updated_languages)
+		languages += language
+
+	return
+
+//Used to switch species based on the changeling datum.
+/mob/proc/changeling_change_species()
+
+	set category = "Changeling"
+	set name = "Change Species (5)"
+
+	var/mob/living/carbon/human/H = src
+	if(!istype(H))
+		src << "<span class='warning'>We may only use this power while in humanoid form.</span>"
+		return
+
+	var/datum/changeling/changeling = changeling_power(5,1,0)
+	if(!changeling)	return
+
+	if(changeling.absorbed_species.len < 2)
+		src << "<span class='warning'>We do not know of any other species genomes to use.</span>"
+		return
+
+	var/S = input("Select the target species: ", "Target Species", null) as null|anything in changeling.absorbed_species
+	if(!S)	return
+
+	domutcheck(src, null)
+
+	changeling.chem_charges -= 5
+	changeling.geneticdamage = 30
+
+	src.visible_message("<span class='warning'>[src] transforms!</span>")
+
+	src.verbs -= /mob/proc/changeling_change_species
+	spawn(10)	src.verbs += /mob/proc/changeling_change_species
+
+	H.set_species(S)
+
+	changeling_update_languages(changeling.absorbed_languages)
+
+	feedback_add_details("changeling_powers","TR")
+
+	return 1
+
 //Absorbs the victim's DNA making them uncloneable. Requires a strong grip on the victim.
 //Doesn't cost anything as it's the most basic ability.
 /mob/proc/changeling_absorb_dna()
@@ -82,6 +140,10 @@
 		src << "<span class='warning'>[T] is not compatible with our biology.</span>"
 		return
 
+	if(T.species.flags & NO_SCAN)
+		src << "<span class='warning'>We do not know how to parse this creature's DNA!</span>"
+		return
+
 	if(NOCLONE in T.mutations)
 		src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
 		return
@@ -127,6 +189,17 @@
 	changeling.chem_charges += 10
 	changeling.geneticpoints += 2
 
+	//Steal all of their languages!
+	for(var/language in T.languages)
+		if(!(language in changeling.absorbed_languages))
+			changeling.absorbed_languages += language
+
+	changeling_update_languages(changeling.absorbed_languages)
+
+	//Steal their species!
+	if(T.species && !(T.species.name in changeling.absorbed_species))
+		changeling.absorbed_species += T.species.name
+
 	if(T.mind && T.mind.changeling)
 		if(T.mind.changeling.absorbed_dna)
 			for(var/dna_data in T.mind.changeling.absorbed_dna)	//steal all their loot
@@ -260,6 +333,8 @@
 
 	O.make_changeling(1)
 	O.verbs += /mob/proc/changeling_lesser_transform
+	O.changeling_update_languages(changeling.absorbed_languages)
+
 	feedback_add_details("changeling_powers","LF")
 	del(C)
 	return 1
@@ -344,6 +419,7 @@
 
 	C.mind.transfer_to(O)
 	O.make_changeling()
+	O.changeling_update_languages(changeling.absorbed_languages)
 
 	feedback_add_details("changeling_powers","LFT")
 	del(C)

code/game/gamemodes/changeling/modularchangling.dm

@@ -26,6 +26,12 @@ var/list/datum/power/changeling/powerinstances = list()
 	genomecost = 0
 	verbpath = /mob/proc/changeling_transform
 
+/datum/power/changeling/change_species
+	name = "Change Species"
+	desc = "We take on the apperance of a species that we have absorbed."
+	genomecost = 0
+	verbpath = /mob/proc/changeling_change_species
+
 /datum/power/changeling/fakedeath
 	name = "Regenerative Stasis"
 	desc = "We become weakened to a death-like state, where we will rise again from death."

code/game/machinery/adv_med.dm

@@ -282,6 +282,7 @@
 					dat += "</tr>"
 
 					for(var/datum/organ/external/e in occupant.organs)
+
 						dat += "<tr>"
 						var/AN = ""
 						var/open = ""
@@ -307,13 +308,15 @@
 							robot = "Prosthetic:"
 						if(e.open)
 							open = "Open:"
+
 						var/unknown_body = 0
 						for(var/I in e.implants)
 							if(is_type_in_list(I,known_implants))
 								imp += "[I] implanted:"
 							else
 								unknown_body++
-						if(unknown_body)
+
+						if(unknown_body || e.hidden)
 							imp += "Unknown body present:"
 						if(!AN && !open && !infected & !imp)
 							AN = "None:"

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

@@ -21,20 +21,20 @@
 	processing_objects.Add(src)
 
 /obj/item/weapon/holder/Del()
-	//Hopefully this will stop the icon from remaining on human mobs.
-	if(istype(loc,/mob/living))
-		var/mob/living/A = src.loc
-		src.loc = null
-		A.update_icons()
 	processing_objects.Remove(src)
 	..()
 
 /obj/item/weapon/holder/process()
-	if(!loc) del(src)
 
 	if(istype(loc,/turf) || !(contents.len))
+
 		for(var/mob/M in contents)
-			M.loc = get_turf(src)
+
+			var/atom/movable/mob_container
+			mob_container = M
+			mob_container.forceMove(get_turf(src))
+			M.reset_view()
+
 		del(src)
 
 /obj/item/weapon/holder/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -188,7 +188,7 @@
 		return
 
 	src.split()
-	src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark and twigs!","\red You begin to shift and quiver, then erupt in a shower of shed bark and twigs, attaining your adult form!")
+	src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","\red You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.")
 
 	var/mob/living/carbon/human/adult = new(get_turf(src.loc))
 	adult.set_species("Diona")

code/modules/mob/living/living.dm

@@ -312,7 +312,7 @@
 
 	// make the icons look correct
 	regenerate_icons()
-	
+
 	hud_updateflag |= 1 << HEALTH_HUD
 	hud_updateflag |= 1 << STATUS_HUD
 	return
@@ -447,9 +447,14 @@
 
 	//Getting out of someone's inventory.
 	if(istype(src.loc,/obj/item/weapon/holder))
-		var/obj/item/weapon/holder/H = src.loc
-		src.loc = get_turf(src.loc)
-		del(H)
+		var/obj/item/weapon/holder/H = src.loc //Get our item holder.
+		var/mob/M = H.loc                      //Get our mob holder (if any).
+
+		if(istype(M))
+			M.drop_from_inventory(H)
+			M << "[H] wriggles out of your grip!"
+			src << "You wriggle out of [M]'s grip!"
+
 		return
 
 	//Resisting control by an alien mind.

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

@@ -135,7 +135,8 @@
 	icon_state = "working"
 	construction_time = 200
 	construction_cost = list("metal"=5000)
-
+	var/brute = 0
+	var/burn = 0
 
 // TODO: actual icons ;)
 /obj/item/robot_parts/robot_component/binary_communication_device

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

@@ -127,7 +127,7 @@
 		var/datum/robot_component/cell_component = components["power cell"]
 		cell_component.wrapped = cell
 		cell_component.installed = 1
-	
+
 	hud_list[HEALTH_HUD]      = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[STATUS_HUD]      = image('icons/mob/hud.dmi', src, "hudhealth100")
 	hud_list[ID_HUD]          = image('icons/mob/hud.dmi', src, "hudblank")
@@ -136,9 +136,9 @@
 	hud_list[IMPCHEM_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[IMPTRACK_HUD]    = image('icons/mob/hud.dmi', src, "hudblank")
 	hud_list[SPECIALROLE_HUD] = image('icons/mob/hud.dmi', src, "hudblank")
-	
 
-	
+
+
 
 	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
 
@@ -579,6 +579,14 @@
 				user.drop_item()
 				W.loc = null
 
+				var/obj/item/robot_parts/robot_component/WC = W
+				if(istype(WC))
+					C.brute_damage = WC.brute
+					C.electronics_damage = WC.burn
+				else //This will nominally mean that removing and replacing a power cell will repair the mount, but I don't care at this point. ~Z
+					C.brute_damage = 0
+					C.electronics_damage = 0
+
 				usr << "\blue You install the [W.name]."
 
 				return
@@ -641,8 +649,12 @@
 				if(!remove)
 					return
 				var/datum/robot_component/C = components[remove]
-				var/obj/item/I = C.wrapped
+				var/obj/item/robot_parts/robot_component/I = C.wrapped
 				user << "You remove \the [I]."
+				if(istype(I))
+					I.brute = C.brute_damage
+					I.burn = C.electronics_damage
+
 				I.loc = src.loc
 
 				if(C.installed == 1)

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

@@ -113,8 +113,17 @@
 	return 1
 
 /mob/living/silicon/bullet_act(var/obj/item/projectile/Proj)
-	if(!Proj.nodamage)	adjustBruteLoss(Proj.damage)
+
+
+	if(!Proj.nodamage)
+		switch(Proj.damage_type)
+			if(BRUTE)
+				adjustBruteLoss(Proj.damage)
+			if(BURN)
+				adjustFireLoss(Proj.damage)
+
 	Proj.on_hit(src,2)
+
 	return 2
 
 /mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0)