Merge pull request #3918 from Nanai/dev

Yinadele lodesofcoed

code/modules/client/preferences.dm

@@ -262,6 +262,7 @@ datum/preferences
 		//dat += "Skin pattern: <a href='byond://?src=\ref[user];preference=skin_style;task=input'>Adjust</a><br>"
 		dat += "Needs Glasses: <a href='?_src_=prefs;preference=disabilities'><b>[disabilities == 0 ? "No" : "Yes"]</b></a><br>"
 		dat += "Limbs: <a href='byond://?src=\ref[user];preference=limbs;task=input'>Adjust</a><br>"
+		dat += "Internal Organs: <a href='byond://?src=\ref[user];preference=organs;task=input'>Adjust</a><br>"
 
 		//display limbs below
 		var/ind = 0
@@ -286,6 +287,10 @@ datum/preferences
 					organ_name = "left hand"
 				if("r_hand")
 					organ_name = "right hand"
+				if("heart")
+					organ_name = "heart"
+				if("eyes")
+					organ_name = "eyes"
 
 			if(status == "cyborg")
 				++ind
@@ -297,6 +302,24 @@ datum/preferences
 				if(ind > 1)
 					dat += ", "
 				dat += "\tAmputated [organ_name]"
+			else if(status == "mechanical")
+				++ind
+				if(ind > 1)
+					dat += ", "
+				dat += "\tMechanical [organ_name]"
+			else if(status == "assisted")
+				++ind
+				if(ind > 1)
+					dat += ", "
+				switch(organ_name)
+					if("heart")
+						dat += "\tPacemaker-assisted [organ_name]"
+					if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
+						dat += "\tSurgically altered [organ_name]"
+					if("eyes")
+						dat += "\tRetinal overlayed [organ_name]"
+					else
+						dat += "\tMechanically assisted [organ_name]"
 		if(!ind)
 			dat += "\[...\]<br><br>"
 		else
@@ -1048,6 +1071,28 @@ datum/preferences
 								if(second_limb)
 									organ_data[second_limb] = "cyborg"
 
+					if("organs")
+						var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes")
+						if(!organ_name) return
+
+						var/organ = null
+						switch(organ_name)
+							if("Heart")
+								organ = "heart"
+							if("Eyes")
+								organ = "eyes"
+
+						var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal","Assisted","Mechanical")
+						if(!new_state) return
+
+						switch(new_state)
+							if("Normal")
+								organ_data[organ] = null
+							if("Assisted")
+								organ_data[organ] = "assisted"
+							if("Mechanical")
+								organ_data[organ] = "mechanical"
+
 					if("skin_style")
 						var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
 						if(!skin_style_name) return
@@ -1167,19 +1212,27 @@ datum/preferences
 		character.skills = skills
 
 		// Destroy/cyborgize organs
+
 		for(var/name in organ_data)
 			var/datum/organ/external/O = character.organs_by_name[name]
-			if(!O) continue
-
+			var/datum/organ/internal/I = character.internal_organs_by_name[name]
 			var/status = organ_data[name]
+
 			if(status == "amputated")
 				O.amputated = 1
 				O.status |= ORGAN_DESTROYED
 				O.destspawn = 1
-			else if(status == "cyborg")
+			if(status == "cyborg")
 				O.status |= ORGAN_ROBOT
+			if(status == "assisted")
+				I.mechassist()
+			else if(status == "mechanical")
+				I.mechanize()
+
+			else continue
+
 		if(underwear > underwear_m.len || underwear < 1)
-			underwear = 1 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me.
+			underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES
 		character.underwear = underwear
 
 		if(backbag > 4 || backbag < 1)

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

@@ -159,6 +159,9 @@ emp_act
 	for(var/datum/organ/external/O  in organs)
 		if(O.status & ORGAN_DESTROYED)	continue
 		O.emp_act(severity)
+		for(var/datum/organ/internal/I  in O.internal_organs)
+			if(I.robotic == 0)	continue
+			I.emp_act(severity)
 	..()
 
 

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

@@ -21,7 +21,7 @@
 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
 
 	var/age = 30		//Player's age (pure fluff)
-	var/b_type = "A+"	//Player's bloodtype (Not currently used, just character fluff)
+	var/b_type = "A+"	//Player's bloodtype
 
 	var/underwear = 1	//Which underwear the player wants
 	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.

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

@@ -960,6 +960,9 @@
 		var/datum/organ/internal/liver/liver = internal_organs["liver"]
 		liver.process()
 
+		var/datum/organ/internal/eyes/eyes = internal_organs["eyes"]
+		eyes.process()
+
 		updatehealth()
 
 		return //TODO: DEFERRED
@@ -1335,10 +1338,6 @@
 				if(!O.up && tinted_weldhelh)
 					client.screen += global_hud.darkMask
 
-			if(eye_stat > 20)
-				if(eye_stat > 30)	client.screen += global_hud.darkMask
-				else				client.screen += global_hud.vimpaired
-
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)
 			else
@@ -1496,6 +1495,15 @@
 				if(temp <= PULSE_FAST && temp >= PULSE_NONE)
 					temp++
 					break
+		for(var/datum/reagent/R in reagents.reagent_list) //To avoid using fakedeath
+			if(R.id in heartstopper)
+				temp = PULSE_NONE
+				break
+		for(var/datum/reagent/R in reagents.reagent_list) //Conditional heart-stoppage
+			if(R.id in cheartstopper)
+				if(R.volume >= R.overdose)
+					temp = PULSE_NONE
+					break
 
 		return temp
 

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

@@ -15,10 +15,14 @@
 		src.traumatic_shock -= 10
 	if(reagents.has_reagent("inaprovaline"))
 		src.traumatic_shock -= 25
+	if(reagents.has_reagent("synaptizine"))
+		src.traumatic_shock -= 40
+	if(reagents.has_reagent("paracetamol"))
+		src.traumatic_shock -= 50
 	if(reagents.has_reagent("tramadol"))
-		src.traumatic_shock -= 80 // make synaptizine function as good painkiller
+		src.traumatic_shock -= 80
 	if(reagents.has_reagent("oxycodone"))
-		src.traumatic_shock -= 200 // make synaptizine function as good painkiller
+		src.traumatic_shock -= 200
 	if(src.slurring)
 		src.traumatic_shock -= 20
 	if(src.analgesic)

code/modules/mob/living/living.dm

@@ -280,7 +280,6 @@
 	blinded = 0
 	eye_blind = 0
 	eye_blurry = 0
-	eye_stat = 0
 	ear_deaf = 0
 	ear_damage = 0
 	heal_overall_damage(getBruteLoss(), getFireLoss())

code/modules/mob/mob_defines.dm

@@ -81,7 +81,6 @@
 	var/lying = 0
 	var/lying_prev = 0
 	var/canmove = 1
-	var/eye_stat = null//Living, potentially Carbon
 	var/lastpuke = 0
 	var/unacidable = 0
 	var/small = 0

code/modules/mob/new_player/sprite_accessories.dm

@@ -114,6 +114,11 @@
 		name = "Ponytail 3"
 		icon_state = "hair_ponytail3"
 
+	sideponytail
+		name = "Side Ponytail"
+		icon_state = "hair_stail"
+		gender = FEMALE
+
 	parted
 		name = "Parted"
 		icon_state = "hair_parted"
@@ -241,6 +246,11 @@
 		icon_state = "hair_gelled"
 		gender = FEMALE
 
+	gentle
+		name = "Gentle"
+		icon_state = "hair_gentle"
+		gender = FEMALE
+
 	spiky
 		name = "Spiky"
 		icon_state = "hair_spikey"
@@ -264,6 +274,11 @@
 		icon_state = "hair_braid"
 		gender = FEMALE
 
+	braid2
+		name = "Long Braid"
+		icon_state = "hair_hbraid"
+		gender = FEMALE
+
 	odango
 		name = "Odango"
 		icon_state = "hair_odango"
@@ -469,6 +484,18 @@
 		species_allowed = list("Tajaran")
 		do_colouration = 0
 
+	taj_ears_bangs
+		name = "Tajara Bangs"
+		icon_state = "hair_bangs"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
+	taj_ears_braid
+		name = "Tajara Braid"
+		icon_state = "hair_tbraid"
+		species_allowed = list("Tajaran")
+		do_colouration = 0
+
 	taj_ears_shaggy
 		name = "Tajara Shaggy"
 		icon_state = "hair_shaggy"

code/modules/organs/blood.dm

@@ -55,11 +55,11 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 		// being pumped properly anymore.
 		var/datum/organ/internal/heart/heart = internal_organs["heart"]
 		switch(heart.damage)
-			if(5 to 10)
+			if(1 to heart.min_bruised_damage)
 				blood_volume *= 0.8
-			if(11 to 20)
-				blood_volume *= 0.5
-			if(21 to INFINITY)
+			if(heart.min_bruised_damage to heart.min_broken_damage)
+				blood_volume *= 0.6
+			if(heart.min_broken_damage to INFINITY)
 				blood_volume *= 0.3
 
 		//Effects of bloodloss
@@ -93,7 +93,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					src << "\red You feel extremely [word]"
 			if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
 				oxyloss += 5
-				toxloss += 5
+				toxloss += 3
 				if(prob(15))
 					var/word = pick("dizzy","woosey","faint")
 					src << "\red You feel extremely [word]"

code/modules/organs/organ.dm

@@ -35,6 +35,7 @@
 
 /mob/living/carbon/human/var/list/organs = list()
 /mob/living/carbon/human/var/list/organs_by_name = list() // map organ names to organs
+/mob/living/carbon/human/var/list/internal_organs_by_name = list() // so internal organs have less ickiness too
 
 //Creates and initializes and connects external and internal organs
 /mob/living/carbon/human/proc/make_organs()
@@ -51,11 +52,12 @@
 	organs_by_name["l_foot"] = new/datum/organ/external/l_foot(organs_by_name["l_leg"])
 	organs_by_name["r_foot"] = new/datum/organ/external/r_foot(organs_by_name["r_leg"])
 
-	new/datum/organ/internal/heart(src)
-	new/datum/organ/internal/lungs(src)
-	new/datum/organ/internal/liver(src)
-	new/datum/organ/internal/kidney(src)
-	new/datum/organ/internal/brain(src)
+	internal_organs_by_name["heart"] = new/datum/organ/internal/heart(src)
+	internal_organs_by_name["lungs"] = new/datum/organ/internal/lungs(src)
+	internal_organs_by_name["liver"] = new/datum/organ/internal/liver(src)
+	internal_organs_by_name["kidney"] = new/datum/organ/internal/kidney(src)
+	internal_organs_by_name["brain"] = new/datum/organ/internal/brain(src)
+	internal_organs_by_name["eyes"] = new/datum/organ/internal/eyes(src)
 
 	for(var/name in organs_by_name)
 		organs += organs_by_name[name]

code/modules/organs/organ_external.dm

@@ -45,6 +45,7 @@
 	// how often wounds should be updated, a higher number means less often
 	var/wound_update_accuracy = 1
 
+
 /datum/organ/external/New(var/datum/organ/external/P)
 	if(P)
 		parent = P
@@ -297,6 +298,11 @@ This function completely restores a damaged organ to perfect condition.
 #define GANGREN_LEVEL_TERMINAL	2500
 #define GERM_TRANSFER_AMOUNT	germ_level/500
 /datum/organ/external/proc/update_germs()
+
+	if(status & ORGAN_ROBOT|ORGAN_DESTROYED) //Robotic limbs shouldn't be infected, nor should nonexistant limbs.
+		germ_level = 0
+		return
+
 	if(germ_level > 0 && owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
 		//Syncing germ levels with external wounds
 		for(var/datum/wound/W in wounds)
@@ -346,6 +352,9 @@ This function completely restores a damaged organ to perfect condition.
 			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
+			if(!owner.reagents.has_reagent("inaprovaline")) //This little copypaste will allow inaprovaline to work too, giving it a much needed buff to help medical.
+				W.open_wound(0.1 * wound_update_accuracy)
+				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 
 			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
 			if(prob(1 * wound_update_accuracy))

code/modules/organs/organ_internal.dm

@@ -5,15 +5,15 @@
 /mob/living/carbon/human/var/list/internal_organs = list()
 
 /datum/organ/internal
-	// amount of damage to the organ
-	var/damage = 0
+	var/damage = 0 // amount of damage to the organ
 	var/min_bruised_damage = 10
 	var/min_broken_damage = 30
 	var/parent_organ = "chest"
+	var/robotic = 0 //For being a robot
 
 /datum/organ/internal/proc/rejuvenate()
 	damage=0
-	
+
 /datum/organ/internal/proc/is_bruised()
 	return damage >= min_bruised_damage
 
@@ -31,12 +31,51 @@
 	src.owner = H
 
 /datum/organ/internal/proc/take_damage(amount, var/silent=0)
-	src.damage += amount
+	if(src.robotic == 2)
+		src.damage += (amount * 0.8)
+	else
+		src.damage += amount
 
 	var/datum/organ/external/parent = owner.get_organ(parent_organ)
 	if (!silent)
 		owner.custom_pain("Something inside your [parent.display_name] hurts a lot.", 1)
 
+
+/datum/organ/internal/proc/emp_act(severity)
+	switch(robotic)
+		if(0)
+			return
+		if(1)
+			switch (severity)
+				if (1.0)
+					take_damage(20,0)
+					return
+				if (2.0)
+					take_damage(7,0)
+					return
+				if(3.0)
+					take_damage(3,0)
+					return
+		if(2)
+			switch (severity)
+				if (1.0)
+					take_damage(40,0)
+					return
+				if (2.0)
+					take_damage(15,0)
+					return
+				if(3.0)
+					take_damage(10,0)
+					return
+
+/datum/organ/internal/proc/mechanize() //Being used to make robutt hearts, etc
+	robotic = 2
+
+/datum/organ/internal/proc/mechassist() //Used to add things like pacemakers, etc
+	robotic = 1
+	min_bruised_damage = 15
+	min_broken_damage = 35
+
 /****************************************************
 				INTERNAL ORGANS DEFINES
 ****************************************************/
@@ -102,4 +141,14 @@
 
 /datum/organ/internal/brain
 	name = "brain"
-	parent_organ = "head"
+	parent_organ = "head"
+
+/datum/organ/internal/eyes
+	name = "eyes"
+	parent_organ = "head"
+
+	process() //Eye damage replaces the old eye_stat var.
+		if(is_bruised())
+			owner.eye_blurry = 20
+		if(is_broken())
+			owner.eye_blind = 20

code/modules/organs/pain.dm

@@ -9,6 +9,8 @@ mob/var/next_pain_time = 0
 // amount is a num from 1 to 100
 mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
 	if(stat >= 2) return
+	if(reagents.has_reagent("paracetamol"))
+		return
 	if(reagents.has_reagent("tramadol"))
 		return
 	if(reagents.has_reagent("oxycodone"))

code/modules/reagents/Chemistry-Reagents.dm

@@ -731,13 +731,29 @@ datum
 				..()
 				return
 
+		paracetamol
+			name = "Paracetamol"
+			id = "paracetamol"
+			description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
+			reagent_state = LIQUID
+			color = "#C855DC"
+			overdose = 60
+
+			on_mob_life(var/mob/living/M as mob)
+				if (volume > overdose)
+					M.hallucination = max(M.hallucination, 2)
+
 		tramadol
 			name = "Tramadol"
 			id = "tramadol"
 			description = "A simple, yet effective painkiller."
 			reagent_state = LIQUID
 			color = "#C8A5DC"
-			overdose = REAGENTS_OVERDOSE
+			overdose = 30
+
+			on_mob_life(var/mob/living/M as mob)
+				if (volume > overdose)
+					M.hallucination = max(M.hallucination, 2)
 
 		oxycodone
 			name = "Oxycodone"
@@ -745,7 +761,13 @@ datum
 			description = "An effective and very addictive painkiller."
 			reagent_state = LIQUID
 			color = "#C805DC"
-			overdose = REAGENTS_OVERDOSE
+			overdose = 20
+
+			on_mob_life(var/mob/living/M as mob)
+				if (volume > overdose)
+					M.druggy = max(M.druggy, 10)
+					M.hallucination = max(M.hallucination, 3)
+
 
 		virus_food
 			name = "Virus Food"
@@ -1025,7 +1047,7 @@ datum
 				if(M.stat == 2.0)
 					return
 				if(!M) M = holder.my_atom
-				if(M.getOxyLoss() && prob(80)) M.adjustOxyLoss(-1*REM)
+				if(M.getOxyLoss()) M.adjustOxyLoss(-1*REM)
 				if(M.getBruteLoss() && prob(80)) M.heal_organ_damage(1*REM,0)
 				if(M.getFireLoss() && prob(80)) M.heal_organ_damage(0,1*REM)
 				if(M.getToxLoss() && prob(80)) M.adjustToxLoss(-1*REM)
@@ -1069,7 +1091,6 @@ datum
 				M.sdisabilities = 0
 				M.eye_blurry = 0
 				M.eye_blind = 0
-				M.eye_stat = 0
 				M.SetWeakened(0)
 				M.SetStunned(0)
 				M.SetParalysis(0)
@@ -1189,9 +1210,31 @@ datum
 				if(!M) M = holder.my_atom
 				M.eye_blurry = max(M.eye_blurry-5 , 0)
 				M.eye_blind = max(M.eye_blind-5 , 0)
-				M.disabilities &= ~NEARSIGHTED
-				M.eye_stat = max(M.eye_stat-5, 0)
-//				M.sdisabilities &= ~1		Replaced by eye surgery
+				if(ishuman(M))
+					var/mob/living/carbon/human/H = M
+					var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
+					if(istype(E))
+						if(E.damage > 0)
+							E.damage -= 1
+				..()
+				return
+
+		peridaxon
+			name = "Peridaxon"
+			id = "peridaxon"
+			description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
+			reagent_state = LIQUID
+			color = "#C8A5DC" // rgb: 200, 165, 220
+			overdose = 10
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				if(ishuman(M))
+					var/mob/living/carbon/human/H = M
+					var/datum/organ/external/chest/C = H.get_organ("chest")
+					for(var/datum/organ/internal/I in C.internal_organs)
+						if(I.damage > 0)
+							I.damage -= 0.20
 				..()
 				return
 
@@ -1658,10 +1701,12 @@ datum
 						if(prob(5))	M.emote("yawn")
 					if(12 to 15)
 						M.eye_blurry = max(M.eye_blurry, 10)
-					if(15 to 25)
+					if(15 to 49)
+						if(prob(50))
+							M.Weaken(2)
 						M.drowsyness  = max(M.drowsyness, 20)
-					if(25 to INFINITY)
-						M.Paralyse(20)
+					if(50 to INFINITY)
+						M.Weaken(20)
 						M.drowsyness  = max(M.drowsyness, 30)
 				data++
 				..()
@@ -1673,9 +1718,10 @@ datum
 			description = "A powerful sedative."
 			reagent_state = SOLID
 			color = "#000067" // rgb: 0, 0, 103
-			toxpwr = 0
+			toxpwr = 1
 			custom_metabolism = 0.1 //Default 0.2
-			overdose = REAGENTS_OVERDOSE/2
+			overdose = 15
+			overdose_dam = 5
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
@@ -1685,11 +1731,50 @@ datum
 					if(1)
 						M.confused += 2
 						M.drowsyness += 2
-					if(2 to 50)
+					if(2 to 199)
+						M.Weaken(30)
+					if(200 to INFINITY)
 						M.sleeping += 1
-					if(51 to INFINITY)
-						M.sleeping += 1
-						M.adjustToxLoss((data - 50)*REM)
+				..()
+				return
+
+		toxin/potassium_chloride
+			name = "Potassium Chloride"
+			id = "potassium_chloride"
+			description = "A delicious salt that stops the heart when injected into cardiac muscle."
+			reagent_state = SOLID
+			color = "#FFFFFF" // rgb: 255,255,255
+			toxpwr = 0
+			overdose = 30
+
+			on_mob_life(var/mob/living/carbon/M as mob)
+				var/mob/living/carbon/human/H = M
+				if(H.stat != 1)
+					if (volume >= overdose)
+						if(H.losebreath >= 10)
+							H.losebreath = max(10, H.losebreath-10)
+						H.adjustOxyLoss(2)
+						H.Weaken(10)
+				..()
+				return
+
+		toxin/potassium_chlorophoride
+			name = "Potassium Chlorophoride"
+			id = "potassium_chlorophoride"
+			description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
+			reagent_state = SOLID
+			color = "#FFFFFF" // rgb: 255,255,255
+			toxpwr = 2
+			overdose = 20
+
+			on_mob_life(var/mob/living/carbon/M as mob)
+				if(ishuman(M))
+					var/mob/living/carbon/human/H = M
+					if(H.stat != 1)
+						if(H.losebreath >= 10)
+							H.losebreath = max(10, M.losebreath-10)
+						H.adjustOxyLoss(2)
+						H.Weaken(10)
 				..()
 				return
 
@@ -2347,7 +2432,7 @@ datum
 			id = "grapejuice"
 			description = "It's grrrrrape!"
 			color = "#863333" // rgb: 134, 51, 51
-		
+
 		drink/grapesoda
 			name = "Grape Soda"
 			id = "grapesoda"
@@ -3054,29 +3139,29 @@ datum
 				switch(data)
 					if(1 to 25)
 						if (!M.stuttering) M.stuttering = 1
-						M.make_dizzy(10)
+						M.make_dizzy(1)
 						M.hallucination = max(M.hallucination, 3)
 						if(prob(1)) M.emote(pick("twitch","giggle"))
 					if(25 to 75)
 						if (!M.stuttering) M.stuttering = 1
 						M.hallucination = max(M.hallucination, 10)
-						M.make_jittery(20)
-						M.make_dizzy(20)
+						M.make_jittery(2)
+						M.make_dizzy(2)
 						M.druggy = max(M.druggy, 45)
 						if(prob(5)) M.emote(pick("twitch","giggle"))
 					if (75 to 150)
 						if (!M.stuttering) M.stuttering = 1
 						M.hallucination = max(M.hallucination, 60)
-						M.make_jittery(40)
-						M.make_dizzy(40)
+						M.make_jittery(4)
+						M.make_dizzy(4)
 						M.druggy = max(M.druggy, 60)
 						if(prob(10)) M.emote(pick("twitch","giggle"))
 						if(prob(30)) M.adjustToxLoss(2)
 					if (150 to 300)
 						if (!M.stuttering) M.stuttering = 1
 						M.hallucination = max(M.hallucination, 60)
-						M.make_jittery(40)
-						M.make_dizzy(40)
+						M.make_jittery(4)
+						M.make_dizzy(4)
 						M.druggy = max(M.druggy, 60)
 						if(prob(10)) M.emote(pick("twitch","giggle"))
 						if(prob(30)) M.adjustToxLoss(2)

code/modules/reagents/Chemistry-Recipes.dm

@@ -105,11 +105,19 @@ datum
 			required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
 			result_amount = 3
 
+		paracetamol
+			name = "Paracetamol"
+			id = "paracetamol"
+			result = "paracetamol"
+			required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
+			result_amount = 3
+
 		oxycodone
 			name = "Oxycodone"
 			id = "oxycodone"
 			result = "oxycodone"
-			required_reagents = list("ethanol" = 1, "tramadol" = 1, "plasma" = 1)
+			required_reagents = list("ethanol" = 1, "tramadol" = 1)
+			required_catalysts = list("plasma" = 1)
 			result_amount = 1
 
 		//cyanide
@@ -119,6 +127,13 @@ datum
 		//	required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1)
 		//	result_amount = 1
 
+		water //I can't believe we never had this.
+			name = "Water"
+			id = "water"
+			result = null
+			required_reagents = list("oxygen" = 2, "hydrogen" = 1)
+			result_amount = 1
+
 		thermite
 			name = "Thermite"
 			id = "thermite"
@@ -189,6 +204,14 @@ datum
 			required_reagents = list("silicon" = 1, "carbon" = 1)
 			result_amount = 2
 
+		peridaxon
+			name = "Peridaxon"
+			id = "peridaxon"
+			result = "peridaxon"
+			required_reagents = list("bicaridine" = 2, "clonexadone" = 2)
+			required_catalysts = list("plasma" = 5)
+			result_amount = 2
+
 		virus_food
 			name = "Virus Food"
 			id = "virusfood"
@@ -451,6 +474,27 @@ datum
 			required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
 			result_amount = 1
 
+		potassium_chloride
+			name = "Potassium Chloride"
+			id = "potassium_chloride"
+			id = "potassium_chloride"
+			required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
+			result_amount = 2
+
+		potassium_chlorophoride
+			name = "Potassium Chlorophoride"
+			id = "potassium_chlorophoride"
+			id = "potassium_chlorophoride"
+			required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloral_hydrate" = 1)
+			result_amount = 4
+
+		stoxin
+			name = "Sleep Toxin"
+			id = "stoxin"
+			result = "stoxin"
+			required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
+			result_amount = 5
+
 		zombiepowder
 			name = "Zombie Powder"
 			id = "zombiepowder"
@@ -1790,7 +1834,7 @@ datum
 			result = "barefoot"
 			required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
 			result_amount = 3
-			
+
 		grapesoda //Allows Grape Soda to be made
 			name = "Grape Soda"
 			id = "grapesoda"

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -243,6 +243,50 @@
 			reagents.add_reagent("plasticide", 1+round((potency / 10), 1))
 			bitesize = 1+round(reagents.total_volume / 2, 1)
 
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/shand
+	seed = "/obj/item/seeds/shandseed"
+	name = "S'rendarr's Hand leaf"
+	desc = "A leaf sample from a lowland thicket shrub, often hid in by prey and predator to staunch their wounds and conceal their scent, allowing the plant to spread far on it's native Ahdomai. Smells strongly like wax."
+	icon_state = "shand"
+	New()
+		..()
+		spawn(5)	//So potency can be set in the proc that creates these crops
+			reagents.add_reagent("bicaridine", round((potency / 10), 1))
+			bitesize = 1+round(reagents.total_volume / 2, 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/mtear
+	seed = "/obj/item/seeds/mtearseed"
+	name = "sprig of Messa's Tear"
+	desc = "A mountain climate herb with a soft, cold blue flower, known to contain an abundance of chemicals in it's flower useful to treating burns- Bad for the allergic to pollen."
+	icon_state = "mtear"
+	New()
+		..()
+		spawn(5)	//So potency can be set in the proc that creates these crops
+			reagents.add_reagent("honey", 1+round((potency / 10), 1))
+			reagents.add_reagent("kelotane", 3+round((potency / 5), 1))
+			bitesize = 1+round(reagents.total_volume / 2, 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/mtear/attack_self(mob/user as mob)
+	if(istype(user.loc,/turf/space))
+		return
+	var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc)
+
+	poultice.heal_burn = potency
+	del(src)
+
+	user << "<span class='notice'>You mash the petals into a poultice.</span>"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/shand/attack_self(mob/user as mob)
+	if(istype(user.loc,/turf/space))
+		return
+	var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc)
+
+	poultice.heal_brute = potency
+	del(src)
+
+	user << "<span class='notice'>You mash the leaves into a poultice.</span>"
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries
 	seed = "/obj/item/seeds/glowberryseed"
 	name = "bunch of glow-berries"

code/modules/reagents/reagent_containers/pill.dm

@@ -131,6 +131,14 @@
 		..()
 		reagents.add_reagent("kelotane", 15)
 
+/obj/item/weapon/reagent_containers/pill/paracetamol
+	name = "Paracetamol pill"
+	desc = "Tylenol! A painkiller for the ages. Chewables!"
+	icon_state = "pill8"
+	New()
+		..()
+		reagents.add_reagent("paracetamol", 15)
+
 /obj/item/weapon/reagent_containers/pill/tramadol
 	name = "Tramadol pill"
 	desc = "A simple painkiller."

code/modules/surgery/eye.dm

@@ -36,12 +36,15 @@
 		user.visible_message("\blue [user] has separated the corneas on [target]'s eyes with \the [tool]." , \
 		"\blue You have separated the corneas on [target]'s eyes with \the [tool].",)
 		target.op_stage.eyes = 1
+		target.blinded += 1.5
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"]
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, slicing [target]'s eyes wth \the [tool]!" , \
 		"\red Your hand slips, slicing [target]'s eyes wth \the [tool]!" )
 		affected.createwound(CUT, 10)
+		eyes.take_damage(5, 0)
 
 /datum/surgery_step/eye/lift_eyes
 	allowed_tools = list(
@@ -66,10 +69,12 @@
 		target.op_stage.eyes = 2
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"]
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, damaging [target]'s eyes with \the [tool]!", \
 		"\red Your hand slips, damaging [target]'s eyes with \the [tool]!")
 		target.apply_damage(10, BRUTE, affected)
+		eyes.take_damage(5, 0)
 
 /datum/surgery_step/eye/mend_eyes
 	allowed_tools = list(
@@ -95,10 +100,12 @@
 		target.op_stage.eyes = 3
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"]
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips, stabbing \the [tool] into [target]'s eye!", \
 		"\red Your hand slips, stabbing \the [tool] into [target]'s eye!")
 		target.apply_damage(10, BRUTE, affected)
+		eyes.take_damage(5, 0)
 
 /datum/surgery_step/eye/cauterize
 	allowed_tools = list(
@@ -119,16 +126,19 @@
 		"You are beginning to cauterize the incision around [target]'s eyes with \the [tool].")
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"]
 		user.visible_message("\blue [user] cauterizes the incision around [target]'s eyes with \the [tool].", \
 		"\blue You cauterize the incision around [target]'s eyes with \the [tool].")
 		if (target.op_stage.eyes == 3)
+			target.disabilities &= ~NEARSIGHTED
 			target.sdisabilities &= ~BLIND
-			target.eye_stat = 0
+			eyes.damage = 0
 		target.op_stage.eyes = 0
 
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/eyes/eyes = target.internal_organs["eyes"]
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\red [user]'s hand slips,  searing [target]'s eyes with \the [tool]!", \
 		"\red Your hand slips, searing [target]'s eyes with \the [tool]!")
 		target.apply_damage(5, BURN, affected)
-		target.eye_stat += 5
+		eyes.take_damage(5, 0)

code/modules/surgery/ribcage.dm

@@ -188,9 +188,9 @@
 //////////////////////////////////////////////////////////////////
 /datum/surgery_step/ribcage/fix_chest_internal
 	allowed_tools = list(
-	/obj/item/weapon/scalpel = 100,		\
-	/obj/item/weapon/kitchenknife = 75,	\
-	/obj/item/weapon/shard = 50, 		\
+	/obj/item/stack/medical/advanced/bruise_pack= 100,		\
+	/obj/item/stack/medical/bruise_pack = 20,	\
+	/obj/item/stack/medical/bruise_pack/tajaran = 70, 		\
 	)
 
 	min_duration = 70
@@ -205,54 +205,124 @@
 		return ..() && is_chest_organ_damaged && target.op_stage.ribcage == 2
 
 	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
-		var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"]
-		var/datum/organ/internal/liver/liver = target.internal_organs["liver"]
-		var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"]
+		var/tool_name = "\the [tool]"
+		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+			tool_name = "regenerative membrane"
+		if (istype(tool, /obj/item/stack/medical/bruise_pack))
+			if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran))
+				tool_name = "the poultice"
+			else
+				tool_name = "the bandaid"
+		var/datum/organ/external/chest/chest = target.get_organ("chest")
+		for(var/datum/organ/internal/I in chest.internal_organs)
+			if(I && I.damage > 0)
+				if(I.robotic < 2)
+					user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
+					"You start treating damage to [target]'s [I.name] with [tool_name]." )
+				else
+					user.visible_message("\blue [user] attempts to repair [target]'s mechanical [I.name] with [tool_name]...", \
+					"\blue You attempt to repair [target]'s mechanical [I.name] with [tool_name]...")
+
+		target.custom_pain("The pain in your chest is living hell!",1)
+		..()
+
+	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/tool_name = "\the [tool]"
+		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+			tool_name = "regenerative membrane"
+		if (istype(tool, /obj/item/stack/medical/bruise_pack))
+			if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran))
+				tool_name = "the poultice"
+			else
+				tool_name = "the bandaid"
+		var/datum/organ/external/chest/chest = target.get_organ("chest")
+		for(var/datum/organ/internal/I in chest.internal_organs)
+			if(I && I.damage > 0)
+				if(I.robotic < 2)
+					user.visible_message("[user] treats damage to [target]'s [I.name] with [tool_name].", \
+					"You treat damage to [target]'s [I.name] with [tool_name]." )
+				else
+					user.visible_message("\blue [user] pokes [target]'s mechanical [I.name] with [tool_name]...", \
+					"\blue You poke [target]'s mechanical [I.name] with [tool_name]... \red For no effect, since it's robotic.")
+				I.damage = 0
+
+	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/external/chest/affected = target.get_organ("chest")
+		user.visible_message("\red [user]'s hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!", \
+		"\red Your hand slips, getting mess and tearing the inside of [target]'s chest with \the [tool]!")
+		var/dam_amt = 2
+
+		if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
+			target.adjustToxLoss(5)
+
+		else if (istype(tool, /obj/item/stack/medical/bruise_pack))
+			if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran))
+				target.adjustToxLoss(7)
+			else
+				dam_amt = 5
+				target.adjustToxLoss(10)
+				affected.createwound(CUT, 5)
+
+		for(var/datum/organ/internal/I in affected.internal_organs)
+			if(I && I.damage > 0)
+				I.take_damage(dam_amt,0)
+
+/datum/surgery_step/ribcage/fix_chest_internal_robot //For artificial organs
+	allowed_tools = list(
+	/obj/item/stack/nanopaste = 100,		\
+	/obj/item/weapon/bonegel = 30, 		\
+	/obj/item/weapon/screwdriver = 70,	\
+	)
+
+	min_duration = 70
+	max_duration = 90
+
+	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/is_chest_organ_damaged = 0
+		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
+		var/datum/organ/external/chest/chest = target.get_organ("chest")
+		for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0)
+			is_chest_organ_damaged = 1
+			break
+		return ..() && is_chest_organ_damaged && heart.robotic == 2 && target.op_stage.ribcage == 2
+
+	begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
 
-		if(lungs.damage > 0)
-			user.visible_message("[user] starts mending the rupture in [target]'s lungs with \the [tool].", \
-			"You start mending the rupture in [target]'s lungs with \the [tool]." )
 		if(heart.damage > 0)
-			user.visible_message("[user] starts mending the bruises on [target]'s heart with \the [tool].", \
-			"You start mending the bruises on [target]'s heart with \the [tool]." )
-		if(liver.damage > 0)
-			user.visible_message("[user] starts mending the bruises on [target]'s liver with \the [tool].", \
-			"You start mending the bruises on [target]'s liver with \the [tool]." )
-		if(kidney.damage > 0)
-			user.visible_message("[user] starts mending the bruises on [target]'s kidney with \the [tool].", \
-			"You start mending the bruises on [target]'s kidney with \the [tool]." )
+			user.visible_message("[user] starts mending the mechanisms on [target]'s heart with \the [tool].", \
+			"You start mending the mechanisms on [target]'s heart with \the [tool]." )
 		target.custom_pain("The pain in your chest is living hell!",1)
 		..()
 
 	end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
-		var/datum/organ/internal/lungs/lungs = target.internal_organs["lungs"]
-		var/datum/organ/internal/liver/liver = target.internal_organs["liver"]
-		var/datum/organ/internal/liver/kidney = target.internal_organs["kidney"]
-
-		if(lungs.damage > 0)
-			user.visible_message("\blue [user] mends the rupture in [target]'s lungs with \the [tool].", \
-			"\blue You mend the rupture in [target]'s lungs with \the [tool]." )
-			lungs.damage = 0
-
 		if(heart.damage > 0)
-			user.visible_message("\blue [user] treats the bruises on [target]'s heart with \the [tool].", \
-			"\blue You treat the bruises on [target]'s heart with \the [tool]." )
+			user.visible_message("\blue [user] repairs [target]'s heart with \the [tool].", \
+			"\blue You repair [target]'s heart with \the [tool]." )
 			heart.damage = 0
 
-		if(liver.damage > 0)
-			user.visible_message("\blue [user] treats the bruises on [target]'s liver with \the [tool].", \
-			"\blue You treat the bruises on [target]'s liver with \the [tool]." )
-			liver.damage = 0
-
-		if(kidney.damage > 0)
-			user.visible_message("\blue [user] treats the bruises on [target]'s kidney with \the [tool].", \
-			"\blue You treat the bruises on [target]'s kidney with \the [tool]." )
-			kidney.damage = 0
-
 	fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
-		var/datum/organ/external/chest/affected = target.get_organ("chest")
-		user.visible_message("\red [user]'s hand slips, slicing an artery inside [target]'s chest with \the [tool]!", \
-		"\red Your hand slips, slicing an artery inside [target]'s chest with \the [tool]!")
-		affected.createwound(CUT, 20)
+		var/datum/organ/internal/heart/heart = target.internal_organs["heart"]
+		user.visible_message("\red [user]'s hand slips, smearing [tool] in the incision in [target]'s heart, gumming it up!!" , \
+		"\red Your hand slips, smearing [tool] in the incision in [target]'s heart, gumming it up!")
+		heart.take_damage(5, 0)
+		target.adjustToxLoss(5)
+
+//////////////////////////////////////////////////////////////////
+//						HEART SURGERY							//
+//////////////////////////////////////////////////////////////////
+// To be finished after some tests.
+// /datum/surgery_step/ribcage/heart/cut
+//	allowed_tools = list(
+//	/obj/item/weapon/scalpel = 100,		\
+//	/obj/item/weapon/kitchenknife = 75,	\
+//	/obj/item/weapon/shard = 50, 		\
+//	)
+
+//	min_duration = 30
+//	max_duration = 40
+
+//	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
+//		return ..() && target.op_stage.ribcage == 2
+

code/modules/surgery/robolimbs.dm

@@ -4,7 +4,7 @@
 //////////////////////////////////////////////////////////////////
 
 /datum/surgery_step/limb/
-	can_infect = 1
+	can_infect = 0
 	can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
 		if (!hasorgans(target))
 			return 0
@@ -125,7 +125,6 @@
 
 /datum/surgery_step/limb/attach
 	allowed_tools = list(/obj/item/robot_parts = 100)
-	can_infect = 0
 
 	min_duration = 80
 	max_duration = 100
@@ -148,6 +147,7 @@
 		var/datum/organ/external/affected = target.get_organ(target_zone)
 		user.visible_message("\blue [user] has attached \the [tool] where [target]'s [affected.display_name] used to be.",	\
 		"\blue You have attached \the [tool] where [target]'s [affected.display_name] used to be.")
+		affected.germ_level = 0
 		affected.robotize()
 		if(L.sabotaged)
 			affected.sabotaged = 1