Merge branch 'master' into FermiChem

code/modules/surgery/advanced/revival.dm

@@ -26,8 +26,8 @@
 	return TRUE
 
 /datum/surgery_step/revive
-	name = "repair body"
-	implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/melee/baton = 75, /obj/item/gun/energy = 60)
+	name = "electrically stimulate brain"
+	implements = list(/obj/item/twohanded/shockpaddles = 100, /obj/item/abductor/gizmo = 100, /obj/item/melee/baton = 75, /obj/item/organ/cyberimp/arm/baton = 75, /obj/item/organ/cyberimp/arm/gun/taser = 60, /obj/item/gun/energy/e_gun/advtaser = 60, /obj/item/gun/energy/taser = 60)
 	time = 120
 
 /datum/surgery_step/revive/tool_check(mob/user, obj/item/tool)

code/modules/surgery/bodyparts/bodyparts.dm

@@ -306,10 +306,10 @@
 		//body marking memes
 		var/list/colorlist = list()
 		colorlist.Cut()
-		colorlist += ReadRGB(H.dna.features["mcolor"])
-		colorlist += ReadRGB(H.dna.features["mcolor2"])
-		colorlist += ReadRGB(H.dna.features["mcolor3"])
-		colorlist += list(0,0,0)
+		colorlist += ReadRGB("[H.dna.features["mcolor"]]0")
+		colorlist += ReadRGB("[H.dna.features["mcolor2"]]0")
+		colorlist += ReadRGB("[H.dna.features["mcolor3"]]0")
+		colorlist += list(0,0,0, S.hair_alpha)
 		for(var/index=1, index<=colorlist.len, index++)
 			colorlist[index] = colorlist[index]/255
 
@@ -442,9 +442,9 @@
 		// Body markings
 		if(body_markings)
 			if(species_id == "husk")
-				marking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir)
+				marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[body_zone]", -MARKING_LAYER, image_dir)
 			else if(species_id == "husk" && use_digitigrade)
-				marking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
+				marking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_digitigrade_[use_digitigrade]_[body_zone]", -MARKING_LAYER, image_dir)
 
 			else if(!use_digitigrade)
 				marking = image('modular_citadel/icons/mob/mam_markings.dmi', "[body_markings]_[body_zone]", -MARKING_LAYER, image_dir)
@@ -459,7 +459,7 @@
 			. += aux
 			if(body_markings)
 				if(species_id == "husk")
-					auxmarking = image('modular_citadel/icons/mob/mam_markings.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
+					auxmarking = image('modular_citadel/icons/mob/markings_notmammals.dmi', "husk_[aux_zone]", -aux_layer, image_dir)
 				else
 					auxmarking = image('modular_citadel/icons/mob/mam_markings.dmi', "[body_markings]_[aux_zone]", -aux_layer, image_dir)
 				. += auxmarking
@@ -495,7 +495,6 @@
 
 
 	if(should_draw_greyscale)
-		marking.color = null
 		var/draw_color = mutation_color || species_color || (skin_tone && skintone2hex(skin_tone))
 		if(draw_color)
 			limb.color = "#[draw_color]"

code/modules/surgery/organs/autosurgeon.dm

@@ -82,6 +82,10 @@
 	uses = 1
 	starting_organ = /obj/item/organ/cyberimp/eyes/hud/medical
 
+/obj/item/autosurgeon/gloweyes
+	desc = "A single use autosurgeon that contains a set of Luminescent Eyes augments. A screwdriver can be used to remove it, but implants can't be placed back in."
+	uses = 1
+	starting_organ = /obj/item/organ/eyes/robotic/glow
 
 /obj/item/autosurgeon/thermal_eyes
 	starting_organ = /obj/item/organ/eyes/robotic/thermals

code/modules/surgery/organs/lungs.dm

@@ -9,7 +9,7 @@
 	//Breath damage
 
 	var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
-	var/safe_oxygen_max = 0
+	var/safe_oxygen_max = 50 // Too much of a good thing, in kPa as well.
 	var/safe_nitro_min = 0
 	var/safe_nitro_max = 0
 	var/safe_co2_min = 0
@@ -97,11 +97,25 @@
 
 	//Too much oxygen! //Yes, some species may not like it.
 	if(safe_oxygen_max)
-		if(O2_pp > safe_oxygen_max)
+		if((O2_pp > safe_oxygen_max) && safe_oxygen_max == 0) //I guess plasma men technically need to have a check.
 			var/ratio = (breath_gases[/datum/gas/oxygen][MOLES]/safe_oxygen_max) * 10
 			H.apply_damage_type(CLAMP(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
 			H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+
+		else if((O2_pp > safe_oxygen_max) && !(safe_oxygen_max == 0)) //Why yes, this is like too much CO2 and spahget. Dirty lizards.
+			if(!H.o2overloadtime)
+				H.o2overloadtime = world.time
+			else if(world.time - H.o2overloadtime > 120)
+				H.Dizzy(10)	// better than a minute of you're fucked KO, but certainly a wake up call. Honk.
+				H.adjustOxyLoss(3)
+				if(world.time - H.o2overloadtime > 300)
+					H.adjustOxyLoss(8)
+			if(prob(20))
+				H.emote("cough")
+			H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+
 		else
+			H.o2overloadtime = 0
 			H.clear_alert("too_much_oxy")
 
 	//Too little oxygen!
@@ -129,6 +143,7 @@
 			var/ratio = (breath_gases[/datum/gas/nitrogen][MOLES]/safe_nitro_max) * 10
 			H.apply_damage_type(CLAMP(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
 			H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
+			H.losebreath += 2
 		else
 			H.clear_alert("too_much_nitro")
 
@@ -385,6 +400,7 @@
 	icon_state = "lungs-plasma"
 
 	safe_oxygen_min = 0 //We don't breath this
+	safe_oxygen_max = 0 // Like, at all.
 	safe_toxins_min = 16 //We breath THIS!
 	safe_toxins_max = 0
 
@@ -407,7 +423,24 @@
 	icon_state = "lungs-c-u"
 	safe_toxins_max = 20
 	safe_co2_max = 20
+	safe_oxygen_max = 250
 
 	cold_level_1_threshold = 200
 	cold_level_2_threshold = 140
 	cold_level_3_threshold = 100
+
+/obj/item/organ/lungs/ashwalker
+	name = "ash lungs"
+	desc = "blackened lungs identical from specimens recovered from lavaland, unsuited to higher air pressures."
+	icon_state = "lungs-ll"
+	safe_oxygen_min = 3	//able to handle much thinner oxygen, something something ash storm adaptation
+	safe_oxygen_max = 18 // Air standard is 22kpA of O2, LL is 14kpA
+	safe_nitro_max = 28 // Air standard is 82kpA of N2, LL is 23kpA
+
+	cold_level_1_threshold = 280 // Ash Lizards can't take the cold very well, station air is only just warm enough
+	cold_level_2_threshold = 240
+	cold_level_3_threshold = 200
+
+	heat_level_1_threshold = 400 // better adapted for heat, obv. Lavaland standard is 300
+	heat_level_2_threshold = 600 // up 200 from level 1, 1000 is silly but w/e for level 3
+