Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	html/changelog.html
	icons/mob/human_face.dmi

also a sneaky issue resolution caused in spiky taj hair

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/new_player/new_player.dm

@@ -318,9 +318,8 @@
 			if(job && IsJobAvailable(job.title))
 				var/active = 0
 				// Only players with the job assigned and AFK for less than 10 minutes count as active
-				for(var/mob/M in player_list)
+				for(var/mob/M in player_list) if(M.mind && M.client && M.mind.assigned_role == job.title && M.client.inactivity <= 10 * 60 * 10)
-					if(M.mind && M.mind.assigned_job == job && M.client && M.client.inactivity <= 10 * 60 * 10)
+					active++
-						active++
 				dat += "<a href='byond://?src=\ref[src];SelectedJob=[job.title]'>[job.title] ([job.current_positions]) (Active: [active])</a><br>"
 
 		dat += "</center>"

code/modules/mob/new_player/sprite_accessories.dm

@@ -420,9 +420,53 @@
 
 	taj_ears
 		name = "Tajaran Ears"
-		icon_state = "tajears"
+		icon_state = "ears_plain"
 		species_allowed = list("Tajaran")
 
+	taj_ears_clean
+		name = "Clean"
+		icon_state = "hair_clean"
+		species_allowed = list("Tajaran")
+
+	taj_ears_shaggy
+		name = "Shaggy"
+		icon_state = "hair_shaggy"
+		species_allowed = list("Tajaran")
+
+	taj_ears_mohawk
+		name = "Tajaran Mohawk"
+		icon_state = "hair_mohawk"
+		species_allowed = list("Tajaran")
+
+	taj_ears_plait
+		name = "Plait"
+		icon_state = "hair_plait"
+		species_allowed = list("Tajaran")
+
+	taj_ears_straight
+		name = "Straight"
+		icon_state = "hair_straight"
+		species_allowed = list("Tajaran")
+
+	taj_ears_long
+		name = "Long"
+		icon_state = "hair_long"
+		species_allowed = list("Tajaran")
+
+	taj_ears_rattail
+		name = "Rat Tail"
+		icon_state = "hair_rattail"
+		species_allowed = list("Tajaran")
+
+	taj_ears_spiky
+		name = "Spiky"
+		icon_state = "hair_tajspiky"
+		species_allowed = list("Tajaran")
+
+	taj_ears_messy
+		name = "Messy"
+		icon_state = "hair_messy"
+		species_allowed = list("Tajaran")
 
 //skin styles - WIP
 //going to have to re-integrate this with surgery

code/modules/reagents/Chemistry-Reagents.dm

@@ -1737,8 +1737,10 @@ datum
 						M.sleeping += 1
 					if(51 to INFINITY)
 						M.sleeping += 1
-						M.adjustToxLoss(data - 50)
+						M.adjustToxLoss((data - 50) * REAGENTS_EFFECT_MULTIPLIER)
-				..()
+
+				// Sleep toxins should always be consumed pretty fast
+				holder.remove_reagent(src.id, 0.4)				..()
 				return
 
 		beer2							//copypasta of chloral hydrate, disguised as normal beer for use by emagged brobots
@@ -1761,7 +1763,8 @@ datum
 						M.sleeping += 1
 						M.adjustToxLoss(data - 50)
 				data++
-				..()
+				// Sleep toxins should always be consumed pretty fast
+				holder.remove_reagent(src.id, 0.4)				..()
 				return
 
 
@@ -1855,6 +1858,7 @@ datum
 						M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT
 						if(istype(M, /mob/living/carbon/slime))
 							M.bodytemperature += rand(15,20)
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 				data++
 				..()
 				return
@@ -1898,21 +1902,21 @@ datum
 							return
 						else if ( mouth_covered )	// Reduced effects if partially protected
 							victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
-							victim.eye_blurry = max(M.eye_blurry, 3)
+							victim.eye_blurry = max(M.eye_blurry, 15)
-							victim.eye_blind = max(M.eye_blind, 1)
+							victim.eye_blind = max(M.eye_blind, 5)
 							victim.Paralyse(1)
 							victim.drop_item()
 							return
 						else if ( eyes_covered ) // Eye cover is better than mouth cover
 							victim << "\red Your [safe_thing] protects your eyes from the pepperspray!"
 							victim.emote("scream")
-							victim.eye_blurry = max(M.eye_blurry, 1)
+							victim.eye_blurry = max(M.eye_blurry, 5)
 							return
 						else // Oh dear :D
 							victim.emote("scream")
 							victim << "\red You're sprayed directly in the eyes with pepperspray!"
-							victim.eye_blurry = max(M.eye_blurry, 5)
+							victim.eye_blurry = max(M.eye_blurry, 25)
-							victim.eye_blind = max(M.eye_blind, 2)
+							victim.eye_blind = max(M.eye_blind, 10)
 							victim.Paralyse(1)
 							victim.drop_item()
 
@@ -1943,6 +1947,7 @@ datum
 						if(istype(M, /mob/living/carbon/slime))
 							M.bodytemperature -= rand(15,20)
 				data++
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 				..()
 				return
 
@@ -2480,6 +2485,7 @@ datum
 			reagent_state = LIQUID
 			color = "#104038" // rgb: 16, 64, 56
 
+
 			on_mob_life(var/mob/living/M as mob)
 				..()
 				M.dizziness = max(0,M.dizziness-2)

code/modules/reagents/Chemistry-Recipes.dm

@@ -478,7 +478,6 @@ datum
 				var/location = get_turf(holder.my_atom)
 				new /obj/item/stack/sheet/mineral/plasma(location)
 				return
-
 		virus_food
 			name = "Virus Food"
 			id = "virusfood"
@@ -524,8 +523,13 @@ datum
 						if(D)
 							D.Devolve()
 
-
+		condensedcapsaicin
-
+			name = "Condensed Capsaicin"
+			id = "condensedcapsaicin"
+			result = "condensedcapsaicin"
+			required_reagents = list("capsaicin" = 2)
+			required_catalysts = list("plasma" = 5)
+			result_amount = 1
 ///////////////////////////////////////////////////////////////////////////////////
 
 // foam and foam precursor

code/setup.dm

@@ -69,8 +69,11 @@
 #define DOOR_CRUSH_DAMAGE 10
 
 // Factor of how fast mob nutrition decreases
-#define	HUNGER_FACTOR 0.1
+#define	HUNGER_FACTOR 0.05
-#define	REAGENTS_METABOLISM 0.4
+#define	REAGENTS_METABOLISM 0.04
+// By defining the effect multiplier this way, it'll exactly adjust
+// all effects according to how they originally were with the 0.4 metabolism
+#define REAGENTS_EFFECT_MULTIPLIER REAGENTS_METABOLISM / 0.4
 
 #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.05
 	//Minimum ratio of air that must move to/from a tile to suspend group processing

html/changelog.html

@@ -59,6 +59,17 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+
+
+	<h2 class="date">1/31/2013</h2>
+	<h3 class="author">CIB updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Chilis and cold chilis no longer kill in small amounts</li>
+		<li class="bugfix">Chloral now again needs around 5 units to start killing somebody</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">January 21st</h2>
 	<h3 class="author">Cael_Aislinn updated:</h3>
@@ -82,8 +93,7 @@ should be listed in the changelog upon commit though. Thanks. -->
 	</ul>
 </div>
 
-<div class="commit sansserif">
+<div class="commit sansserif">	<h2 class="date">1/13/2013</h2>
-	<h2 class="date">1/13/2013</h2>
 	<h3 class="author">GauHelldragon updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="rscadd">Servicebots now have RoboTray and Printing Pen. Robotray can be used to pick up and drop food/drinks. Printing pen can alternate between writing mode and rename paper mode by clicking it.</li>