- 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/game/objects/closets.dm

@@ -38,7 +38,7 @@
 	src.icon_state = src.icon_opened
 	src.opened = 1
 	//if(istype(src, /obj/structure/closet/body_bag))
-		//playsound(src.loc, 'zip.wav', 15, 1, -3)
+		//playsound(src.loc, 'zip.ogg', 15, 1, -3)
 	//else
 	playsound(src.loc, 'click.ogg', 15, 1, -3)
 	density = 0
@@ -68,7 +68,7 @@
 	src.icon_state = src.icon_closed
 	src.opened = 0
 	//if(istype(src, /obj/structure/closet/body_bag))
-		//playsound(src.loc, 'zip.wav', 15, 1, -3)
+		//playsound(src.loc, 'zip.ogg', 15, 1, -3)
 	//else
 	playsound(src.loc, 'click.ogg', 15, 1, -3)
 	density = 1

code/game/objects/devices/PDA/PDA.dm

@@ -741,6 +741,17 @@
 				user.show_message("\blue \t Damage Specifics: [C.getOxyLoss() > 50 ? "\red" : "\blue"][C.getOxyLoss()]-[C.getToxLoss() > 50 ? "\red" : "\blue"][C.getToxLoss()]-[C.getFireLoss() > 50 ? "\red" : "\blue"][C.getFireLoss()]-[C.getBruteLoss() > 50 ? "\red" : "\blue"][C.getBruteLoss()]", 1)
 				user.show_message("\blue \t Key: Suffocation/Toxin/Burns/Brute", 1)
 				user.show_message("\blue \t Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1)
+
+				if(istype(C, /mob/living/carbon/human))
+					var/mob/living/carbon/human/H = C
+					var/list/damaged = H.get_damaged_organs(1,1)
+					user.show_message("\blue Localized Damage, Brute-Burn:",1)
+					if(length(damaged)>0)
+						for(var/datum/organ/external/org in damaged)
+							user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+					else
+						user.show_message("\blue \t Limbs are OK.",1)
+
 				for(var/datum/disease/D in C.viruses)
 					if(!D.hidden[SCANNER])
 						user.show_message(text("\red <b>Warning: [D.form] Detected</b>\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]"))

code/game/objects/devices/scanners.dm

@@ -178,6 +178,7 @@ MASS SPECTROMETER
 	throw_range = 10
 	m_amt = 200
 	origin_tech = "magnets=1;biotech=1"
+	var/mode = 1;
 
 /obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob)
 	if ((user.mutations & CLUMSY || user.getBrainLoss() >= 60) && prob(50))
@@ -204,6 +205,16 @@ MASS SPECTROMETER
 		user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1)
 	user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1)
 	user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1)
+	if(mode == 1 && istype(M, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		var/list/damaged = H.get_damaged_organs(1,1)
+		user.show_message("\blue Localized Damage, Brute\\Burn:",1)
+		if(length(damaged)>0)
+			for(var/datum/organ/external/org in damaged)
+				user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+		else
+			user.show_message("\blue \t Limbs are OK.",1)
+
 	if((M.changeling && M.changeling.changeling_fakedeath) ||  (M.reagents && M.reagents.has_reagent("zombiepowder")))
 		user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1)
 	else
@@ -224,6 +235,17 @@ MASS SPECTROMETER
 	src.add_fingerprint(user)
 	return
 
+/obj/item/device/healthanalyzer/verb/toggle_mode()
+	set name = "Switch Verbosity"
+	set category = "Object"
+
+	mode = !mode
+	switch (mode)
+		if(1)
+			usr << "The scanner now shows specific limb damage."
+		if(0)
+			usr << "The scanner no longer shows limb damage."
+
 
 /obj/item/device/analyzer
 	desc = "A hand-held environmental scanner which reports current gas levels."