Merge pull request #375 from Fox-McCloud/Thickmaterial

Thickmaterial

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

@@ -42,7 +42,7 @@
 	// Set up DNA.
 	if(!delay_ready_dna)
 		dna.ready_dna(src)
-		
+
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH
@@ -205,8 +205,8 @@
 				stat("Distribution Pressure", internal.distribute_pressure)
 		if(mind)
 			if(mind.changeling)
-				stat("Chemical Storage", mind.changeling.chem_charges)
-				stat("Genetic Damage Time", mind.changeling.geneticdamage)
+				stat("Chemical Storage", "[mind.changeling.chem_charges]/[mind.changeling.chem_storage]")
+				stat("Absorbed DNA", mind.changeling.absorbedcount)
 		if (istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_initialized)
 			stat("Energy Charge", (wear_suit:cell:charge))
 
@@ -539,8 +539,8 @@
 		if(id)
 			return id.rank ? id.rank : if_no_job
 		else
-			return if_no_id		
-		
+			return if_no_id
+
 //gets assignment from ID or ID inside PDA or PDA itself
 //Useful when player do something with computers
 /mob/living/carbon/human/proc/get_assignment(var/if_no_id = "No id", var/if_no_job = "No job")
@@ -1073,6 +1073,21 @@
 			xylophone=0
 	return
 
+/mob/living/carbon/human/can_inject(var/mob/user, var/error_msg, var/target_zone)
+	. = 1 // Default to returning true.
+	if(user && !target_zone)
+		target_zone = user.zone_sel.selecting
+	// If targeting the head, see if the head item is thin enough.
+	// If targeting anything else, see if the wear suit is thin enough.
+	if(above_neck(target_zone))
+		if(head && head.flags & THICKMATERIAL)
+			. = 0
+	else
+		if(wear_suit && wear_suit.flags & THICKMATERIAL)
+			. = 0
+	if(!. && error_msg && user)
+		// Might need re-wording.
+		user << "<span class='alert'>There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"].</span>"
 
 /mob/living/carbon/human/proc/vomit(hairball=0)
 	if(stat==2)return
@@ -1301,7 +1316,7 @@
 		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
 
 /mob/living/carbon/human/proc/set_species(var/new_species, var/force_organs, var/default_colour)
-	
+
 	var/datum/species/oldspecies = species
 	if(!dna)
 		if(!new_species)
@@ -1318,26 +1333,26 @@
 
 		if(species.language)
 			remove_language(species.language)
-			
+
 		if(species.default_language)
-			remove_language(species.default_language)	
-			
+			remove_language(species.default_language)
+
 	species = all_species[new_species]
-	
+
 	if(oldspecies)
 		if(oldspecies.default_genes.len)
 			oldspecies.handle_dna(src,1) // Remove any genes that belong to the old species
 
 	if(force_organs || !organs || !organs.len)
 		species.create_organs(src)
-		
+
 	if(vessel)
 		vessel = null
 	make_blood()
 
 	if(species.language)
 		add_language(species.language)
-		
+
 	if(species.default_language)
 		add_language(species.default_language)
 
@@ -1359,7 +1374,7 @@
 		r_skin = 0
 		g_skin = 0
 		b_skin = 0
-		
+
 	if(!dna)
 		dna = new /datum/dna(null)
 		dna.species = species.name

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

@@ -124,6 +124,11 @@
 /mob/living/silicon/proc/damage_mob(var/brute = 0, var/fire = 0, var/tox = 0)
 	return
 
+/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
+	if(error_msg)
+		user << "<span class='alert'>Their outer shell is too tough.</span>"
+	return 0
+
 /mob/living/silicon/IsAdvancedToolUser()
 	return 1
 
@@ -207,7 +212,7 @@
 		show_emergency_shuttle_eta()
 		show_system_integrity()
 		show_malf_ai()
-		
+
 //Silicon mob language procs
 
 /mob/living/silicon/can_speak(datum/language/speaking)
@@ -290,7 +295,7 @@
 	set category = "IC"
 
 	flavor_text =  sanitize(copytext(input(usr, "Please enter your new flavour text.", "Flavour text", null)  as text, 1))
-	
+
 /mob/living/silicon/binarycheck()
 	return 1
 

code/modules/mob/mob_helpers.dm

@@ -213,6 +213,13 @@ proc/hassensorlevel(A, var/level)
 
 	return zone
 
+/proc/above_neck(zone)
+	var/list/zones = list("head", "mouth", "eyes")
+	if(zones.Find(zone))
+		return 1
+	else
+		return 0
+
 /proc/stars(n, pr)
 	if (pr == null)
 		pr = 25
@@ -491,4 +498,4 @@ var/list/intents = list("help","disarm","grab","harm")
 					else										// Everyone else (dead people who didn't ghost yet, etc.)
 						lname = name
 				lname = "<span class='name'>[lname]</span> "
-			M << "<span class='deadsay'>[lname][follow][message]</span>"
+			M << "<span class='deadsay'>[lname][follow][message]</span>"