Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin

code/modules/organs/blood.dm

@@ -97,10 +97,10 @@ var/const/CE_STABLE_THRESHOLD = 0.5
 				pale = 1
 				update_icons_body()
 				var/word = pick("dizzy","woosey","faint")
-				src << "<font color='red'>You feel [word]</font>"
+				to_chat(src, "<font color='red'>You feel [word]</font>")
 			if(prob(1))
 				var/word = pick("dizzy","woosey","faint")
-				src << "<font color='red'>You feel [word]</font>"
+				to_chat(src, "<font color='red'>You feel [word]</font>")
 			if(getOxyLoss() < 20 * threshold_coef)
 				adjustOxyLoss(3 * dmg_coef)
 		else if(blood_volume >= BLOOD_VOLUME_BAD)
@@ -114,13 +114,13 @@ var/const/CE_STABLE_THRESHOLD = 0.5
 			if(prob(15))
 				Paralyse(rand(1,3))
 				var/word = pick("dizzy","woosey","faint")
-				src << "<font color='red'>You feel extremely [word]</font>"
+				to_chat(src, "<font color='red'>You feel extremely [word]</font>")
 		else if(blood_volume >= BLOOD_VOLUME_SURVIVE)
 			adjustOxyLoss(5 * dmg_coef)
 //			adjustToxLoss(3 * dmg_coef)
 			if(prob(15))
 				var/word = pick("dizzy","woosey","faint")
-				src << "<font color='red'>You feel extremely [word]</font>"
+				to_chat(src, "<font color='red'>You feel extremely [word]</font>")
 		else //Not enough blood to survive (usually)
 			if(!pale)
 				pale = 1

code/modules/organs/organ.dm

@@ -14,6 +14,7 @@ var/list/organ_cache = list()
 	var/vital							// Lose a vital limb, die immediately.
 	var/damage = 0						// Current damage to the organ
 	var/robotic = 0
+	var/stapled_nerves = FALSE
 
 	// Reference data.
 	var/mob/living/carbon/human/owner	// Current mob owning the organ.
@@ -431,6 +432,8 @@ var/list/organ_cache = list()
 		return 0
 	if(robotic && robotic < ORGAN_LIFELIKE)	//Super fancy humanlike robotics probably have sensors, or something?
 		return 0
+	if(stapled_nerves)
+		return 0
 	return 1
 
 /obj/item/organ/proc/handle_organ_mod_special(var/removed = FALSE)	// Called when created, transplanted, and removed.

code/modules/organs/organ_external.dm

@@ -25,6 +25,7 @@
 	var/burn_dam = 0                   // Actual current burn damage.
 	var/last_dam = -1                  // used in healing/processing calculations.
 	var/spread_dam = 0
+	var/thick_skin = 0                 // If a needle has a chance to fail to penetrate.
 
 	// Appearance vars.
 	var/nonsolid                       // Snowflake warning, reee. Used for slime limbs.

code/modules/organs/robolimbs.dm

@@ -123,6 +123,12 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	icon = 'icons/mob/human_races/cyberlimbs/cybersolutions/cybersolutions_alt1.dmi'
 	unavailable_to_build = 1
 
+/datum/robolimb/einstein
+	company = "Einstein Engines"
+	desc = "This limb is lightweight with a sleek design."
+	icon = 'icons/mob/human_races/cyberlimbs/einstein/einstein_main.dmi'
+	unavailable_to_build = 1
+
 /datum/robolimb/grayson
 	company = "Grayson"
 	desc = "This limb has a sturdy and heavy build to it."

code/modules/organs/subtypes/indestructible.dm

@@ -63,3 +63,9 @@
 	cannot_amputate = 1
 	cannot_break = 1
 	dislocated = -1
+
+/obj/item/organ/external/head/no_eyes/indestructible
+	cannot_gib = 1
+	cannot_amputate = 1
+	cannot_break = 1
+	dislocated = -1

code/modules/organs/subtypes/xenos.dm

@@ -137,3 +137,79 @@
 		if(ishuman(owner))
 			H = owner
 			color = H.species.blood_color
+
+
+// XENOMORPH EXTERNAL ORGANS
+
+/obj/item/organ/external/chest/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	thick_skin = TRUE
+
+/obj/item/organ/external/groin/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/arm/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/arm/right/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/leg/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/leg/right/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/foot/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/foot/right/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/hand/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/hand/right/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	stapled_nerves = TRUE
+	encased = TRUE
+	thick_skin = TRUE
+
+/obj/item/organ/external/head/unseverable/xeno
+	cannot_gib = 1
+	cannot_amputate = 1
+	thick_skin = TRUE
+	eye_icon = "blank_eyes"