Added four new slime types (sprites by Reisyn, SuperElement, and LePinkyFace)

Fixed the backwards pumps in misc research, shuffled the xenobio surgical area around to be easier to use.

Fixed being able to strip items with canremove = 0

Added a new mutantrace that ties into the new slime extracts (sprites by SuperElement)

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

code/modules/mob/living/carbon/human/inventory.dm

@@ -317,6 +317,7 @@
 			if("mask")
 				if(target.wear_mask && !target.wear_mask.canremove)
 					message = "\red <B>[source] fails to take off \a [target.wear_mask] from [target]'s head!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off \a [source.wear_mask] from [target]'s head!</B>"
 			if("l_hand")
@@ -326,26 +327,31 @@
 			if("gloves")
 				if(target.gloves && !target.gloves.canremove)
 					message = "\red <B>[source] fails to take off \a [target.gloves] from [target]'s hands!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off the [target.gloves] from [target]'s hands!</B>"
 			if("eyes")
 				if(target.glasses && !target.glasses.canremove)
 					message = "\red <B>[source] fails to take off \a [target.glasses] from [target]'s eyes!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off the [target.glasses] from [target]'s eyes!</B>"
 			if("ears")
 				if(target.ears && !target.ears.canremove)
 					message = "\red <B>[source] fails to take off \a [target.ears] from [target]'s ears!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off the [target.ears] from [target]'s ears!</B>"
 			if("head")
 				if(target.head && !target.head.canremove)
 					message = "\red <B>[source] fails to take off \a [target.head] from [target]'s head!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off the [target.head] from [target]'s head!</B>"
 			if("shoes")
 				if(target.shoes && !target.shoes.canremove)
 					message = "\red <B>[source] fails to take off \a [target.shoes] from [target]'s feet!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off the [target.shoes] from [target]'s feet!</B>"
 			if("belt")
@@ -353,6 +359,7 @@
 			if("suit")
 				if(target.wear_suit && !target.wear_suit.canremove)
 					message = "\red <B>[source] fails to take off \a [target.wear_suit] from [target]'s body!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off \a [target.wear_suit] from [target]'s body!</B>"
 			if("back")
@@ -367,6 +374,7 @@
 						return
 				if(target.w_uniform && !target.w_uniform.canremove)
 					message = "\red <B>[source] fails to take off \a [target.w_uniform] from [target]'s body!</B>"
+					return
 				else
 					message = "\red <B>[source] is trying to take off \a [target.w_uniform] from [target]'s body!</B>"
 			if("s_store")

code/modules/mob/living/carbon/human/update_icons.dm

@@ -323,7 +323,7 @@ Please contact me on #coderbus IRC. ~Carn x
 
 	if(dna)
 		switch(dna.mutantrace)
-			if("lizard","golem","slime","shadow")
+			if("lizard","golem","slime","shadow","adamantine")
 				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
 				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
 			if("plant")

code/modules/mob/living/carbon/metroid/death.dm

@@ -6,8 +6,10 @@
 	if(!gibbed)
 		if(istype(src, /mob/living/carbon/slime/adult))
 			ghostize()
-			new primarytype(loc)
-			new primarytype(loc)
+			var/mob/living/carbon/slime/M1 = new primarytype(loc)
+			M1.rabid = 1
+			var/mob/living/carbon/slime/M2 = new primarytype(loc)
+			M2.rabid = 1
 			if(src)	del(src)
 		else
 			for(var/mob/O in viewers(src, null))

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

@@ -739,7 +739,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	throw_speed = 3
 	throw_range = 6
 	origin_tech = "biotech=4"
-	var/Flush = 30
 	var/Uses = 1 // uses before it goes inert
 
 /obj/item/slime_extract/New()
@@ -781,20 +780,41 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	icon_state = "yellow slime extract"
 
 /obj/item/slime_extract/red
+	name = "red slime extract"
 	icon_state = "red slime extract"
 
 /obj/item/slime_extract/blue
+	name = "blue slime extract"
 	icon_state = "blue slime extract"
 
 /obj/item/slime_extract/darkblue
+	name = "dark blue slime extract"
 	icon_state = "dark blue slime extract"
 
 /obj/item/slime_extract/pink
+	name = "pink slime extract"
 	icon_state = "pink slime extract"
 
 /obj/item/slime_extract/green
+	name = "green slime extract"
 	icon_state = "green slime extract"
 
+/obj/item/slime_extract/lightpink
+	name = "light pink slime extract"
+	icon_state = "light pink slime extract"
+
+/obj/item/slime_extract/black
+	name = "black slime extract"
+	icon_state = "black slime extract"
+
+/obj/item/slime_extract/oil
+	name = "oil slime extract"
+	icon_state = "oil slime extract"
+
+/obj/item/slime_extract/adamantine
+	name = "adamantine slime extract"
+	icon_state = "adamantine slime extract"
+
 ////Pet Slime Creation///
 
 /obj/item/weapon/slimepotion
@@ -805,10 +825,10 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 
 	attack(mob/living/carbon/slime/M as mob, mob/user as mob)
 		if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
-			user << "/red The potion only works on baby slimes!"
+			user << "\red The potion only works on baby slimes!"
 			return ..()
 		if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults
-			user << "/red Only baby slimes can be tamed!"
+			user << "\red Only baby slimes can be tamed!"
 			return..()
 		if(M.stat)
 			user << "\red The slime is dead!"
@@ -817,6 +837,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		pet.icon_state = "[M.colour] baby slime"
 		pet.icon_living = "[M.colour] baby slime"
 		pet.icon_dead = "[M.colour] baby slime dead"
+		pet.colour = "[M.colour]"
 		user <<"You feed the slime the potion, removing it's powers and calming it."
 		del (M)
 		var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
@@ -827,18 +848,47 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		pet.real_name = newname
 		del (src)
 
+/obj/item/weapon/slimepotion2
+	name = "advanced docility potion"
+	desc = "A potent chemical mix that will nullify a slime's powers, causing it to become docile and tame. This one is meant for adult slimes"
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "bottle19"
+
+	attack(mob/living/carbon/slime/adult/M as mob, mob/user as mob)
+		if(!istype(M, /mob/living/carbon/slime/adult))//If target is not a slime.
+			user << "\red The potion only works on adult slimes!"
+			return ..()
+		if(M.stat)
+			user << "\red The slime is dead!"
+			return..()
+		var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc)
+		pet.icon_state = "[M.colour] adult slime"
+		pet.icon_living = "[M.colour] adult slime"
+		pet.icon_dead = "[M.colour] baby slime dead"
+		pet.colour = "[M.colour]"
+		user <<"You feed the slime the potion, removing it's powers and calming it."
+		del (M)
+		var/newname = copytext(sanitize(input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime") as null|text),1,MAX_NAME_LEN)
+
+		if (!newname)
+			newname = "pet slime"
+		pet.name = newname
+		pet.real_name = newname
+		del (src)
+
+
 /obj/item/weapon/slimesteroid
-	name = "docility steroid"
-	desc = "A potent chemical mix that will cause a slime to create generate more extract."
+	name = "slime steroid"
+	desc = "A potent chemical mix that will cause a slime to generate more extract."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle16"
 
 	attack(mob/living/carbon/slime/M as mob, mob/user as mob)
 		if(!istype(M, /mob/living/carbon/slime))//If target is not a slime.
-			user << "/red The steroid only works on baby slimes!"
+			user << "\red The steroid only works on baby slimes!"
 			return ..()
 		if(istype(M, /mob/living/carbon/slime/adult)) //Can't tame adults
-			user << "/red Only baby slimes can use the steroid!"
+			user << "\red Only baby slimes can use the steroid!"
 			return..()
 		if(M.stat)
 			user << "\red The slime is dead!"
@@ -850,6 +900,69 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		user <<"You feed the slime the steroid. It now has triple the amount of extract."
 		M.cores = 3
 		del (src)
+
+
+////////Adamantine Golem stuff I dunno where else to put it
+
+/obj/item/clothing/under/golem
+	name = "adamantine skin"
+	desc = "a golem's skin"
+	icon_state = "golem"
+	item_state = "golem"
+	color = "golem"
+	has_sensor = 0
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	canremove = 0
+
+/obj/item/clothing/suit/golem
+	name = "adamantine shell"
+	desc = "a golem's thick outter shell"
+	icon_state = "golem"
+	item_state = "golem"
+	w_class = 4//bulky item
+	gas_transfer_coefficient = 0.90
+	permeability_coefficient = 0.50
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	slowdown = 3.0
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECITON_TEMPERATURE
+	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
+	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECITON_TEMPERATURE
+	canremove = 0
+	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/shoes/golem
+	name = "golem's feet"
+	desc = "sturdy adamantine feet"
+	icon_state = "golem"
+	item_state = null
+	canremove = 0
+	flags = NOSLIP
+	slowdown = SHOES_SLOWDOWN+1
+
+
+/obj/item/clothing/mask/gas/golem
+	name = "golem's face"
+	desc = "the imposing face of an adamantine golem"
+	icon_state = "golem"
+	item_state = "golem"
+	canremove = 0
+	siemens_coefficient = 0
+	unacidable = 1
+
+/obj/item/clothing/gloves/golem
+	name = "golem's hands"
+	desc = "strong adamantine hands"
+	icon_state = "golem"
+	item_state = null
+	siemens_coefficient = 0
+	canremove = 0
+
+
+
+
 //////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them////////////////////////
 
 /*

code/modules/mob/living/carbon/metroid/subtypes.dm

@@ -195,8 +195,8 @@
 	primarytype = /mob/living/carbon/slime/pink
 	mutationone = /mob/living/carbon/slime/pink
 	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/pink
-	mutationfour = /mob/living/carbon/slime/pink
+	mutationthree = /mob/living/carbon/slime/lightpink
+	mutationfour = /mob/living/carbon/slime/lightpink
 	adulttype = /mob/living/carbon/slime/adult/pink
 	coretype = /obj/item/slime_extract/pink
 
@@ -206,8 +206,8 @@
 	primarytype = /mob/living/carbon/slime/pink
 	mutationone = /mob/living/carbon/slime/pink
 	mutationtwo = /mob/living/carbon/slime/pink
-	mutationthree = /mob/living/carbon/slime/pink
-	mutationfour = /mob/living/carbon/slime/pink
+	mutationthree = /mob/living/carbon/slime/lightpink
+	mutationfour = /mob/living/carbon/slime/lightpink
 	adulttype = /mob/living/carbon/slime/adult/pink
 	coretype = /obj/item/slime_extract/pink
 
@@ -217,8 +217,8 @@
 	primarytype = /mob/living/carbon/slime/red
 	mutationone = /mob/living/carbon/slime/red
 	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/red
-	mutationfour = /mob/living/carbon/slime/red
+	mutationthree = /mob/living/carbon/slime/oil
+	mutationfour = /mob/living/carbon/slime/oil
 	adulttype = /mob/living/carbon/slime/adult/red
 	coretype = /obj/item/slime_extract/red
 
@@ -228,8 +228,8 @@
 	primarytype = /mob/living/carbon/slime/red
 	mutationone = /mob/living/carbon/slime/red
 	mutationtwo = /mob/living/carbon/slime/red
-	mutationthree = /mob/living/carbon/slime/red
-	mutationfour = /mob/living/carbon/slime/red
+	mutationthree = /mob/living/carbon/slime/oil
+	mutationfour = /mob/living/carbon/slime/oil
 	adulttype = /mob/living/carbon/slime/adult/red
 	coretype = /obj/item/slime_extract/red
 
@@ -239,8 +239,8 @@
 	primarytype = /mob/living/carbon/slime/gold
 	mutationone = /mob/living/carbon/slime/gold
 	mutationtwo = /mob/living/carbon/slime/gold
-	mutationthree = /mob/living/carbon/slime/gold
-	mutationfour = /mob/living/carbon/slime/gold
+	mutationthree = /mob/living/carbon/slime/adamantine
+	mutationfour = /mob/living/carbon/slime/adamantine
 	adulttype = /mob/living/carbon/slime/adult/gold
 	coretype = /obj/item/slime_extract/gold
 
@@ -250,18 +250,19 @@
 	primarytype = /mob/living/carbon/slime/gold
 	mutationone = /mob/living/carbon/slime/gold
 	mutationtwo = /mob/living/carbon/slime/gold
-	mutationthree = /mob/living/carbon/slime/gold
-	mutationfour = /mob/living/carbon/slime/gold
+	mutationthree = /mob/living/carbon/slime/adamantine
+	mutationfour = /mob/living/carbon/slime/adamantine
 	adulttype = /mob/living/carbon/slime/adult/gold
 	coretype = /obj/item/slime_extract/gold
+
 /mob/living/carbon/slime/green
 	colour = "green"
 	icon_state = "green baby slime"
 	primarytype = /mob/living/carbon/slime/green
 	mutationone = /mob/living/carbon/slime/green
 	mutationtwo = /mob/living/carbon/slime/green
-	mutationthree = /mob/living/carbon/slime/green
-	mutationfour = /mob/living/carbon/slime/green
+	mutationthree = /mob/living/carbon/slime/black
+	mutationfour = /mob/living/carbon/slime/black
 	adulttype = /mob/living/carbon/slime/adult/green
 	coretype = /obj/item/slime_extract/green
 
@@ -271,7 +272,101 @@
 	primarytype = /mob/living/carbon/slime/green
 	mutationone = /mob/living/carbon/slime/green
 	mutationtwo = /mob/living/carbon/slime/green
-	mutationthree = /mob/living/carbon/slime/green
-	mutationfour = /mob/living/carbon/slime/green
+	mutationthree = /mob/living/carbon/slime/black
+	mutationfour = /mob/living/carbon/slime/black
 	adulttype = /mob/living/carbon/slime/adult/green
 	coretype = /obj/item/slime_extract/green
+
+
+
+// Tier 5
+
+/mob/living/carbon/slime/lightpink
+	colour = "light pink"
+	icon_state = "light pink baby slime"
+	primarytype = /mob/living/carbon/slime/lightpink
+	mutationone = /mob/living/carbon/slime/lightpink
+	mutationtwo = /mob/living/carbon/slime/lightpink
+	mutationthree = /mob/living/carbon/slime/lightpink
+	mutationfour = /mob/living/carbon/slime/lightpink
+	adulttype = /mob/living/carbon/slime/adult/lightpink
+	coretype = /obj/item/slime_extract/lightpink
+
+/mob/living/carbon/slime/adult/lightpink
+	icon_state = "light pink adult slime"
+	colour = "light pink"
+	primarytype = /mob/living/carbon/slime/lightpink
+	mutationone = /mob/living/carbon/slime/lightpink
+	mutationtwo = /mob/living/carbon/slime/lightpink
+	mutationthree = /mob/living/carbon/slime/lightpink
+	mutationfour = /mob/living/carbon/slime/lightpink
+	adulttype = /mob/living/carbon/slime/adult/lightpink
+	coretype = /obj/item/slime_extract/lightpink
+
+
+/mob/living/carbon/slime/oil
+	icon_state = "oil baby slime"
+	colour = "oil"
+	primarytype = /mob/living/carbon/slime/oil
+	mutationone = /mob/living/carbon/slime/oil
+	mutationtwo = /mob/living/carbon/slime/oil
+	mutationthree = /mob/living/carbon/slime/oil
+	mutationfour = /mob/living/carbon/slime/oil
+	adulttype = /mob/living/carbon/slime/adult/oil
+	coretype = /obj/item/slime_extract/oil
+
+/mob/living/carbon/slime/adult/oil
+	icon_state = "oil adult slime"
+	colour = "oil"
+	primarytype = /mob/living/carbon/slime/oil
+	mutationone = /mob/living/carbon/slime/oil
+	mutationtwo = /mob/living/carbon/slime/oil
+	mutationthree = /mob/living/carbon/slime/oil
+	mutationfour = /mob/living/carbon/slime/oil
+	adulttype = /mob/living/carbon/slime/adult/oil
+	coretype = /obj/item/slime_extract/oil
+
+
+/mob/living/carbon/slime/black
+	icon_state = "black baby slime"
+	colour = "black"
+	primarytype = /mob/living/carbon/slime/black
+	mutationone = /mob/living/carbon/slime/black
+	mutationtwo = /mob/living/carbon/slime/black
+	mutationthree = /mob/living/carbon/slime/black
+	mutationfour = /mob/living/carbon/slime/black
+	adulttype = /mob/living/carbon/slime/adult/black
+	coretype = /obj/item/slime_extract/black
+
+/mob/living/carbon/slime/adult/black
+	icon_state = "black adult slime"
+	colour = "black"
+	primarytype = /mob/living/carbon/slime/black
+	mutationone = /mob/living/carbon/slime/black
+	mutationtwo = /mob/living/carbon/slime/black
+	mutationthree = /mob/living/carbon/slime/black
+	mutationfour = /mob/living/carbon/slime/black
+	adulttype = /mob/living/carbon/slime/adult/black
+	coretype = /obj/item/slime_extract/black
+
+/mob/living/carbon/slime/adamantine
+	icon_state = "adamantine baby slime"
+	colour = "adamantine"
+	primarytype = /mob/living/carbon/slime/adamantine
+	mutationone = /mob/living/carbon/slime/adamantine
+	mutationtwo = /mob/living/carbon/slime/adamantine
+	mutationthree = /mob/living/carbon/slime/adamantine
+	mutationfour = /mob/living/carbon/slime/adamantine
+	adulttype = /mob/living/carbon/slime/adult/adamantine
+	coretype = /obj/item/slime_extract/adamantine
+
+/mob/living/carbon/slime/adult/adamantine
+	icon_state = "adamantine adult slime"
+	colour = "adamantine"
+	primarytype = /mob/living/carbon/slime/adamantine
+	mutationone = /mob/living/carbon/slime/adamantine
+	mutationtwo = /mob/living/carbon/slime/adamantine
+	mutationthree = /mob/living/carbon/slime/adamantine
+	mutationfour = /mob/living/carbon/slime/adamantine
+	adulttype = /mob/living/carbon/slime/adult/adamantine
+	coretype = /obj/item/slime_extract/adamantine

code/modules/mob/living/simple_animal/friendly/slime.dm

@@ -6,12 +6,13 @@
 	icon_living = "grey baby slime"
 	icon_dead = "grey baby slime dead"
 	speak_emote = list("chirps")
-	health = 50
-	maxHealth = 50
+	health = 100
+	maxHealth = 100
 	response_help  = "pets"
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
+	var/colour = "grey"
 
 /mob/living/simple_animal/slime/Bump(atom/movable/AM as mob|obj, yes)
 
@@ -48,3 +49,34 @@
 			now_pushing = null
 		return
 	return
+
+/mob/living/simple_animal/adultslime
+	name = "pet slime"
+	desc = "A lovable, domesticated slime."
+	icon = 'icons/mob/slimes.dmi'
+	health = 200
+	maxHealth = 200
+	icon_state = "grey adult slime"
+	icon_living = "grey adult slime"
+	icon_dead = "grey baby slime dead"
+	response_help  = "pets"
+	response_disarm = "shoos"
+	response_harm   = "stomps on"
+	emote_see = list("jiggles", "bounces in place")
+	var/colour = "grey"
+
+/mob/living/simple_animal/slime/adult/Die()
+	..()
+	var/mob/living/simple_animal/slime/S1 = new /mob/living/simple_animal/slime (src.loc)
+	S1.icon_state = "[src.colour] baby slime"
+	S1.icon_state = "[src.colour] adult slime"
+	S1.icon_living = "[src.colour] adult slime"
+	S1.icon_dead = "[src.colour] adult slime dead"
+	S1.colour = "[src.colour]"
+	var/mob/living/simple_animal/slime/S2 = new /mob/living/simple_animal/slime (src.loc)
+	S2.icon_state = "[src.colour] baby slime"
+	S2.icon_state = "[src.colour] adult slime"
+	S2.icon_living = "[src.colour] adult slime"
+	S2.icon_dead = "[src.colour] adult slime dead"
+	S2.colour = "[src.colour]"
+	del(src)

code/modules/projectiles/gun.dm

@@ -59,6 +59,10 @@
 			if (HULK in M.mutations)
 				M << "\red Your meaty finger is much too large for the trigger guard!"
 				return
+		if(ishuman(user))
+			if(user.dna && user.dna.mutantrace == "adamantine")
+				user << "\red Your metal fingers don't fit in the trigger guard!"
+				return
 
 		add_fingerprint(user)
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -352,6 +352,41 @@ datum
 						human.update_mutantrace()
 				..()
 				return
+
+		aslimetoxin
+			name = "Advanced Mutation Toxin"
+			id = "amutationtoxin"
+			description = "An advanced corruptive toxin produced by slimes."
+			reagent_state = LIQUID
+			color = "#13BC5E" // rgb: 19, 188, 94
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				if(istype(M, /mob/living/carbon) && M.stat != DEAD)
+					M << "\red Your flesh rapidly mutates!"
+					if(M.monkeyizing)	return
+					M.monkeyizing = 1
+					M.canmove = 0
+					M.icon = null
+					M.overlays.Cut()
+					M.invisibility = 101
+					for(var/obj/item/W in M)
+						if(istype(W, /obj/item/weapon/implant))	//TODO: Carn. give implants a dropped() or something
+							del(W)
+							continue
+						W.layer = initial(W.layer)
+						W.loc = M.loc
+						W.dropped(M)
+					var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc)
+					new_mob.a_intent = "hurt"
+					if(M.mind)
+						M.mind.transfer_to(new_mob)
+					else
+						new_mob.key = M.key
+					del(M)
+				..()
+				return
+
 		stoxin
 			name = "Sleep Toxin"
 			id = "stoxin"

code/modules/reagents/Chemistry-Recipes.dm

@@ -1222,6 +1222,65 @@ datum
 				P.loc = get_turf_loc(holder.my_atom)
 
 
+//Black
+		slimemutate2
+			name = "Advanced Mutation Toxin"
+			id = "mutationtoxin2"
+			result = "amutationtoxin"
+			required_reagents = list("plasma" = 5)
+			result_amount = 1
+			required_other = 1
+			required_container = /obj/item/slime_extract/black
+
+//Oil
+		slimeexplosion
+			name = "Slime Explosion"
+			id = "m_explosion"
+			result = null
+			required_reagents = list("plasma" = 5)
+			result_amount = 1
+			required_container = /obj/item/slime_extract/oil
+			required_other = 1
+			on_reaction(var/datum/reagents/holder)
+				for(var/mob/O in viewers(get_turf_loc(holder.my_atom), null))
+					O.show_message(text("\red The slime extract begins to vibrate violently !"), 1)
+				sleep(50)
+				holder.clear_reagents()
+				explosion(get_turf_loc(holder.my_atom), 1 ,3, 6)
+				del (holder)
+//Light Pink
+		slimepotion2
+			name = "Slime Potion 2"
+			id = "m_potion2"
+			result = null
+			result_amount = 1
+			required_container = /obj/item/slime_extract/lightpink
+			required_other = 1
+			on_reaction(var/datum/reagents/holder)
+				var/obj/item/weapon/slimepotion2/P = new /obj/item/weapon/slimepotion2
+				P.loc = get_turf_loc(holder.my_atom)
+//Adamantine
+		slimegolem
+			name = "Slime Golem"
+			id = "m_golem"
+			result = null
+			result_amount = 1
+			required_container = /obj/item/slime_extract/adamantine
+			required_other = 1
+			on_reaction(var/datum/reagents/holder)
+				var/mob/living/carbon/human/G = new /mob/living/carbon/human
+				G.dna.mutantrace = "adamantine"
+				G.name = text("Adamantine Golem ([rand(1, 1000)])")
+				G.equip_to_slot_or_del(new /obj/item/clothing/under/golem(G), slot_w_uniform)
+				G.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(G), slot_wear_suit)
+				G.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(G), slot_shoes)
+				G.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(G), slot_wear_mask)
+				G.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(G), slot_gloves)
+				G.loc = get_turf_loc(holder.my_atom)
+				var/list/candidates = get_alien_candidates()
+				var/candidate = pick(candidates)
+				G.key = candidate
+				G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve the one created you, and assist them in completing their goals at any cost."
 
 //////////////////////////////////////////FOOD MIXTURES////////////////////////////////////
 

code/modules/reagents/reagent_containers/syringes.dm

@@ -144,10 +144,6 @@
 					user << "\red [target] is full."
 					return
 
-				if(istype(target, /obj/item/slime_extract))
-					var/obj/item/slime_extract/core = target
-					core.Flush = 30 // reset flush counter
-
 				if(ismob(target) && target != user)
 					for(var/mob/O in viewers(world.view, user))
 						O.show_message(text("\red <B>[] is trying to inject []!</B>", user, target), 1)

html/changelog.html

@@ -48,6 +48,13 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. 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">31 December 2012</h2>
+	<h3 class="author">Kor updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="add">Four new slime types with their own extract reactions have been added. Sprites this time were created by Reisyn, SuperElement, and LePinkyFace.</li>
+	</ul>
+
 <div class="commit sansserif">
 	<h2 class="date">02 January 2013</h2>