Barman renamed Bartender, because I am a femmi nazi.

Monkeys have several bugs fixed on them, shooting them with weak bullet rounds now works! Also, fixed monkeys not showing being KO/ burned without having brute damage on them first.

New chemistry reagents. That'll be required for a upcoming update to chemistry when grinding up refined ore will get reagents or something. Silver, gold, and Uranium.

Bar drinks now have resulting units in mixtures equal to all liquids stirred in. No more 50 unit martinis from 30 units gin and vermouth anymore!

Map updates - Fixed a maintenance tunnel with no air. Updated Bartender spawn point (so you don't spawn on loading screen).

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

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

@@ -21,11 +21,11 @@
 				usr << text("\red [] looks slightly bruised!", src.name)
 			else
 				usr << text("\red <B>[] looks severely bruised!</B>", src.name)
-			if (src.fireloss)
-				if (src.fireloss < 30)
-					usr << text("\red [] looks slightly burnt!", src.name)
-				else
-					usr << text("\red <B>[] looks severely burnt!</B>", src.name)
-				if (src.stat == 1)
-					usr << text("\red [] doesn't seem to be responding to anything around them, their eyes closed as though asleep.", src.name)
+		if (src.fireloss)
+			if (src.fireloss < 30)
+				usr << text("\red [] looks slightly burnt!", src.name)
+			else
+				usr << text("\red <B>[] looks severely burnt!</B>", src.name)
+		if (src.stat == 1)
+			usr << text("\red [] doesn't seem to be responding to anything around them, their eyes closed as though asleep.", src.name)
 	return

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

@@ -105,42 +105,52 @@
 			src.fireloss += 40
 		src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
 	return
-/*
+
 /mob/living/carbon/monkey/bullet_act(flag)
 
 	if (flag == PROJECTILE_BULLET)
-		if (src.stat != 2)
-			src.bruteloss += 60
-			src.updatehealth()
-			src.weakened = 10
+		if (stat != 2)
+			take_organ_damage(60, 0)
+			updatehealth()
+			if (prob(50))
+				if(weakened <= 5)	weakened = 5
 	else if (flag == PROJECTILE_TASER)
-		if (prob(75))
-			src.stunned = 15
+		if (prob(75) && stunned <= 10)
+			stunned = 10
 		else
-			src.weakened = 15
+			weakened = 10
+		if (stuttering < 10)
+			stuttering = 10
 	else if (flag == PROJECTILE_DART)
 		src.weakened += 5
 		src.toxloss += 10
 	else if(flag == PROJECTILE_LASER)
-		if (src.stat != 2)
-			src.bruteloss += 20
-			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
+		if (!eye_blurry) eye_blurry = 4 //This stuff makes no sense but lasers need a buff.
+		if (prob(25)) stunned++
+		if (stat != 2)
+			take_organ_damage(0, 20)
+			updatehealth()
 			if (prob(25))
-				src.stunned = 1
+				stunned = 1
 	else if(flag == PROJECTILE_PULSE)
-		if (src.stat != 2)
-			src.bruteloss += 40
-			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
-			if (prob(25))
-				src.stunned = min(src.stunned, 5)
+		if (stat != 2)
+			take_organ_damage(0, 40)
+			updatehealth()
+			if (prob(50))
+				stunned = min(stunned, 5)
 	else if(flag == PROJECTILE_BOLT)
-		src.toxloss += 3
-		src.radiation += 100
-		src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
-		src.stuttering += 5
-		src.drowsyness += 5
+		toxloss += 3
+		radiation += 100
+		updatehealth()
+		stuttering += 5
+		drowsyness += 5
+	else if (flag == PROJECTILE_WEAKBULLET)
+		if (stat != 2)
+			take_organ_damage(10, 0)
+			updatehealth()
+			if(weakened <= 5)	weakened = 5
 	return
-*/
+
 /mob/living/carbon/monkey/hand_p(mob/M as mob)
 	if ((M.a_intent == "hurt" && !( istype(src.wear_mask, /obj/item/clothing/mask/muzzle) )))
 		if ((prob(75) && src.health > 0))

code/modules/mob/new_player/new_player.dm

@@ -197,7 +197,7 @@ mob/new_player
 				if ("4")
 					AttemptLateSpawn("Station Engineer", engineerMax)
 				if ("5")
-					AttemptLateSpawn("Barman", barmanMax)
+					AttemptLateSpawn("Bartender", barmanMax)
 				if ("6")
 					AttemptLateSpawn("Scientist", scientistMax)
 				if ("7")
@@ -379,8 +379,8 @@ mob/new_player
 		if (IsJobAvailable("Station Engineer",engineerMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=4'>Station Engineer</a><br>"
 
-		if (IsJobAvailable("Barman",barmanMax))
-			dat += "<a href='byond://?src=\ref[src];SelectedJob=5'>Barman</a><br>"
+		if (IsJobAvailable("Bartender",barmanMax))
+			dat += "<a href='byond://?src=\ref[src];SelectedJob=5'>Bartender</a><br>"
 
 		if (IsJobAvailable("Scientist",scientistMax))
 			dat += "<a href='byond://?src=\ref[src];SelectedJob=6'>Scientist</a><br>"