Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mob/new_player/sprite_accessories.dm

@@ -331,7 +331,51 @@
 		name = "Tajaran Ears"
 		icon_state = "tajears"
 		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_spiky"
+		species_allowed = list("Tajaran")
+
+	taj_ears_messy
+		name = "Messy"
+		icon_state = "hair_messy"
+		species_allowed = list("Tajaran")
 //skin styles - WIP
 
 /datum/sprite_accessory/skin

code/modules/reagents/Chemistry-Reagents.dm

@@ -1721,7 +1721,7 @@ datum
 						M.adjustToxLoss((data - 50) * REAGENTS_EFFECT_MULTIPLIER)
 
 				// Sleep toxins should always be consumed pretty fast
-				holder.remove_reagent(src.id, 0.1)
+				holder.remove_reagent(src.id, 0.4)
 				..()
 				return
 
@@ -1746,7 +1746,7 @@ datum
 						M.adjustToxLoss(data - 50)
 				data++
 				// Sleep toxins should always be consumed pretty fast
-				holder.remove_reagent(src.id, 0.1)
+				holder.remove_reagent(src.id, 0.4)
 				..()
 				return
 
@@ -2004,6 +2004,7 @@ datum
 						M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT
 						if(istype(M, /mob/living/carbon/metroid))
 							M.bodytemperature += rand(15,20)
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 				data++
 				..()
 				return
@@ -2092,6 +2093,7 @@ datum
 						if(istype(M, /mob/living/carbon/metroid))
 							M.bodytemperature -= rand(15,20)
 				data++
+				holder.remove_reagent(src.id, FOOD_METABOLISM)
 				..()
 				return
 

code/setup.dm

@@ -66,7 +66,7 @@
 
 // Factor of how fast mob nutrition decreases
 #define	HUNGER_FACTOR 0.05
-#define	REAGENTS_METABOLISM 0.02
+#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

html/changelog.html

@@ -59,6 +59,15 @@ 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">1/13/2013</h2>
 	<h3 class="author">GauHelldragon updated:</h3>