- Stop adding .wavs I swear to god I will punch all of you seriously all you have to do is download Audacity and press a single button to make something an .ogg you don't need to downsample or techwizardry at all you press ONE BUTTON aaaaaaaaaaaa

- (Added for Rolan) Medscanners now have a toggleable option to check for injury on each limb, and the help intent now shows what kind of damage someone has on each limb.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2972 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Tools.dm

@@ -2832,13 +2832,13 @@
 		..()
 		reagents.add_reagent("dexalin", 30)
 
-/obj/item/weapon/reagent_containers/pill/bicardine
-	name = "Bicardine pill"
+/obj/item/weapon/reagent_containers/pill/bicaridine
+	name = "Bicaridine pill"
 	desc = "Used to treat physical injuries."
 	icon_state = "pill18"
 	New()
 		..()
-		reagents.add_reagent("bicardine", 30)
+		reagents.add_reagent("bicaridine", 30)
 
 //Dispensers
 /obj/structure/reagent_dispensers/watertank

code/modules/critters/critters.dm

@@ -266,7 +266,7 @@
 	melee_damage_lower = 10
 	melee_damage_upper = 15
 	attacktext = "cuts"
-	attack_sound = 'bladeslice.wav'
+	attack_sound = 'bladeslice.ogg'
 	chasestate = "viscerator_attack"
 	deathtext = "is smashed into pieces!"
 

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

@@ -156,24 +156,52 @@
 
 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
 	if (src.health > 0)
-		var/t_him = "it"
-		if (src.gender == MALE)
-			t_him = "him"
-		else if (src.gender == FEMALE)
-			t_him = "her"
-		if (istype(src,/mob/living/carbon/human) && src:w_uniform)
+		if(src == M && istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
-			H.w_uniform.add_fingerprint(M)
-		src.sleeping = 0
-		src.resting = 0
-		AdjustParalysis(-3)
-		AdjustStunned(-3)
-		AdjustWeakened(-3)
-		playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
-		M.visible_message( \
-			"\blue [M] shakes [src] trying to wake [t_him] up!", \
-			"\blue You shake [src] trying to wake [t_him] up!", \
-			)
+			src.visible_message( \
+				text("\blue [src] examines [].",src.gender==MALE?"himself":"herself"), \
+				"\blue You check yourself for injuries." \
+				)
+
+			for(var/datum/organ/external/org in H.organs)
+				var/status = ""
+				if(org.brute_dam > 0)
+					status = "bruised"
+				if(org.brute_dam > 20)
+					status = "bleeding"
+				if(org.brute_dam > 40)
+					status = "mangled"
+				if(org.brute_dam > 0 && org.burn_dam > 0)
+					status += " and "
+				if(org.burn_dam > 40)
+					status += "peeling away"
+
+				else if(org.burn_dam > 10)
+					status += "blistered"
+				else if(org.burn_dam > 0)
+					status += "numb"
+				if(status == "")
+					status = "OK"
+				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.getDisplayName(),status),1)
+		else
+			var/t_him = "it"
+			if (src.gender == MALE)
+				t_him = "him"
+			else if (src.gender == FEMALE)
+				t_him = "her"
+			if (istype(src,/mob/living/carbon/human) && src:w_uniform)
+				var/mob/living/carbon/human/H = src
+				H.w_uniform.add_fingerprint(M)
+			src.sleeping = 0
+			src.resting = 0
+			AdjustParalysis(-3)
+			AdjustStunned(-3)
+			AdjustWeakened(-3)
+			playsound(src.loc, 'thudswoosh.ogg', 50, 1, -1)
+			M.visible_message( \
+				"\blue [M] shakes [src] trying to wake [t_him] up!", \
+				"\blue You shake [src] trying to wake [t_him] up!", \
+				)
 
 /mob/living/carbon/proc/eyecheck()
 	return 0

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

@@ -69,7 +69,7 @@
 		src.modules += new /obj/item/weapon/reagent_containers/pill/dexalin(src)
 		src.modules += new /obj/item/weapon/reagent_containers/pill/antitox(src)
 		src.modules += new /obj/item/weapon/reagent_containers/pill/kelotane(src)
-		src.modules += new /obj/item/weapon/reagent_containers/pill/bicardine(src)
+		src.modules += new /obj/item/weapon/reagent_containers/pill/bicaridine(src)
 		return
 
 
@@ -78,7 +78,7 @@
 			/obj/item/weapon/reagent_containers/pill/dexalin,
 			/obj/item/weapon/reagent_containers/pill/antitox,
 			/obj/item/weapon/reagent_containers/pill/kelotane,
-			/obj/item/weapon/reagent_containers/pill/bicardine
+			/obj/item/weapon/reagent_containers/pill/bicaridine
 		)
 		for (var/T in what)
 			if (!(locate(T) in src.modules))

code/modules/mob/organ/organ.dm

@@ -103,6 +103,20 @@
 			src.damage_state = n_is
 			return 1
 		return 0
+	
+	
+	proc/getDisplayName()
+		switch(src.name)
+			if("l_leg")
+				return "left leg"
+			if("r_leg")
+				return "right leg"
+			if("l_arm")
+				return "left arm"
+			if("r_arm")
+				return "right arm"
+			else
+				return src.name