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/WorkInProgress/Chemistry-Reagents.dm

@@ -700,6 +700,35 @@ datum
 				return
 */
 
+		gold
+			name = "gold"
+			id = "gold"
+			description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
+			reagent_state = SOLID
+
+		silver
+			name = "silver"
+			id = "silver"
+			description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
+			reagent_state = SOLID
+
+		uranium
+			name ="uranium"
+			id = "uranium"
+			description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
+			reagent_state = SOLID
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M.radiation += 1
+				..()
+				return
+
+
+			reaction_turf(var/turf/T, var/volume)
+				src = null
+				if(!istype(T, /turf/space))
+					new /obj/decal/cleanable/greenglow(T)
+
 		aluminum
 			name = "aluminum"
 			id = "aluminum"

code/WorkInProgress/Chemistry-Recipes.dm

@@ -563,7 +563,7 @@ datum
 			result = "moonshine"
 			required_reagents = list("nutriment" = 10)
 			required_catalysts = list("enzyme" = 5)
-			result_amount = 5
+			result_amount = 10
 
 		wine
 			name = "Wine"
@@ -571,7 +571,7 @@ datum
 			result = "wine"
 			required_reagents = list("berryjuice" = 10)
 			required_catalysts = list("enzyme" = 5)
-			result_amount = 5
+			result_amount = 10
 
 		vodka
 			name = "Vodka"
@@ -579,7 +579,7 @@ datum
 			result = "vodka"
 			required_reagents = list("potato" = 10)
 			required_catalysts = list("enzyme" = 5)
-			result_amount = 5
+			result_amount = 10
 
 		kahlua
 			name = "Kahlua"
@@ -594,7 +594,7 @@ datum
 			id = "gintonic"
 			result = "gintonic"
 			required_reagents = list("gin" = 2, "tonic" = 1)
-			result_amount = 5
+			result_amount = 3
 
 
 		cuba_libre
@@ -602,21 +602,21 @@ datum
 			id = "cubalibre"
 			result = "cubalibre"
 			required_reagents = list("rum" = 2, "cola" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		martini
 			name = "Classic Martini"
 			id = "martini"
 			result = "martini"
 			required_reagents = list("gin" = 2, "vermouth" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		vodkamartini
 			name = "Vodka Martini"
 			id = "vodkamartini"
 			result = "vodkamartini"
 			required_reagents = list("vodka" = 2, "vermouth" = 1)
-			result_amount = 5
+			result_amount = 3
 
 
 		white_russian
@@ -631,21 +631,21 @@ datum
 			id = "whiskeycola"
 			result = "whiskeycola"
 			required_reagents = list("whiskey" = 2, "cola" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		screwdriver
 			name = "Screwdriver"
 			id = "screwdrivercocktail"
 			result = "screwdrivercocktail"
 			required_reagents = list("vodka" = 2, "orangejuice" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		bloody_mary
 			name = "Bloody Mary"
 			id = "bloodymary"
 			result = "bloodymary"
 			required_reagents = list("vodka" = 1, "tomatojuice" = 2, "limejuice" = 1)
-			result_amount = 5
+			result_amount = 4
 
 		gargle_blaster
 			name = "Pan-Galactic Gargle Blaster"
@@ -659,14 +659,14 @@ datum
 			id = "bravebull"
 			result = "bravebull"
 			required_reagents = list("tequilla" = 2, "kahlua" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		tequilla_sunrise
 			name = "Tequilla Sunrise"
 			id = "tequillasunrise"
 			result = "tequillasunrise"
 			required_reagents = list("tequilla" = 2, "orangejuice" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		toxins_special
 			name = "Toxins Special"
@@ -680,70 +680,70 @@ datum
 			id = "beepksysmash"
 			result = "beepskysmash"
 			required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
-			result_amount = 5
+			result_amount = 4
 
 		doctor_delight
 			name = "The Doctor's Delight"
 			id = "doctordelight"
 			result = "doctorsdelight"
 			required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1)
-			result_amount = 5
+			result_amount = 4
 
 		irish_cream
 			name = "Irish Cream"
 			id = "irishcream"
 			result = "irishcream"
 			required_reagents = list("whiskey" = 2, "cream" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		manly_dorf
 			name = "The Manly Dorf"
 			id = "manlydorf"
 			result = "manlydorf"
 			required_reagents = list ("beer" = 1, "ale" = 2)
-			result_amount = 5
+			result_amount = 3
 
 		hooch
 			name = "Hooch"
 			id = "hooch"
 			result = "hooch"
 			required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		irish_coffee
 			name = "Irish Coffee"
 			id = "irishcoffee"
 			result = "irishcoffee"
-			required_reagents = list("irishcream" = 2, "coffee" = 2)
+			required_reagents = list("irishcream" = 1, "coffee" = 1)
-			result_amount = 5
+			result_amount = 2
 
 		b52
 			name = "B-52"
 			id = "b52"
 			result = "b52"
 			required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		margarita
 			name = "Margarita"
 			id = "margarita"
 			result = "margarita"
 			required_reagents = list("tequilla" = 2, "limejuice" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		longislandicedtea
 			name = "Long Island Iced Tea"
 			id = "longislandicedtea"
 			result = "longislandicedtea"
 			required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
-			result_amount = 5
+			result_amount = 4
 
 		whiskeysoda
 			name = "Whiskey Soda"
 			id = "whiskeysoda"
 			result = "whiskeysoda"
 			required_reagents = list("whiskey" = 2, "sodawater" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		black_russian
 			name = "Black Russian"
@@ -757,25 +757,25 @@ datum
 			id = "manhattan"
 			result = "manhattan"
 			required_reagents = list("whiskey" = 2, "vermouth" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		vodka_tonic
 			name = "Vodka and Tonic"
 			id = "vodkatonic"
 			result = "vodkatonic"
 			required_reagents = list("vodka" = 2, "tonic" = 1)
-			result_amount = 5
+			result_amount = 3
 
 		gin_fizz
 			name = "Gin Fizz"
 			id = "ginfizz"
 			result = "ginfizz"
 			required_reagents = list("gin" = 2, "sodawater" = 1, "limejuice" = 1)
-			result_amount = 5
+			result_amount = 4
 
 		bahama_mama
 			name = "Bahama mama"
 			id = "bahama_mama"
 			result = "bahama_mama"
 			required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
-			result_amount = 5
+			result_amount = 6

code/WorkInProgress/Chemistry-Tools.dm

@@ -2496,7 +2496,7 @@
 				if("martini")
 					icon_state = "martiniglass"
 					name = "Classic Martini"
-					desc = "Damn, the barman even stirred it, not shook it."
+					desc = "Damn, the bartender even stirred it, not shook it."
 				if("vodkamartini")
 					icon_state = "martiniglass"
 					name = "Vodka martini"

code/defines/obj/hydro.dm

@@ -875,7 +875,7 @@
 		R.my_atom = src
 
 /obj/item/weapon/grown/log
-	desc = "This is a log grown from a tower cap mushroom."
+	desc = "It's better than bad, it's good!"
 	icon = 'harvest.dmi'
 	name = "Tower Cap Log"
 	icon_state = "logs"

code/game/jobs/access.dm

@@ -155,7 +155,7 @@
 			            access_theatre, access_research, access_mining_office, access_mining, access_heads_vault, access_mining_station, access_hop)
 		if("Atmospheric Technician")
 			return list(access_atmospherics, access_maint_tunnels, access_emergency_storage)
-		if("Barman")
+		if("Bartender")
 			return list(access_bar)
 		if("Chemist")
 			return list(access_medical, access_chemistry)
@@ -363,7 +363,7 @@
 /proc/get_all_jobs()
 	return list("Assistant", "Station Engineer", "Shaft Miner", "Detective", "Medical Doctor", "Captain", "Security Officer", "Warden",
 				"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
-				"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
+				"Chaplain", "Bartender", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
 				"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer", "Virologist", "Cargo Technician", "Chief Medical Officer")
 
 /obj/proc/GetJobName()

code/game/jobs/jobprocs.dm

@@ -496,7 +496,7 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(src), slot_l_hand)
 
-		if ("Barman")
+		if ("Bartender")
 			src.equip_if_possible(new /obj/item/clothing/under/rank/bartender(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)

code/game/jobs/jobs.dm

@@ -16,7 +16,7 @@ var/list/occupations = list(
 	"Roboticist",
 	"Cyborg",//"Cyborg","Cyborg","Cyborg","Cyborg", < Fuck that. Seriously. -- Urist
 	"AI",
-	"Barman",
+	"Bartender",
 	"Chef",
 	"Janitor",
 	"Clown", "Mime",

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)
-				if (src.fireloss < 30)
+			if (src.fireloss < 30)
-					usr << text("\red [] looks slightly burnt!", src.name)
+				usr << text("\red [] looks slightly burnt!", src.name)
-				else
+			else
-					usr << text("\red <B>[] looks severely burnt!</B>", src.name)
+				usr << text("\red <B>[] looks severely burnt!</B>", src.name)
-				if (src.stat == 1)
+		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)
+			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)
+		if (stat != 2)
-			src.bruteloss += 60
+			take_organ_damage(60, 0)
-			src.updatehealth()
+			updatehealth()
-			src.weakened = 10
+			if (prob(50))
+				if(weakened <= 5)	weakened = 5
 	else if (flag == PROJECTILE_TASER)
-		if (prob(75))
+		if (prob(75) && stunned <= 10)
-			src.stunned = 15
+			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)
+		if (!eye_blurry) eye_blurry = 4 //This stuff makes no sense but lasers need a buff.
-			src.bruteloss += 20
+		if (prob(25)) stunned++
-			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
+		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)
+		if (stat != 2)
-			src.bruteloss += 40
+			take_organ_damage(0, 40)
-			src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
+			updatehealth()
-			if (prob(25))
+			if (prob(50))
-				src.stunned = min(src.stunned, 5)
+				stunned = min(stunned, 5)
 	else if(flag == PROJECTILE_BOLT)
-		src.toxloss += 3
+		toxloss += 3
-		src.radiation += 100
+		radiation += 100
-		src.health = 100 - src.oxyloss - src.toxloss - src.fireloss - src.bruteloss
+		updatehealth()
-		src.stuttering += 5
+		stuttering += 5
-		src.drowsyness += 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))
+		if (IsJobAvailable("Bartender",barmanMax))
-			dat += "<a href='byond://?src=\ref[src];SelectedJob=5'>Barman</a><br>"
+			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>"