Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

code/defines/obj/weapon.dm

@@ -900,9 +900,14 @@
 	name = "paper - 'Judgement'"
 	info = "For crimes against the station, the offender is sentenced to:<BR>\n<BR>\n"
 
+//Please resist giving this to people who have not survived game breaking bugs.
+/*Current recipients:
+Searif: Survived infinite cold bug, body temp was "-nan", still alive.
+eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discovery of that code and subsequent diking out.
+*/
 /obj/item/weapon/paper/certificate
 	name = "paper - 'Certificate'"
-	info = "Due to this person's unique actions in the past, we hereby certify that they are \"Totally Radical\"<br><br>----<b>Central Command</b><BR><i>This paper has been stamped with the central command rubber stamp.</i><BR>"
+	info = "Due to this person's unique actions in the past, we hereby certify that they are \"Well Qualified\"<br><br>----<b>Central Command</b><BR><i>This paper has been stamped with the central command rubber stamp.</i><BR>"
 	stamped = list(/obj/item/weapon/stamp/centcom)
 	overlays = list("paper_stamped_cent")
 

code/game/objects/devices/scanners.dm

@@ -1,4 +1,3 @@
-
 /*
 CONTAINS:
 T-RAY
@@ -280,7 +279,8 @@ MASS SPECTROMETER
 	origin_tech = "magnets=1;biotech=1"
 	var/mode = 1;
 
-proc/analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob)
+	proc
+		analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob)
 			var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss())))
 			if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath))
 				user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1)
@@ -299,7 +299,6 @@ proc/analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob)
 						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

config/custom_items.txt

@@ -1,4 +1,3 @@
-skymarshal: Phillip Oswald: /obj/item/weapon/coin/silver
 spaceman96: Trenna Seber: /obj/item/weapon/pen/multi, /obj/item/clothing/suit/storage/labcoat/pink
 asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche, /obj/item/clothing/glasses/meson/fluff/book_berner_1
 tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper